Changeset 463 for trunk/matml/src

Timestamp:

06/18/2009 02:43:36 PM (3 years ago)

Author:

powell

Message:

Changed phase boundary "flags" to "type" which is more fitting.

Location:

trunk/matml/src/ternary

Files:

• gibbs.h (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• qhull.c (modified) (10 diffs)
• spinodal.c (modified) (1 diff)
• square.c (modified) (1 diff)
• ternary.c (modified) (1 diff)

trunk/matml/src/ternary/gibbs.h

@@ -48 +48 @@
                       etc. +*/
   SPINODAL          /*+ Spinodal boundary +*/
-} phase_boundary_flags;
+} phase_boundary_type;
 
 typedef struct {
@@ -58 +58 @@
                   "current" phase +*/
   int n_phases; /*+ Number of phases involved +*/
-  phase_boundary_flags flags; /*+ See phase_boundary_flags typedef enum +*/
+  phase_boundary_type type; /*+ See phase_boundary_flags typedef enum +*/
 } phase_boundary; /*+ Phase boundary structure which can store either the
                     boundary between a single phase and a multi-phase region,

trunk/matml/src/ternary/Makefile.am

@@ -12 +12 @@
 
 libfreenergy_la_SOURCES = freenergy.c
+libfreenergy_la_LIBADD  = -lm
 libfreenergy_la_CFLAGS  = -std=c99 #-DDEBUG
 libfreenergy_la_LDFLAGS = -version-info 0:0:0
 
 libgibbs_la_SOURCES = geomview.c qhull.c book.c spinodal.c
-libgibbs_la_LIBADD  = -lm -lqhull libfreenergy.la
+libgibbs_la_LIBADD  = -lqhull libfreenergy.la
 libgibbs_la_CFLAGS  = -std=c99 -DGEOMVIEW=\"@GEOMVIEW@\" #-DDEBUG
 libgibbs_la_LDFLAGS = -version-info 0:0:0

trunk/matml/src/ternary/qhull.c

@@ -776 +776 @@
               if ((*boundaries) [b].n_phases == 3)
                 if ((*boundaries) [b].compos == 3 &&
-                    (*boundaries) [b].flags == TIE_SIMPLICES &&
+                    (*boundaries) [b].type == TIE_SIMPLICES &&
                     (*boundaries) [b].phases[0] == phase0 &&
                     (*boundaries) [b].phases[1] == phase1 &&
@@ -800 +800 @@
                 (*boundaries) [bound].phases [1] = phase1;
                 (*boundaries) [bound].phases [2] = phase2;
-                (*boundaries) [bound].flags = TIE_SIMPLICES;
+                (*boundaries) [bound].type = TIE_SIMPLICES;
                 (*boundaries) [bound].n_edges = 1;
                 if (!((*boundaries) [bound].edges = malloc (3*sizeof (int))))
@@ -927 +927 @@
             for (b=0; b<*n_bounds; b++)
               if ((*boundaries) [b].n_phases == nphases &&
-                  (*boundaries) [b].flags == TIE_SIMPLICES &&
+                  (*boundaries) [b].type == TIE_SIMPLICES &&
                   (*boundaries) [b].phases[0] == phase0 &&
                   (*boundaries) [b].phases[nphases-1] == phase1)
@@ -952 +952 @@
                 (*boundaries) [bound].n_edges = 0;
                 (*boundaries) [bound].edges = NULL;
-                (*boundaries) [bound].flags = TIE_SIMPLICES;
+                (*boundaries) [bound].type = TIE_SIMPLICES;
                 (*n_bounds) ++;
                 e=0;
@@ -981 +981 @@
             for (b=0, bound=-1; b<*n_bounds; b++)
               if ((*boundaries) [b].n_phases == nphases &&
-                  (*boundaries) [b].flags == ONE_PHASE_EDGE &&
+                  (*boundaries) [b].type == ONE_PHASE_EDGE &&
                   (*boundaries) [b].phases[0] == points[p0].efunc &&
                   (*boundaries) [b].phases[nphases-1] == points[p2].efunc)
@@ -1006 +1006 @@
                 (*boundaries) [bound].n_edges = 0;
                 (*boundaries) [bound].edges = NULL;
-                (*boundaries) [bound].flags = ONE_PHASE_EDGE;
+                (*boundaries) [bound].type = ONE_PHASE_EDGE;
                 (*n_bounds) ++;
                 e=0;
@@ -1077 +1077 @@
             for (b=0; b<*n_bounds; b++)
               if ((*boundaries) [b].n_phases == 1 &&
-                  (*boundaries) [b].flags == TIE_SIMPLICES &&
+                  (*boundaries) [b].type == TIE_SIMPLICES &&
                   (*boundaries) [b].phases[0] == phase)
                 bound = b;
@@ -1099 +1099 @@
                 (*boundaries) [bound].n_edges = 0;
                 (*boundaries) [bound].edges = NULL;
-                (*boundaries) [bound].flags = TIE_SIMPLICES;
+                (*boundaries) [bound].type = TIE_SIMPLICES;
                 (*n_bounds) ++;
                 e=0;
@@ -1124 +1124 @@
             for (b=0, bound=-1; b<*n_bounds; b++)
               if ((*boundaries) [b].n_phases == 1 &&
-                  (*boundaries) [b].flags == ONE_PHASE_EDGE &&
+                  (*boundaries) [b].type == ONE_PHASE_EDGE &&
                   (*boundaries) [b].phases[0] == phase)
                 bound = b;
@@ -1146 +1146 @@
                 (*boundaries) [bound].n_edges = 0;
                 (*boundaries) [bound].edges = NULL;
-                (*boundaries) [bound].flags = ONE_PHASE_EDGE;
+                (*boundaries) [bound].type = ONE_PHASE_EDGE;
                 (*n_bounds) ++;
                 e=0;

trunk/matml/src/ternary/spinodal.c

@@ -337 +337 @@
       *(spinreturn->phases) = efunc;
       spinreturn->n_phases = 1;
-      spinreturn->flags = SPINODAL;
+      spinreturn->type = SPINODAL;
     }
 

trunk/matml/src/ternary/square.c

@@ -135 +135 @@
 
       printf ("Boundary %d: %d-phase %s, phases:", i, (allbounds+i)->n_phases,
-              ((allbounds+i)->flags==TIE_SIMPLICES) ? "tie-simplices":"edge");
+              ((allbounds+i)->type==TIE_SIMPLICES) ? "tie-simplices":"edge");
       for (ret=0; ret<(allbounds+i)->n_phases; ret++)
         printf (" %d", (allbounds+i)->phases[ret]);

trunk/matml/src/ternary/ternary.c

@@ -134 +134 @@
 
       printf ("Boundary %d: %d-phase %s, phases:", i, (allbounds+i)->n_phases,
-              ((allbounds+i)->flags==TIE_SIMPLICES) ? "tie-simplices":"edge");
+              ((allbounds+i)->type==TIE_SIMPLICES) ? "tie-simplices":"edge");
       for (ret=0; ret<(allbounds+i)->n_phases; ret++)
         printf (" %d", (allbounds+i)->phases[ret]);