Changeset 431 for trunk/matml/src

Timestamp:

03/06/2009 04:46:13 PM (3 years ago)

Author:

powell

Message:

Allow the user to visualize composition on a square, not triangle, array.

Location:

trunk/matml/src/ternary

Files:

• book.c (modified) (2 diffs)
• ternary.c (modified) (2 diffs)
• ternary.h (modified) (1 diff)

trunk/matml/src/ternary/book.c

@@ -174 +174 @@
   double *Gmax Optional address to store the maximum free energy in the array
   on return (NULL if unwanted), used as G1 if both G0 and G1 are zero.
+
+  int square Flag: zero for triangle composition representation, non-zero for
+  square.
   ++++++++++++++++++++++++++++++++++++++*/
 
 int scale_energy_array (int num_points, ternary_point *points,
-                          double y0, double G0, double y1, double G1,
-                          double *Gmin, double *Gmax)
+                        double y0, double G0, double y1, double G1,
+                        double *Gmin, double *Gmax, int square)
 {
   int i;
@@ -218 +221 @@
   for (i=0; i<num_points; i++)
     {
-      points[i].x = points[i].C2 + 0.5*points[i].C3;
+      if (square)
+        {
+          points[i].x = points[i].C2;
+          points[i].z = 1.-points[i].C3;
+        }
+      else
+        {
+          points[i].x = points[i].C2 + 0.5*points[i].C3;
+          points[i].z = (1. - points[i].C3) * sqrt(3)/2.;
+        }
       points[i].y = Grel(points[i].G);
-      points[i].z = (1. - points[i].C3) * sqrt(3)/2.;
       points[i].red   = RED   (Grel (points[i].G));
       points[i].green = GREEN (Grel (points[i].G));

trunk/matml/src/ternary/ternary.c

@@ -82 +82 @@
 
   /* Scale all free energy values */
-  if (i=scale_energy_array (numpoints, points, 0., -.2, 1., .9, NULL, NULL))
+  if (i=scale_energy_array (numpoints, points, 0., -.2, 1., .9, NULL, NULL, 0))
     { printf ("main: Error %d in scale_triangle_array\n", i); exit (i); }
 
@@ -112 +112 @@
 
   /* Scale and display everything */
-  if (i=scale_energy_array (numpoints, points, 0., -.2, 1., .9, NULL, NULL))
+  if (i=scale_energy_array (numpoints, points, 0., -.2, 1., .9, NULL, NULL, 0))
     { printf ("main: Error %d in scale_triangle_array\n", i); exit (i); }
 

trunk/matml/src/ternary/ternary.h

@@ -186 +186 @@
 int scale_energy_array (int num_points, ternary_point *points,
                         double y0, double G0, double y1, double G1,
-                        double *Gmin, double *Gmax);
+                        double *Gmin, double *Gmax, int square);
 
 #endif /* TERNARY_H */