pp

Mesh/HighOrder.cpp

@@ -688,7 +688,8 @@ MTriangle* setHighOrder(MTriangle *t, GFace *gf,
     }
   }  
 }
-MQuadrangle *setHighOrder(MQuadrangle *q, GFace *gf,
+
+static MQuadrangle *setHighOrder(MQuadrangle *q, GFace *gf,
                                  edgeContainer &edgeVertices, 
                                  faceContainer &faceVertices, 
                                  bool linear, bool incomplete, int nPts, 
@@ -699,23 +700,32 @@ MQuadrangle *setHighOrder(MQuadrangle *q, GFace *gf,
   getEdgeVertices(gf, q, ve, edgeVertices, linear, nPts, displ2D, displ3D);
   if(incomplete){
     if(nPts == 1){
-      return new MQuadrangle8(q->getVertex(0), q->getVertex(1), q->getVertex(2),q->getVertex(3), ve[0],ve[1],ve[2],ve[3]);
-    }else{
-      return new MQuadrangleN(q->getVertex(0), q->getVertex(1), q->getVertex(2), q->getVertex(3), ve, nPts + 1);
+      return new MQuadrangle8(q->getVertex(0), q->getVertex(1), q->getVertex(2), 
+                              q->getVertex(3), ve[0], ve[1], ve[2], ve[3]);
     }
-  } else {
+    else{
+      return new MQuadrangleN(q->getVertex(0), q->getVertex(1), q->getVertex(2),
+                              q->getVertex(3), ve, nPts + 1);
+    }
+  } 
+  else {
     if (displ2D && gf->geomType() == GEntity::Plane){
-      MQuadrangle incpl(q->getVertex(0), q->getVertex(1), q->getVertex(2), q->getVertex(3));
+      MQuadrangle incpl(q->getVertex(0), q->getVertex(1), q->getVertex(2), 
+                        q->getVertex(3));
       getFaceVertices(gf, &incpl, q, vf, faceVertices, linear, nPts, displ2D, displ3D);
     }else{
-      MQuadrangleN incpl(q->getVertex(0), q->getVertex(1), q->getVertex(2), q->getVertex(3), ve, nPts + 1);
+      MQuadrangleN incpl(q->getVertex(0), q->getVertex(1), q->getVertex(2), 
+                         q->getVertex(3), ve, nPts + 1);
       getFaceVertices(gf, &incpl, q, vf, faceVertices, linear, nPts, displ2D, displ3D);
     }
     ve.insert(ve.end(), vf.begin(), vf.end());
     if(nPts == 1){
-      return new MQuadrangle9(q->getVertex(0), q->getVertex(1), q->getVertex(2),q->getVertex(3), ve[0], ve[1], ve[2], ve[3], vf[0]);
-    }else{
-      return new MQuadrangleN(q->getVertex(0), q->getVertex(1), q->getVertex(2), q->getVertex(3), ve, nPts + 1);
+      return new MQuadrangle9(q->getVertex(0), q->getVertex(1), q->getVertex(2),
+                              q->getVertex(3), ve[0], ve[1], ve[2], ve[3], vf[0]);
+    }
+    else{
+      return new MQuadrangleN(q->getVertex(0), q->getVertex(1), q->getVertex(2),
+                              q->getVertex(3), ve, nPts + 1);
     }
   }
 }  

Mesh/HighOrder.h

@@ -23,16 +23,13 @@ class highOrderSmoother;
 
 void SetOrder1(GModel *m);
 void SetOrderN(GModel *m, int order, bool linear=true, bool incomplete=false);
-
-MTriangle* setHighOrder(MTriangle *t,
-                        GFace *gf, 
+MTriangle* setHighOrder(MTriangle *t, GFace *gf, 
                         edgeContainer &edgeVertices, 
                         faceContainer &faceVertices, 
-                        bool linear, 
-                        bool incomplete,
-                        int nPts = 1, 
+                        bool linear, bool incomplete, int nPts = 1, 
                         highOrderSmoother *displ2D = 0,
                         highOrderSmoother *displ3D = 0);
 void checkHighOrderTriangles(const char* cc, GModel *m, 
                              std::vector<MElement*> &bad, double &minJGlob);
+
 #endif