refactoring

Geo/GModelIO_GEO.cpp

@@ -27,27 +27,7 @@
 #include "Parser.h"
 #endif
 
-// GEO_Internals routines
-
-int compareVertex(const void *a, const void *b);
-int compareSurfaceLoop(const void *a, const void *b);
-int compareEdgeLoop(const void *a, const void *b);
-int compareCurve(const void *a, const void *b);
-int compareSurface(const void *a, const void *b);
-int compareVolume(const void *a, const void *b);
-int compareLevelSet(const void *a, const void *b);
-int comparePhysicalGroup(const void *a, const void *b);
-
-void Free_Vertex(void *a, void *b);
-void Free_PhysicalGroup(void *a, void *b);
-void Free_EdgeLoop(void *a, void *b);
-void Free_SurfaceLoop(void *a, void *b);
-void Free_Curve(void *a, void *b);
-void Free_Surface(void *a, void *b);
-void Free_Volume(void *a, void *b);
-void Free_LevelSet(void *a, void *b);
-
-void GEO_Internals::alloc_all()
+void GEO_Internals::_allocateAll()
 {
   MaxPointNum = MaxLineNum = MaxLineLoopNum = MaxSurfaceNum = 0;
   MaxSurfaceLoopNum = MaxVolumeNum = MaxPhysicalNum = 0;
@@ -61,7 +41,7 @@ void GEO_Internals::alloc_all()
   PhysicalGroups = List_Create(5, 5, sizeof(PhysicalGroup *));
 }
 
-void GEO_Internals::free_all()
+void GEO_Internals::_freeAll()
 {
   MaxPointNum = MaxLineNum = MaxLineLoopNum = MaxSurfaceNum = 0;
   MaxSurfaceLoopNum = MaxVolumeNum = MaxPhysicalNum = 0;
@@ -75,12 +55,25 @@ void GEO_Internals::free_all()
   List_Action(PhysicalGroups, Free_PhysicalGroup); List_Delete(PhysicalGroups);
 }
 
-void GEO_Internals::reset_physicals()
+void GEO_Internals::resetPhysicalGroups()
 {
   List_Action(PhysicalGroups, Free_PhysicalGroup);
   List_Reset(PhysicalGroups);
 }
 
+void GEO_Internals::addVertex(int num, double x, double y, double z, double lc)
+{
+  Vertex *v = Create_Vertex(num, x, y, z, lc, 1.0);
+  Tree_Add(Points, &v);
+}
+
+void GEO_Internals::addVertex(int num, double x, double y, gmshSurface *surface,
+                              double lc)
+{
+  Vertex *v = Create_Vertex(num, x, y, surface, lc);
+  Tree_Add(Points, &v);
+}
+
 // GModel interface
 
 void GModel::_createGEOInternals()

Geo/GModelIO_GEO.h

@@ -10,8 +10,8 @@
 
 class GEO_Internals{
  private:
-  void alloc_all();
-  void free_all();
+  void _allocateAll();
+  void _freeAll();
  public:
   // FIXME: all this must (will) become private ; and all the direct calls in
   // Gmsh.y should (will) go through an integer-based API similar to the one in
@@ -45,18 +45,19 @@ class GEO_Internals{
   std::map<int, MasterFace> periodicFaces;
 
  public:
-  GEO_Internals(){ alloc_all(); }
-  ~GEO_Internals(){ free_all(); }
-  void destroy(){ free_all(); alloc_all(); }
-  void reset_physicals();
+  GEO_Internals(){ _allocateAll(); }
+  ~GEO_Internals(){ _freeAll(); }
+  void destroy(){ _freeAll(); _allocateAll(); }
+  void resetPhysicalGroups();
   void addCompoundMesh(int dim, List_T *_list)
   {
     std::vector<int> compound;
     for(int i = 0; i < List_Nbr(_list); i++)
       compound.push_back((int)*(double*)List_Pointer(_list, i));
-    meshCompounds.insert(std::make_pair(dim,compound));
+    meshCompounds.insert(std::make_pair(dim, compound));
   }
-
+  void addVertex(int num, double x, double y, double z, double lc);
+  void addVertex(int num, double x, double y, gmshSurface *s, double lc);
 };
 
 #endif

Geo/Geo.h

@@ -306,7 +306,22 @@ int NEWFIELD(void);
 int NEWPHYSICAL(void);
 
 int compareVertex(const void *a, const void *b);
+int compareSurfaceLoop(const void *a, const void *b);
+int compareEdgeLoop(const void *a, const void *b);
 int compareCurve(const void *a, const void *b);
+int compareSurface(const void *a, const void *b);
+int compareVolume(const void *a, const void *b);
+int compareLevelSet(const void *a, const void *b);
+int comparePhysicalGroup(const void *a, const void *b);
+
+void Free_Vertex(void *a, void *b);
+void Free_PhysicalGroup(void *a, void *b);
+void Free_EdgeLoop(void *a, void *b);
+void Free_SurfaceLoop(void *a, void *b);
+void Free_Curve(void *a, void *b);
+void Free_Surface(void *a, void *b);
+void Free_Volume(void *a, void *b);
+void Free_LevelSet(void *a, void *b);
 
 void Projette(Vertex *v, double mat[3][3]);
 

Parser/Gmsh.y

@@ -1736,17 +1736,15 @@ Shape :
         double y = CTX::instance()->geom.scalingFactor * $6[1];
         double z = CTX::instance()->geom.scalingFactor * $6[2];
         double lc = CTX::instance()->geom.scalingFactor * $6[3];
+        if(lc == 0.) lc = MAX_LC; // no mesh size given at the point
         if(factory == "OpenCASCADE" && GModel::current()->getOCCInternals()){
           GModel::current()->getOCCInternals()->addVertex(num, x, y, z, lc);
         }
         else{
-          if(lc == 0.) lc = MAX_LC; // no mesh size given at the point
-          Vertex *v;
           if(!myGmshSurface)
-            v = Create_Vertex(num, x, y, z, lc, 1.0);
+            GModel::current()->getGEOInternals()->addVertex(num, x, y, z, lc);
           else
-            v = Create_Vertex(num, x, y, myGmshSurface, lc);
-          Tree_Add(GModel::current()->getGEOInternals()->Points, &v);
+            GModel::current()->getGEOInternals()->addVertex(num, x, y, myGmshSurface, lc);
         }
         AddToTemporaryBoundingBox(x, y, z);
       }
@@ -3667,7 +3665,7 @@ Delete :
 	GModel::current()->getGEOInternals()->destroy();
       }
       else if(!strcmp($2, "Physicals")){
-	GModel::current()->getGEOInternals()->reset_physicals();
+	GModel::current()->getGEOInternals()->resetPhysicalGroups();
 	GModel::current()->deletePhysicalGroups();
       }
       else if(!strcmp($2, "Variables")){