fixed full-quadrangle recombine algo:

- run globally, not for each surface
- assign entities to elements
- split line meshes
- correctly re-tag vertices as 1st order
- plug memory leaks

Mesh/2D_Mesh.cpp

-// $Id: 2D_Mesh.cpp,v 1.76 2005-05-15 01:44:26 geuzaine Exp $
+// $Id: 2D_Mesh.cpp,v 1.77 2005-06-09 22:19:02 geuzaine Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -909,7 +909,7 @@ void Maillage_Surface(void *data, void *dum)
       delete_NXE(tnxe);
     }
     
-    if(s->Recombine){// && CTX.mesh.algo_recombine ==1 ){
+    if(s->Recombine){
       Msg(STATUS3, "Recombining surface %d", s->Num);
       Recombine(s->Vertices, s->Simplexes, s->Quadrangles, s->RecombineAngle);
     }
@@ -943,10 +943,4 @@ void Maillage_Surface(void *data, void *dum)
     ReOrientSurfaceMesh(s);
   }
 
-  //  if(CTX.mesh.algo_recombine ==2 )
-  // {
-  //   printf("coucou\n");
-  //   Recombine_All (THEM);
-  //}
-
 }

Mesh/2D_Recombine.cpp

-// $Id: 2D_Recombine.cpp,v 1.23 2005-04-15 14:32:40 remacle Exp $
+// $Id: 2D_Recombine.cpp,v 1.24 2005-06-09 22:19:02 geuzaine Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -181,54 +181,59 @@ int Recombine(Tree_T * Vertices, Tree_T * Simplexes, Tree_T * Quadrangles,
 
 int Recombine_All (Mesh *THEM)
 {
-    if(Tree_Nbr(THEM->Surfaces)) 
-    {
-	// recombine all surfaces
+  if(!Tree_Nbr(THEM->Surfaces)) 
+    return 0;
+
   List_T *surfaces = Tree2List(THEM->Surfaces);
+
+  // check if we need to do something
+  int to_do = 0;
   for(int i = 0; i < List_Nbr(surfaces); i++){
     Surface *s;
     List_Read(surfaces, i, &s);
     if(s->Recombine){
-		Msg(STATUS3, "Recombining surface %d", s->Num);
-		Recombine(s->Vertices, s->Simplexes, s->Quadrangles, s->RecombineAngle);
+      to_do = 1;
+      break;
     }
   }
   
-	// add 2nd order nodes to all elements 
+  if(!to_do){
+    List_Delete(surfaces);
+    return 0;
+  }
   
+  // add 2nd order nodes to all elements 
   Degre2(2);
 
-	// then split everybody
+  Msg(STATUS3, "Splitting all elements");
 
-	for(int i = 0; i < List_Nbr(surfaces); i++)
-	{
+  // then split everybody
+  for(int i = 0; i < List_Nbr(surfaces); i++){
     Surface *s;
     List_Read(surfaces, i, &s);
-	    List_T *Quadrangles = Tree2List ( s->Quadrangles );
 
-	    for (int j=0 ; j<List_Nbr (Quadrangles); j++)
-	    {
+    List_T *Quadrangles = Tree2List(s->Quadrangles);
+    for(int j=0 ; j<List_Nbr(Quadrangles); j++){
       Quadrangle *q;
       List_Read(Quadrangles, j, &q);
       Quadrangle *q1 = Create_Quadrangle(q->V[0], q->VSUP[0], q->VSUP[4], q->VSUP[3]);
       Quadrangle *q2 = Create_Quadrangle(q->V[1], q->VSUP[1], q->VSUP[4], q->VSUP[0]);
       Quadrangle *q3 = Create_Quadrangle(q->V[2], q->VSUP[2], q->VSUP[4], q->VSUP[1]);
       Quadrangle *q4 = Create_Quadrangle(q->V[3], q->VSUP[3], q->VSUP[4], q->VSUP[2]);
+      q1->iEnt = q2->iEnt = q3->iEnt = q4->iEnt = q->iEnt;      
+      for(int k = 0; k < 5; k++) q->VSUP[k]->Degree = 1;
       Tree_Add(s->Quadrangles, &q1);
       Tree_Add(s->Quadrangles, &q2);
       Tree_Add(s->Quadrangles, &q3);
       Tree_Add(s->Quadrangles, &q4);
       Tree_Suppress(s->Quadrangles, &q);
+      Free_Quadrangle(&q, 0);
     }
-	    
     List_Delete(Quadrangles);
     
     List_T *Triangles = Tree2List(s->Simplexes);
-	    
-	    if(s->Recombine)
-	    {
-		for (int j=0 ; j<List_Nbr (Triangles); j++)
-		{
+    if(s->Recombine){
+      for(int j=0 ; j<List_Nbr(Triangles); j++){
 	Simplex *t;
 	List_Read(Triangles, j, &t);
 	Vertex *c = Create_Vertex(++THEM->MaxPointNum, 
@@ -237,9 +242,12 @@ int Recombine_All (Mesh *THEM)
 				  (t->V[0]->Pos.Z+t->V[1]->Pos.Z+t->V[2]->Pos.Z)/3.,
 				  (t->V[0]->lc+t->V[1]->lc+t->V[2]->lc)/3.,
 				  (t->V[0]->u+t->V[1]->u+t->V[2]->u)/3.);
+        Tree_Add(THEM->Vertices, &c);
 	Quadrangle *q1 = Create_Quadrangle(t->V[0], t->VSUP[0], c, t->VSUP[2]);
 	Quadrangle *q2 = Create_Quadrangle(t->V[1], t->VSUP[1], c, t->VSUP[0]);
 	Quadrangle *q3 = Create_Quadrangle(t->V[2], t->VSUP[2], c, t->VSUP[1]);
+	q1->iEnt = q2->iEnt = q3->iEnt = t->iEnt;
+	for(int k = 0; k < 3; k++) t->VSUP[k]->Degree = 1;
 	Tree_Add(s->Quadrangles, &q1);
 	Tree_Add(s->Quadrangles, &q2);
 	Tree_Add(s->Quadrangles, &q3);
@@ -247,16 +255,16 @@ int Recombine_All (Mesh *THEM)
 	Free_Simplex(&t, 0);
       }
     }
-	    else
-	    {
-		for (int j=0 ; j<List_Nbr (Triangles); j++)
-		{
+    else{
+      for(int j=0 ; j<List_Nbr(Triangles); j++){
 	Simplex *t;
 	List_Read(Triangles, j, &t);
 	Simplex *t1 = Create_Simplex(t->V[0], t->VSUP[0],t->VSUP[2], 0);
 	Simplex *t2 = Create_Simplex(t->V[1], t->VSUP[1],t->VSUP[0], 0);
 	Simplex *t3 = Create_Simplex(t->V[2], t->VSUP[2],t->VSUP[1], 0);
 	Simplex *t4 = Create_Simplex(t->VSUP[0], t->VSUP[1],t->VSUP[2], 0);
+	t1->iEnt = t2->iEnt = t3->iEnt = t4->iEnt = t->iEnt;
+	for(int k = 0; k < 3; k++) t->VSUP[k]->Degree = 1;
 	Tree_Add(s->Simplexes, &t1);
 	Tree_Add(s->Simplexes, &t2);
 	Tree_Add(s->Simplexes, &t3);
@@ -267,8 +275,33 @@ int Recombine_All (Mesh *THEM)
     }
     List_Delete(Triangles);
   }
+
   List_Delete(surfaces);
-	Degre1();
+
+  List_T *curves = Tree2List(THEM->Curves);
+  for(int i = 0; i < List_Nbr(curves); i++){
+    Curve *c;
+    List_Read(curves, i, &c);
+
+    List_T *Lines = Tree2List(c->Simplexes);
+    for(int j=0 ; j<List_Nbr(Lines); j++){
+      Simplex *l;
+      List_Read(Lines, j, &l);
+      Simplex *l1 = Create_Simplex(l->V[0], l->VSUP[0], 0, 0);
+      Simplex *l2 = Create_Simplex(l->VSUP[0], l->V[1], 0, 0);
+      l1->iEnt = l2->iEnt = l->iEnt;
+      l->VSUP[0]->Degree = 1;
+      Tree_Add(c->Simplexes, &l1);
+      Tree_Add(c->Simplexes, &l2);
+      Tree_Suppress(c->Simplexes, &l);
+      Free_Simplex(&l, 0);
     }
+    List_Delete(Lines);
+  }
+  
+  List_Delete(curves);
+
+  Degre1();
+
   return 1;
 }

Mesh/Generator.cpp

-// $Id: Generator.cpp,v 1.66 2005-05-27 21:34:54 geuzaine Exp $
+// $Id: Generator.cpp,v 1.67 2005-06-09 22:19:02 geuzaine Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -240,6 +240,11 @@ void Maillage_Dimension_2(Mesh * M)
 
   Tree_Action(M->Surfaces, Maillage_Surface);
 
+  // global "all-quad" recombine
+
+  if(CTX.mesh.algo_recombine == 2)
+    Recombine_All(THEM);
+
   t2 = Cpu();
 
   M->timing[1] = t2 - t1;

doc/VERSIONS

-$Id: VERSIONS,v 1.333 2005-06-08 21:31:11 geuzaine Exp $
+$Id: VERSIONS,v 1.334 2005-06-09 22:19:02 geuzaine Exp $
 
 New since 1.60: added support for second order (curved) elements in
 post-processor; new version (1.4) of post-processing file formats; new
@@ -10,8 +10,8 @@ loading and drawing of line meshes and 2D iso views; optimize handling
 of meshes with large number of physical entities; Removed Discrete
 Line and Discrete Surface commands: the same functionnality can now be
 obtained by simply loading meshes in the usual formats; fixed coloring
-by mesh partition; new "mesh statistics" export format; various small
-bug fixes.
+by mesh partition; new "mesh statistics" export format; new full-quad
+recombine option; various small bug fixes.
 
 New in 1.60: added support for discrete curves; new Window menu on Mac
 OS X; generalized all octree-based plugins (CutGrid, StreamLines,