Changeset 438 for trunk/matml

Timestamp:

03/16/2009 03:46:32 PM (3 years ago)

Author:

powell

Message:

Added #ifdef DEBUG around printfs to put them aside until needed.

Files:

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

trunk/matml/src/ternary/qhull.c

@@ -726 +726 @@
   *n_bounds = 0;
 
+#ifdef DEBUG
   printf ("Starting ReturnPhaseBoundaries with %d facets, %d points\n",
           n_facets, n_points);
-
-  printf ("Last facet %d vertices %d, %d, %d\n", n_facets-1,
-          facets[n_facets-1].vertex[0], facets[n_facets-1].vertex[1],
-          facets[n_facets-1].vertex[2]);
+#endif
 
   for (f=0; f<n_facets; f++)
@@ -738 +736 @@
         v2 = facets[f].vertex[2];
 
+#ifdef DEBUG
       printf ("Facet %d: type %d, vertices %d ",f, facets [f].type, v0);
       printf ("(%d), %d (%d), %d(%d)\n",
@@ -743 +742 @@
               points[v1].efunc, v2, points[v2].efunc);
       fflush (stdout);
+#endif
 
       switch (facets [f].type)
@@ -774 +774 @@
                 // No boundary with these three phases, make a new one
                 bound = *n_bounds;
+#ifdef DEBUG
                 printf ("Making new three-phase boundary %d\n", *n_bounds);
+#endif
                 if (!(*boundaries = realloc
                       (*boundaries, (*n_bounds+1) * sizeof (phase_boundary))))
@@ -794 +796 @@
                 (*boundaries) [bound].edges [2] = MAX3 (v0, v1, v2);
                 (*n_bounds) ++;
+#ifdef DEBUG
                 printf ("  Corners for bound %d edge 0: %d, %d, %d\n", bound,
                         (*boundaries) [bound].edges [0],
                         (*boundaries) [bound].edges [1],
                         (*boundaries) [bound].edges [2]);
+#endif
               }
             else
@@ -804 +808 @@
                 // that we need not worry about the realloc overhead
                 int e = (*boundaries) [bound].n_edges;
+#ifdef DEBUG
                 printf ("Ternary boundary %d adding edge %d\n",bound,e);
+#endif
                 // All of these reallocs are pretty expensive...
                 // Later use compos to store size of array, sort out later
@@ -814 +820 @@
                 (*boundaries) [bound].edges [3*e+2] = MAX3 (v0, v1, v2);
                 (*boundaries) [bound].n_edges += 1;
+#ifdef DEBUG
                 printf ("  Corners for bound %d edge %d: %d, %d, %d\n", bound,e,
                         (*boundaries) [bound].edges [3*e],
                         (*boundaries) [bound].edges [3*e+1],
                         (*boundaries) [bound].edges [3*e+2]);
+#endif
               }
 
@@ -852 +860 @@
                       G2 = points [v2].G;
 
+#ifdef DEBUG
                     printf ("Misc gap: ");
+#endif
                     nphases=1;
 
