Changeset 371

Timestamp:

05/09/08 12:59:57 (6 months ago)

Author:

powell

Message:

Change INFINITY to HUGE_VALF so derivatives along an edge are meaningful.

Files:

• trunk/matml/src/ternary/freenergy.c (modified) (5 diffs)

trunk/matml/src/ternary/freenergy.c

@@ -103 +103 @@
     +*/
   return G2-G1
-    + eparams->R*T*(((C2+C3>=1) ? INFINITY : (-log(C1)-1)/eparams->M1)
-                    + ((C2<=0.) ?-INFINITY : (log(C2)+1)/eparams->M2))
+    + eparams->R*T*(((C2+C3>=1) ? HUGE_VALF : (-log(C1)-1)/eparams->M1)
+                    + ((C2<=0.) ?-HUGE_VALF : (log(C2)+1)/eparams->M2))
     + eparams->Omega12*(C1-C2) - eparams->Omega13*C3 + eparams->Omega23*C3
     + eparams->Omega123*(C1-C2)*C3;
@@ -143 +143 @@
 {
   return G3-G1
-    + eparams->R*T*(((C2+C3>=1) ? INFINITY : (-log(C1)-1)/eparams->M1)
-                    + ((C3<=0.) ?-INFINITY : (log(C3+1)/eparams->M3)))
+    + eparams->R*T*(((C2+C3>=1) ? HUGE_VALF : (-log(C1)-1)/eparams->M1)
+                    + ((C3<=0.) ?-HUGE_VALF : (log(C3+1)/eparams->M3)))
     - eparams->Omega12*C2 + eparams->Omega13*(C1-C3) + eparams->Omega23*C2
     + eparams->Omega123*(C1-C3)*C2;
@@ -185 +185 @@
 {
   return
-    eparams->R*T*(((C2+C3>=1) ? INFINITY : 1./C1/eparams->M1)
-                  + ((C2<=0.) ? INFINITY : 1./C2/eparams->M2))
+    eparams->R*T*(((C2+C3>=1) ? HUGE_VALF : 1./C1/eparams->M1)
+                  + ((C2<=0.) ? HUGE_VALF : 1./C2/eparams->M2))
     - eparams->Omega12*2 - eparams->Omega123*2*C3;
 }
@@ -226 +226 @@
 {
   return
-    eparams->R*T*(((C2+C3>=1) ? INFINITY : 1./C1/eparams->M1)
-                  + ((C3<=0.) ? INFINITY : 1./C3/eparams->M3))
+    eparams->R*T*(((C2+C3>=1) ? HUGE_VALF : 1./C1/eparams->M1)
+                  + ((C3<=0.) ? HUGE_VALF : 1./C3/eparams->M3))
     - eparams->Omega13*2 - eparams->Omega123*2*C2;
 }
@@ -267 +267 @@
 {
   return
-    eparams->R*T*((C2+C3>=1) ? INFINITY : 1./C1/eparams->M1)
+    eparams->R*T*((C2+C3>=1) ? HUGE_VALF : 1./C1/eparams->M1)
     - eparams->Omega12 - eparams->Omega13 + eparams->Omega23
     + eparams->Omega123*(2*C1-1);