Changeset 486 for trunk

Show
Ignore:
Timestamp:
10/12/2009 10:41:22 AM (3 years ago)
Author:
powell
Message:

Make temeperature dependence of polynomials relative to reference temperature.

Files:
1 modified

Legend:

Unmodified
Added
Removed

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

    r485 r486  
    8989  /* This adds the polynomials */ 
    9090  for (i=0; i<eparams->n_poly; i++) 
    91     ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].dcdT * T) * 
     91    ret += ((eparams->poly) [i].coeff + 
     92            (eparams->poly) [i].dcdT * (T-eparams->T0)) * 
    9293      pow (C1, (eparams->poly) [i].n1) * 
    9394      pow (C2, (eparams->poly) [i].n2) * pow (C3, (eparams->poly) [i].n3); 
    … …  
    162163 
    163164  for (i=0; i<eparams->n_poly; i++) 
    164     ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].dcdT * T) * 
     165    ret += ((eparams->poly) [i].coeff + 
     166            (eparams->poly) [i].dcdT * (T-eparams->T0)) * 
    165167      pow (C1, (eparams->poly) [i].n1-1) * 
    166168      pow (C2, (eparams->poly) [i].n2-1) * pow (C3, (eparams->poly) [i].n3) * 
    … …  
    229231 
    230232  for (i=0; i<eparams->n_poly; i++) 
    231     ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].dcdT * T) * 
     233    ret += ((eparams->poly) [i].coeff + 
     234            (eparams->poly) [i].dcdT * (T-eparams->T0)) * 
    232235      pow (C1, (eparams->poly) [i].n1-1) * 
    233236      pow (C2, (eparams->poly) [i].n2) * pow (C3, (eparams->poly) [i].n3-1) * 
    … …  
    294297 
    295298  for (i=0; i<eparams->n_poly; i++) 
    296     ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].dcdT * T) * 
     299    ret += ((eparams->poly) [i].coeff + 
     300            (eparams->poly) [i].dcdT * (T-eparams->T0)) * 
    297301      POWER2(C1, (eparams->poly) [i].n1-2) * 
    298302      POWER2(C2, (eparams->poly) [i].n2-2) * pow (C3, (eparams->poly) [i].n3) * 
    … …  
    363367 
    364368  for (i=0; i<eparams->n_poly; i++) 
    365     ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].dcdT * T) * 
     369    ret += ((eparams->poly) [i].coeff + 
     370            (eparams->poly) [i].dcdT * (T-eparams->T0)) * 
    366371      POWER2(C1, (eparams->poly) [i].n1-2) * 
    367372      pow (C2, (eparams->poly) [i].n2) * POWER2(C3, (eparams->poly) [i].n3-2) * 
    … …  
    432437 
    433438  for (i=0; i<eparams->n_poly; i++) 
    434     ret += ((eparams->poly) [i].coeff + (eparams->poly) [i].dcdT * T) * 
     439    ret += ((eparams->poly) [i].coeff + 
     440            (eparams->poly) [i].dcdT * (T-eparams->T0)) * 
    435441      POWER2(C1, (eparams->poly) [i].n1-2) * 
    436442      pow (C2, (eparams->poly) [i].n2-1) * pow (C3, (eparams->poly) [i].n3-1) *