subdivide after optimization

Mesh/Generator.cpp

@@ -408,9 +408,6 @@ static void Mesh2D(GModel *m)
     }
   }
   
-  // use "full quad" subdivision
-  if(CTX.mesh.algo_subdivide == 1) RefineMesh(m, false, true);
-
   // gmshCollapseSmallEdges (*m);
 
   double t2 = Cpu();
@@ -456,9 +453,6 @@ static void Mesh3D(GModel *m)
   for(unsigned int i = 0; i < connected.size(); i++)
     MeshDelaunayVolume(connected[i]);
 
-  // Use "full hexa" subdivision?
-  if(CTX.mesh.algo_subdivide == 2) RefineMesh(m, false, false, true);
-
   double t2 = Cpu();
   CTX.mesh_timer[2] = t2 - t1;
   Msg::Info("Mesh 3D complete (%g s)", CTX.mesh_timer[2]);
@@ -565,6 +559,12 @@ void GenerateMesh(GModel *m, int ask)
     }
   }
 
+  // Subdivide into quads or hexas
+  if(m->getMeshStatus() == 2 && CTX.mesh.algo_subdivide == 1) 
+    RefineMesh(m, false, true);
+  else if(m->getMeshStatus() == 3 && CTX.mesh.algo_subdivide == 2) 
+    RefineMesh(m, false, false, true);
+  
   // Create high order elements
   if(m->getMeshStatus() && CTX.mesh.order > 1) 
     SetOrderN(m, CTX.mesh.order, CTX.mesh.second_order_linear,