Changeset 384
- Timestamp:
- 08/19/08 19:32:35 (3 months ago)
- Files:
-
- 1 modified
-
trunk/matml/src/ternary/freenergy.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/matml/src/ternary/freenergy.c
r380 r384 145 145 return G3-G1 146 146 + eparams->R*T*(((C2+C3>=1) ? HUGE_VALF : (-log(C1)-1)/eparams->M1) 147 + ((C3<=0.) ?-HUGE_VALF : (log(C3 +1)/eparams->M3)))147 + ((C3<=0.) ?-HUGE_VALF : (log(C3)+1)/eparams->M3)) 148 148 - eparams->Omega12*C2 + eparams->Omega13*(C1-C3) + eparams->Omega23*C2 149 149 + eparams->Omega123*(C1-C3)*C2;