enable new initial delaunay for testing nightly builds

Mesh/meshGFace.cpp

@@ -46,9 +46,11 @@
 #include "boundaryLayersData.h"
 #include "filterElements.h"
 
-// new quad code
-// new initial delaunay
-#define OLD_CODE 1
+// define this to use the old initial delaunay
+//#define OLD_TRI_CODE
+
+// define this to use th old quad code
+#define OLD_QUAD_CODE
 
 static void computeElementShapes(GFace *gf, double &worst, double &avg,
                                  double &best, int &nT, int &greaterThan)
@@ -1194,15 +1196,14 @@ bool meshGenerator(GFace *gf, int RECUR_ITER,
 
   bbox.makeCube();
 
-  // compute the bounding box in parametric space
-  SVector3 dd(bbox.max(), bbox.min());
-  double LC2D = norm(dd);
-
   // use a divide & conquer type algorithm to create a triangulation.
   // We add to the triangulation a box with 4 points that encloses the
   // domain.
-#ifdef OLD_CODE
+#if defined(OLD_TRI_CODE)
   {
+    // compute the bounding box in parametric space
+    SVector3 dd(bbox.max(), bbox.min());
+    double LC2D = norm(dd);
     DocRecord doc(points.size() + 4);
     for(unsigned int i = 0; i < points.size(); i++){
       double XX = CTX::instance()->mesh.randFactor * LC2D * (double)rand() /
@@ -2050,7 +2051,7 @@ static bool meshGeneratorPeriodic(GFace *gf, bool debug = true)
   // Use a divide & conquer type algorithm to create a triangulation.
   // We add to the triangulation a box with 4 points that encloses the
   // domain.
-#if 1 //OLD_CODE
+#if 1 //OLD_TRI_CODE
   {
     DocRecord doc(nbPointsTotal + 4);
     int count = 0;
@@ -2561,7 +2562,7 @@ void meshGFace::operator() (GFace *gf, bool print)
     return;
   }
 
-#ifdef OLD_CODE
+#if !defined(OLD_QUAD_CODE)
   quadMeshRemoveHalfOfOneDMesh halfmesh (gf);
 #endif
 
@@ -2581,7 +2582,7 @@ void meshGFace::operator() (GFace *gf, bool print)
   Msg::Debug("Type %d %d triangles generated, %d internal vertices",
              gf->geomType(), gf->triangles.size(), gf->mesh_vertices.size());
 
-#ifdef OLD_CODE
+#if !defined(OLD_QUAD_CODE)
   halfmesh.finish();
 #endif
 }