@@ -858 +868 @@
                         (G0+G1)/2)
                       {
+#ifdef DEBUG
                         printf ("v2 alone, Gav=%g, Gmid=%g\n",
                                 (G0+G1)/2, free_energy ((C02+C12)/2,(C03+C13)/2,T,P,eparams+phase0));
+#endif
                         p0 = MIN (v0, v1);
                         p1 = MAX (v0, v1);
@@ -867 +879 @@
                              (G0+G2)/2)
                       {
+#ifdef DEBUG
                         printf ("v1 alone, Gav=%g, Gmid=%g\n",
                                 (G0+G2)/2, free_energy ((C02+C22)/2,(C03+C23)/2,T,P,eparams+phase0));
+#endif
                         p0 = MIN (v0, v2);
                         p1 = MAX (v0, v2);
@@ -875 +889 @@
                     else
                       {
+#ifdef DEBUG
                         printf ("v0 alone, Gav=%g, Gmid=%g\n",
                                 (G1+G2)/2, free_energy ((C22+C12)/2,(C23+C13)/2,T,P,eparams+phase0));
+#endif
                         p0 = MIN (v1, v2);
                         p1 = MAX (v1, v2);
@@ -908 +924 @@
                 bound = *n_bounds;
                 // No boundary with these two phases, make a new one
+#ifdef DEBUG
                 printf ("Making new tie-line boundary %d\n", *n_bounds);
+#endif
                 if (!(*boundaries = realloc
                       (*boundaries, (*n_bounds+1) * sizeof (phase_boundary))))
@@ -940 +958 @@
             (*boundaries) [bound].edges [2*e+2] = MIN (p1, p2);
             (*boundaries) [bound].edges [2*e+3] = MAX (p1, p2);
+#ifdef DEBUG
             printf ("  Corners for bound %d edges %d,%d: %d,%d, %d,%d\n",
                     bound, e, e+1, (*boundaries) [bound].edges [2*e],
@@ -945 +964 @@
                     (*boundaries) [bound].edges [2*e+2],
                     (*boundaries) [bound].edges [2*e+3]);
+#endif
 
             // Check for a boundary with an edge on the "majority" phase
@@ -958 +978 @@
                 // No boundary with these two phases, make a new one
                 bound = *n_bounds;
+#ifdef DEBUG
                 printf ("Making new phase edge boundary %d\n", *n_bounds);
+#endif
                 if (!(*boundaries = realloc
                       (*boundaries, (bound+1) * sizeof (phase_boundary))))
@@ -986 +1008 @@
             (*boundaries) [bound].edges [2*e+1] = MAX (p0, p1);
             (*boundaries) [bound].n_edges += 1;
+#ifdef DEBUG
             printf ("  Corners for bound %d edge %d: %d,%d\n",
                     bound, e, (*boundaries) [bound].edges [2*e],
                     (*boundaries) [bound].edges [2*e+1]);
+#endif
 
             break;
@@ -995 +1019 @@
         case CRITICAL_POINT:
           {
+#ifdef DEBUG
             printf ("Critical point case\n");
+#endif
             int b=0, bound=-1, p0, p1, p2, e=0, phase = points [v0].efunc;
             double C02 = points [v0].C2, C03 = points [v0].C3,
@@ -1006 +1032 @@
                 (G0+G1)/2)
               {
+#ifdef DEBUG
                 printf ("v2 alone, Gav=%g, Gmid=%g\n",
                         (G0+G1)/2, free_energy ((C02+C12)/2,(C03+C13)/2,T,P,eparams+phase));
+#endif
                 p0 = MIN (v0, v1);
                 p1 = MAX (v0, v1);
@@ -1015 +1043 @@
                      (G0+G2)/2)
               {
+#ifdef DEBUG
                 printf ("v1 alone, Gav=%g, Gmid=%g\n",
                         (G0+G2)/2, free_energy ((C02+C22)/2,(C03+C23)/2,T,P,eparams+phase));
+#endif
                 p0 = MIN (v0, v2);
                 p1 = MAX (v0, v2);
@@ -1023 +1053 @@
             else
               {
+#ifdef DEBUG
                 printf ("v0 alone, Gav=%g, Gmid=%g\n",
                         (G1+G2)/2, free_energy ((C22+C12)/2,(C23+C13)/2,T,P,eparams+phase));
+#endif
                 p0 = MIN (v1, v2);
                 p1 = MAX (v1, v2);
@@ -1041 +1073 @@
                 bound = *n_bounds;
                 // No tie-line boundary in this phase, make a new one
+#ifdef DEBUG
                 printf ("Making new tie-line boundary %d\n", *n_bounds);
+#endif
                 if (!(*boundaries = realloc
                       (*boundaries, (*n_bounds+1) * sizeof (phase_boundary))))
@@ -1069 +1103 @@
             (*boundaries) [bound].edges [2*e]   = MIN (p0, p1);
             (*boundaries) [bound].edges [2*e+1] = MAX (p0, p1);
+#ifdef DEBUG
             printf ("  Corners for bound %d edges %d,%d: %d,%d\n",
                     bound, e, e+1, (*boundaries) [bound].edges [2*e],
                     (*boundaries) [bound].edges [2*e+1]);
+#endif
 
             // Check for a boundary with an edge on this miscibility gap
@@ -1084 +1120 @@
                 // No edge boundary with this miscibility gap, make a new one
                 bound = *n_bounds;
+#ifdef DEBUG
                 printf ("Making new phase edge boundary %d\n", *n_bounds);
+#endif
                 if (!(*boundaries = realloc
                       (*boundaries, (bound+1) * sizeof (phase_boundary))))
@@ -1112 +1150 @@
             (*boundaries) [bound].edges [2*e+3] = MAX (p1, p2);
             (*boundaries) [bound].n_edges += 2;
+#ifdef DEBUG
             printf ("  Corners for bound %d edge %d: %d,%d, %d,%d\n",
                     bound, e, (*boundaries) [bound].edges [2*e],
@@ -1117 +1156 @@
                     (*boundaries) [bound].edges [2*e+2],
                     (*boundaries) [bound].edges [2*e+3]);
+#endif
 
             break;