Changeset 504 for trunk/matml/src

Timestamp:

11/30/2009 03:53:36 PM (2 years ago)

Author:

powell

Message:

Bug fix: eliminate old boundaries from view when they aren't needed.

Location:

trunk/matml/src/ternary

Files:

• Ternary.c (modified) (3 diffs)
• ternary.tex.in (modified) (1 diff)

trunk/matml/src/ternary/Ternary.c

@@ -20 +20 @@
 double T_iso=298., P=1., T_min=273., T_max=373.;
 int P1_res=20, P2_res=20, T_steps=50, numpoints=462, refine=2, *verts=NULL;
+int max_boundaries=0;
 gboolean spinodal_toggle [2];
 
@@ -151 +152 @@
           exit (i); }
 
-      if (spinodal_toggle [0])
-        if (i=GeomviewDisplayPhaseBoundary
-            (isotherm_geomview_pipe, "Spinodal 1", "spin", "-face +edge",
-             numpoints, vpoints, spinodals))
-          { printf ("recalculate_and_display: Error %d in Geomview Display\n", i);
-            exit (i); }
-      if (spinodal_toggle [1])
-        if (i=GeomviewDisplayPhaseBoundary
-            (isotherm_geomview_pipe, "Spinodal 2", "spin", "-face +edge",
-             numpoints, vpoints, spinodals))
-          { printf ("recalculate_and_display: Error %d in Geomview Display\n", i);
-            exit (i); }
-
-      for (i=0; i<numbounds; i++)
+      if (i=GeomviewDisplayPhaseBoundary
+          (isotherm_geomview_pipe, "Spinodal 1", "spin1", "-face +edge",
+           numpoints, vpoints, spinodal_toggle[0] ? spinodals : NULL))
+        { printf ("recalculate_and_display: Error %d in Geomview Display\n", i);
+          exit (i); }
+      if (i=GeomviewDisplayPhaseBoundary
+          (isotherm_geomview_pipe, "Spinodal 2", "spin2", "-face +edge",
+           numpoints, vpoints, spinodal_toggle[1] ? spinodals : NULL))
+        { printf ("recalculate_and_display: Error %d in Geomview Display\n", i);
+          exit (i); }
+
+      max_boundaries = (numbounds>max_boundaries) ? numbounds : max_boundaries;
+      for (i=0; i<max_boundaries; i++)
         {
           char name [20], label [10];
@@ -172 +172 @@
           snprintf (label, 8, "bd%d", i);
           if (ret=GeomviewDisplayPhaseBoundary
-              (isotherm_geomview_pipe, name, label, "-face +edge", numpoints, vpoints, allbounds+i))
+              (isotherm_geomview_pipe, name, label, "-face +edge", 
+               numpoints, vpoints, (i<numbounds) ? allbounds+i : NULL))
             { printf ("recalculate_and_display: "
                       "Error %d in Geomview Display\n", ret); exit (ret); }

trunk/matml/src/ternary/ternary.tex.in

@@ -126 +126 @@
   appropriate in some cases, with some of them empty.
 
-\item The {\tt Ternary} GUI does not destroy phase boundaries which are
-  eliminated by changes to the system, nor does it remove a spinodal which the
-  user asks to remove.
-
 \item The {\tt Ternary} GUI is incomplete: it is missing the polynomial and
   Gaussian free energy terms, and cannot add or remove phases.