Changeset 314

Timestamp:

03/25/08 18:24:18 (8 months ago)

Author:

powell

Message:

Striking vertcolor option, just using it by default.

Files:

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

trunk/matml/src/ternary/ternary.c

@@ -14 +14 @@
   char gv_version[100];
   FILE *pfd = NULL;
-  int i, j, loop_max=50, vertcolor=1;
+  int i, j, loop_max=50;
   coordT Gmin=1.e+100, Gmax=-1.e+100, centerG;
 
@@ -50 +50 @@
   fprintf (pfd, "(geometry \"Ternary Phase Diagram\" { : tpd })");
   fprintf (pfd, "(read geometry { define tpd \n");
-  fprintf (pfd, "appearance {}\n%sOFF\n", vertcolor ? "C" : "");
+  fprintf (pfd, "appearance {}\nCOFF\n");
   fprintf (pfd, "%d %d 0\n", (loop_max+1)*(loop_max+2)/2, loop_max*loop_max);
 
@@ -80 +80 @@
         z = G;
 
-        fprintf (pfd, "%g %g %g", x, z, 1.-y);
-        if (vertcolor)
-          fprintf (pfd, " %g %g %g 1",
-                   RED(Grel(G)), GREEN(Grel(G)), BLUE(Grel(G)));
-        fprintf (pfd, "\n");
+        fprintf (pfd, "%g %g %g %g %g %g 1\n", x, z, 1.-y,
+                 RED(Grel(G)), GREEN(Grel(G)), BLUE(Grel(G)));
       }
 
@@ -93 +90 @@
       for (j=0; j<loop_max-1-i; j++)
         {
-          centerG = free_energy (((coordT)i+0.333333)/loop_max,
-                                 ((coordT)j+0.333333)/loop_max, 0.);
-          fprintf (pfd, "3 %d %d %d",
+          fprintf (pfd, "3 %d %d %d\n",
                    ROWSTART(i)+j, ROWSTART(i)+j+1, ROWSTART(i+1)+j);
-          if (!vertcolor)
-            fprintf (pfd, " %g %g %g 1",
-                     RED(Grel(centerG)), GREEN(Grel(centerG)),
-                     BLUE(Grel(centerG)));
-          fprintf (pfd, "\n");
-
-          centerG = free_energy (((coordT)i+0.666667)/loop_max,
-                                 ((coordT)j+0.666667)/loop_max, 0.);
-          fprintf (pfd, "3 %d %d %d",
+          fprintf (pfd, "3 %d %d %d\n",
                    ROWSTART(i)+j+1, ROWSTART(i+1)+j, ROWSTART(i+1)+j+1);
-          if (!vertcolor)
-            fprintf (pfd, " %g %g %g 1",
-                     RED(Grel(centerG)), GREEN(Grel(centerG)),
-                     BLUE(Grel(centerG)));
-          fprintf (pfd, "\n");
         }
-      centerG = free_energy (((coordT)i+0.333333)/loop_max,
-                             ((coordT)j+0.333333)/loop_max, 0.);
-      fprintf (pfd, "3 %d %d %d",
+      fprintf (pfd, "3 %d %d %d\n",
                ROWSTART(i)+j, ROWSTART(i)+j+1, ROWSTART(i+1)+j);
-      if (!vertcolor)
-        fprintf (pfd, " %g %g %g 1",
-                 RED(Grel(centerG)), GREEN(Grel(centerG)),
-                 BLUE(Grel(centerG)));
-      fprintf (pfd, "\n");
     }
-  centerG = free_energy (((coordT)i+0.333333)/loop_max,
-                         0.333333/loop_max, 0.);
-  fprintf (pfd, "3 %d %d %d",
+  fprintf (pfd, "3 %d %d %d\n",
            ROWSTART(i), ROWSTART(i)+1, ROWSTART(i+1));
-  if (!vertcolor)
-    fprintf (pfd, " %g %g %g 1",
-             RED(Grel(centerG)), GREEN(Grel(centerG)),
-             BLUE(Grel(centerG)));
-  fprintf (pfd, "\n");
   fprintf (pfd, "})\n");
   fflush (pfd);