Changeset 485 for trunk/matml

Show
Ignore:
Timestamp:
10/07/2009 05:51:52 AM (3 years ago)
Author:
powell
Message:

Fix for a dumb bug.

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • trunk/matml/src/ternary/freenergy.c

    r476 r485  
    8989  /* This adds the polynomials */ 
    9090  for (i=0; i<eparams->n_poly; i++) 
    91     ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].coeff * T) * 
     91    ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].dcdT * T) * 
    9292      pow (C1, (eparams->poly) [i].n1) * 
    9393      pow (C2, (eparams->poly) [i].n2) * pow (C3, (eparams->poly) [i].n3); 
    … …  
    162162 
    163163  for (i=0; i<eparams->n_poly; i++) 
    164     ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].coeff * T) * 
     164    ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].dcdT * T) * 
    165165      pow (C1, (eparams->poly) [i].n1-1) * 
    166166      pow (C2, (eparams->poly) [i].n2-1) * pow (C3, (eparams->poly) [i].n3) * 
    … …  
    229229 
    230230  for (i=0; i<eparams->n_poly; i++) 
    231     ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].coeff * T) * 
     231    ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].dcdT * T) * 
    232232      pow (C1, (eparams->poly) [i].n1-1) * 
    233233      pow (C2, (eparams->poly) [i].n2) * pow (C3, (eparams->poly) [i].n3-1) * 
    … …  
    294294 
    295295  for (i=0; i<eparams->n_poly; i++) 
    296     ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].coeff * T) * 
     296    ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].dcdT * T) * 
    297297      POWER2(C1, (eparams->poly) [i].n1-2) * 
    298298      POWER2(C2, (eparams->poly) [i].n2-2) * pow (C3, (eparams->poly) [i].n3) * 
    … …  
    363363 
    364364  for (i=0; i<eparams->n_poly; i++) 
    365     ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].coeff * T) * 
     365    ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].dcdT * T) * 
    366366      POWER2(C1, (eparams->poly) [i].n1-2) * 
    367367      pow (C2, (eparams->poly) [i].n2) * POWER2(C3, (eparams->poly) [i].n3-2) * 
    … …  
    432432 
    433433  for (i=0; i<eparams->n_poly; i++) 
    434     ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].coeff * T) * 
     434    ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].dcdT * T) * 
    435435      POWER2(C1, (eparams->poly) [i].n1-2) * 
    436436      pow (C2, (eparams->poly) [i].n2-1) * pow (C3, (eparams->poly) [i].n3-1) *