Changeset 448 for trunk/matml

Timestamp:

03/18/2009 04:10:14 PM (3 years ago)

Author:

powell

Message:

More realistic free energy function, fix to res3 command line input.

Files:

• trunk/matml/src/ternary/square.c (modified) (2 diffs)

trunk/matml/src/ternary/square.c

@@ -37 +37 @@
   /* eparams: R,T0, G1@T0,G2,G3, C1,C2,C3, M1,M2,M3, O12,O13,O23,O123 */
   energy_params /* Solid, liquid */
-    eparams0 = {"Solid", 1.,1., 0.,-.1,-.2, -1.,-1.1,-1.2, 0.,.5,.2,1.,2., -.5,2.,.2, 0.},
+    eparams0 = {"Solid", 1.,1., 0.,-.1,-.2, -1.,-1.1,-1.2, 0.,1.,1.,1.,1., -.5,2.,.2, 0.},
     eparams1 = {"Liquid", 1.,1., .3,.1,-.1, -2.2,-2.,-1.8, 0.,1.,.67,1.,2., -.3,-.4,-.1, -.5},
       allparams[2] = {eparams0, eparams1};
@@ -44 +44 @@
     sscanf (argv[1], "%d", &res2);
   if (argc>2)
-    sscanf (argv[1], "%d", &res3);
+    sscanf (argv[2], "%d", &res3);
   else
     res3 = res2;