Changeset 334

Timestamp:

03/26/08 18:35:05 (8 months ago)

Author:

powell

Message:

Remove single-phase triangles (area test won't work when refined).

Files:

• trunk/matml/src/ternary/ternary.c (modified) (1 diff)

trunk/matml/src/ternary/ternary.c

@@ -122 +122 @@
   printf ("qhull version: %s\n", qh_version);
 
+  /* Take out hull triangles which are on the main function (in one phase) */
+  for (i=0; i<hullnumverts; i++)
+    {
+      double x0 = points [hullverts [3*i]].C2,
+        y0 = points [hullverts [3*i]].C3,
+        x1 = points [hullverts [3*i+1]].C2,
+        y1 = points [hullverts [3*i+1]].C3,
+        x2 = points [hullverts [3*i+2]].C2,
+        y2 = points [hullverts [3*i+2]].C3;
 #ifdef DEBUG
-  for (i=0; i<hullnumverts; i++)
-    printf ("Facet %d vertices: %d %d %d\n", i, hullverts[3*i],
-            hullverts[3*i+1], hullverts[3*i+2]);
+      printf ("Facet %d vertices: %d %d %d\n", i, hullverts[3*i],
+              hullverts[3*i+1], hullverts[3*i+2]);
 #endif
+      /* XY-projection area test (only works for uniform triangles) */
+      if (fabs ((x1-x0)*(y2-y0) - (x2-x0)*(y1-y0)) <= 1.1/loop_max/loop_max)
+        {
+          for (j=i; j<hullnumverts-1; j++)
+            {
+              hullverts [3*j]   = hullverts [3*j+3];
+              hullverts [3*j+1] = hullverts [3*j+4];
+              hullverts [3*j+2] = hullverts [3*j+5];
+            }
+          hullnumverts--;
+          i--;
+        }
+    }
+
+  printf ("Binodal region has %d facets\n", hullnumverts);
 
   if (i=GeomviewDisplayTriangleCOFF
-      (pfd, "Free Energy Convex Hull", "ech", "-face +edge",
+      (pfd, "Binodal and Tie Lines", "ech", "-face +edge",
        (loop_max+1)*(loop_max+2)/2, points, hullnumverts, hullverts))
     { printf ("main: Error %d in Geomview Display\n", i); exit (i); }