refactoring physical groups

Geo/GModelIO_GEO.cpp

@@ -109,13 +109,13 @@ void GEO_Internals::addLine(int num, std::vector<int> vertexTags)
     Msg::Error("GEO edge with tag %d already exists", num);
     return;
   }
-  List_T *temp = List_Create(2, 2, sizeof(int));
+  List_T *tmp = List_Create(2, 2, sizeof(int));
   for(unsigned int i = 0; i < vertexTags.size(); i++)
-    List_Add(temp, &vertexTags[i]);
-  Curve *c = Create_Curve(num, MSH_SEGM_LINE, 1, temp, NULL, -1, -1, 0., 1.);
+    List_Add(tmp, &vertexTags[i]);
+  Curve *c = Create_Curve(num, MSH_SEGM_LINE, 1, tmp, NULL, -1, -1, 0., 1.);
   Tree_Add(Curves, &c);
   CreateReversedCurve(c);
-  List_Delete(temp);
+  List_Delete(tmp);
   _changed = true;
 }
 
@@ -126,11 +126,11 @@ void GEO_Internals::addCircleArc(int num, int startTag, int centerTag, int endTa
     Msg::Error("GEO edge with tag %d already exists", num);
     return;
   }
-  List_T *temp = List_Create(3, 2, sizeof(int));
-  List_Add(temp, &startTag);
-  List_Add(temp, &centerTag);
-  List_Add(temp, &endTag);
-  Curve *c = Create_Curve(num, MSH_SEGM_CIRC, 2, temp, NULL, -1, -1, 0., 1.);
+  List_T *tmp = List_Create(3, 2, sizeof(int));
+  List_Add(tmp, &startTag);
+  List_Add(tmp, &centerTag);
+  List_Add(tmp, &endTag);
+  Curve *c = Create_Curve(num, MSH_SEGM_CIRC, 2, tmp, NULL, -1, -1, 0., 1.);
   if(nx || ny || nz){
     c->Circle.n[0] = nx;
     c->Circle.n[1] = ny;
@@ -145,7 +145,7 @@ void GEO_Internals::addCircleArc(int num, int startTag, int centerTag, int endTa
     rc->Circle.n[2] = nz;
     End_Curve(rc);
   }
-  List_Delete(temp);
+  List_Delete(tmp);
   _changed = true;
 }
 
@@ -156,12 +156,12 @@ void GEO_Internals::addEllipseArc(int num, int startTag, int centerTag, int majo
     Msg::Error("GEO edge with tag %d already exists", num);
     return;
   }
-  List_T *temp = List_Create(3, 2, sizeof(int));
-  List_Add(temp, &startTag);
-  List_Add(temp, &centerTag);
-  List_Add(temp, &majorTag);
-  List_Add(temp, &endTag);
-  Curve *c = Create_Curve(num, MSH_SEGM_ELLI, 2, temp, NULL, -1, -1, 0., 1.);
+  List_T *tmp = List_Create(3, 2, sizeof(int));
+  List_Add(tmp, &startTag);
+  List_Add(tmp, &centerTag);
+  List_Add(tmp, &majorTag);
+  List_Add(tmp, &endTag);
+  Curve *c = Create_Curve(num, MSH_SEGM_ELLI, 2, tmp, NULL, -1, -1, 0., 1.);
   if(nx || ny || nz){
     c->Circle.n[0] = nx;
     c->Circle.n[1] = ny;
@@ -176,7 +176,7 @@ void GEO_Internals::addEllipseArc(int num, int startTag, int centerTag, int majo
     rc->Circle.n[2] = nz;
     End_Curve(rc);
   }
-  List_Delete(temp);
+  List_Delete(tmp);
   _changed = true;
 }
 
@@ -186,13 +186,13 @@ void GEO_Internals::addSpline(int num, std::vector<int> vertexTags)
     Msg::Error("GEO edge with tag %d already exists", num);
     return;
   }
-  List_T *temp = List_Create(2, 2, sizeof(int));
+  List_T *tmp = List_Create(2, 2, sizeof(int));
   for(unsigned int i = 0; i < vertexTags.size(); i++)
-    List_Add(temp, &vertexTags[i]);
-  Curve *c = Create_Curve(num, MSH_SEGM_SPLN, 3, temp, NULL, -1, -1, 0., 1.);
+    List_Add(tmp, &vertexTags[i]);
+  Curve *c = Create_Curve(num, MSH_SEGM_SPLN, 3, tmp, NULL, -1, -1, 0., 1.);
   Tree_Add(Curves, &c);
   CreateReversedCurve(c);
-  List_Delete(temp);
+  List_Delete(tmp);
   _changed = true;
 }
 
@@ -202,13 +202,13 @@ void GEO_Internals::addBSpline(int num, std::vector<int> vertexTags)
     Msg::Error("GEO edge with tag %d already exists", num);
     return;
   }
-  List_T *temp = List_Create(2, 2, sizeof(int));
+  List_T *tmp = List_Create(2, 2, sizeof(int));
   for(unsigned int i = 0; i < vertexTags.size(); i++)
-    List_Add(temp, &vertexTags[i]);
-  Curve *c = Create_Curve(num, MSH_SEGM_BSPLN, 2, temp, NULL, -1, -1, 0., 1.);
+    List_Add(tmp, &vertexTags[i]);
+  Curve *c = Create_Curve(num, MSH_SEGM_BSPLN, 2, tmp, NULL, -1, -1, 0., 1.);
   Tree_Add(Curves, &c);
   CreateReversedCurve(c);
-  List_Delete(temp);
+  List_Delete(tmp);
   _changed = true;
 }
 
@@ -218,13 +218,13 @@ void GEO_Internals::addBezier(int num, std::vector<int> vertexTags)
     Msg::Error("GEO edge with tag %d already exists", num);
     return;
   }
-  List_T *temp = List_Create(2, 2, sizeof(int));
+  List_T *tmp = List_Create(2, 2, sizeof(int));
   for(unsigned int i = 0; i < vertexTags.size(); i++)
-    List_Add(temp, &vertexTags[i]);
-  Curve *c = Create_Curve(num, MSH_SEGM_BEZIER, 2, temp, NULL, -1, -1, 0., 1.);
+    List_Add(tmp, &vertexTags[i]);
+  Curve *c = Create_Curve(num, MSH_SEGM_BEZIER, 2, tmp, NULL, -1, -1, 0., 1.);
   Tree_Add(Curves, &c);
   CreateReversedCurve(c);
-  List_Delete(temp);
+  List_Delete(tmp);
   _changed = true;
 }
 
@@ -236,16 +236,16 @@ void GEO_Internals::addNurbs(int num, std::vector<int> vertexTags,
     return;
   }
   int order = knots.size() - vertexTags.size() - 1;
-  List_T *temp = List_Create(2, 2, sizeof(int));
+  List_T *tmp = List_Create(2, 2, sizeof(int));
   for(unsigned int i = 0; i < vertexTags.size(); i++)
-    List_Add(temp, &vertexTags[i]);
+    List_Add(tmp, &vertexTags[i]);
   List_T *knotsList = List_Create(2, 2, sizeof(double));
   for(unsigned int i = 0; i < knots.size(); i++)
     List_Add(knotsList, &knots[i]);
-  Curve *c = Create_Curve(num, MSH_SEGM_NURBS, order, temp, knotsList, -1, -1, 0., 1.);
+  Curve *c = Create_Curve(num, MSH_SEGM_NURBS, order, tmp, knotsList, -1, -1, 0., 1.);
   Tree_Add(Curves, &c);
   CreateReversedCurve(c);
-  List_Delete(temp);
+  List_Delete(tmp);
   _changed = true;
 }
 
@@ -270,13 +270,13 @@ void GEO_Internals::addLineLoop(int num, std::vector<int> edgeTags)
     Msg::Error("GEO line loop with tag %d already exists", num);
     return;
   }
-  List_T *temp = List_Create(2, 2, sizeof(int));
+  List_T *tmp = List_Create(2, 2, sizeof(int));
   for(unsigned int i = 0; i < edgeTags.size(); i++)
-    List_Add(temp, &edgeTags[i]);
-  sortEdgesInLoop(num, temp);
-  EdgeLoop *l = Create_EdgeLoop(num, temp);
+    List_Add(tmp, &edgeTags[i]);
+  sortEdgesInLoop(num, tmp);
+  EdgeLoop *l = Create_EdgeLoop(num, tmp);
   Tree_Add(EdgeLoops, &l);
-  List_Delete(temp);
+  List_Delete(tmp);
   _changed = true;
 }
 
@@ -290,12 +290,12 @@ void GEO_Internals::addPlaneSurface(int num, std::vector<int> wireTags)
     Msg::Error("Plane surface requires at least one line loop");
     return;
   }
-  List_T *temp = List_Create(2, 2, sizeof(int));
+  List_T *tmp = List_Create(2, 2, sizeof(int));
   for(unsigned int i = 0; i < wireTags.size(); i++)
-    List_Add(temp, &wireTags[i]);
+    List_Add(tmp, &wireTags[i]);
   Surface *s = Create_Surface(num, MSH_SURF_PLAN);
-  setSurfaceGeneratrices(s, temp);
-  List_Delete(temp);
+  setSurfaceGeneratrices(s, tmp);
+  List_Delete(tmp);
   End_Surface(s);
   Tree_Add(Surfaces, &s);
   _changed = true;
@@ -337,12 +337,12 @@ void GEO_Internals::addSurfaceFilling(int num, std::vector<int> wireTags,
   else
     Msg::Error("Wrong definition of face %d: %d borders instead of 3 or 4",
                num, j);
-  List_T *temp = List_Create(2, 2, sizeof(int));
+  List_T *tmp = List_Create(2, 2, sizeof(int));
   for(unsigned int i = 0; i < wireTags.size(); i++)
-    List_Add(temp, &wireTags[i]);
+    List_Add(tmp, &wireTags[i]);
   Surface *s = Create_Surface(num, type);
-  setSurfaceGeneratrices(s, temp);
-  List_Delete(temp);
+  setSurfaceGeneratrices(s, tmp);
+  List_Delete(tmp);
   End_Surface(s);
   if(sphereCenterTag >= 0){
     s->InSphereCenter = FindPoint(sphereCenterTag);
@@ -379,12 +379,12 @@ void GEO_Internals::addSurfaceLoop(int num, std::vector<int> faceTags)
     return;
   }
 
-  List_T *temp = List_Create(2, 2, sizeof(int));
+  List_T *tmp = List_Create(2, 2, sizeof(int));
   for(unsigned int i = 0; i < faceTags.size(); i++)
-    List_Add(temp, &faceTags[i]);
-  SurfaceLoop *l = Create_SurfaceLoop(num, temp);
+    List_Add(tmp, &faceTags[i]);
+  SurfaceLoop *l = Create_SurfaceLoop(num, tmp);
   Tree_Add(SurfaceLoops, &l);
-  List_Delete(temp);
+  List_Delete(tmp);
   _changed = true;
 }
 
@@ -395,12 +395,12 @@ void GEO_Internals::addVolume(int num, std::vector<int> shellTags)
     return;
   }
 
-  List_T *temp = List_Create(2, 2, sizeof(int));
+  List_T *tmp = List_Create(2, 2, sizeof(int));
   for(unsigned int i = 0; i < shellTags.size(); i++)
-    List_Add(temp, &shellTags[i]);
+    List_Add(tmp, &shellTags[i]);
   Volume *v = Create_Volume(num, MSH_VOLUME);
-  setVolumeSurfaces(v, temp);
-  List_Delete(temp);
+  setVolumeSurfaces(v, tmp);
+  List_Delete(tmp);
   Tree_Add(Volumes, &v);
   _changed = true;
 }
@@ -425,6 +425,55 @@ void GEO_Internals::resetPhysicalGroups()
   _changed = true;
 }
 
+void GEO_Internals::modifyPhysicalGroup(int dim, int num, int op, std::vector<int> tags)
+{
+  int type;
+  std::string str;
+  switch(dim){
+  case 0: type = MSH_PHYSICAL_POINT; str = "point"; break;
+  case 1: type = MSH_PHYSICAL_LINE; str = "line"; break;
+  case 2: type = MSH_PHYSICAL_SURFACE; str = "surface"; break;
+  case 3: type = MSH_PHYSICAL_VOLUME; str = "volume"; break;
+  }
+
+  PhysicalGroup *p = FindPhysicalGroup(num, type);
+  if(p && op == 0){
+    Msg::Error("Physical %s %d already exists", str.c_str(), num);
+  }
+  else if(!p && op > 0){
+    Msg::Error("Physical %s %d does not exist", str.c_str(), num);
+  }
+  else if(op == 0){
+    List_T *tmp = List_Create(10, 10, sizeof(int));
+    for(unsigned int i = 0; i < tags.size(); i++)
+      List_Add(tmp, &tags[i]);
+    p = Create_PhysicalGroup(num, type, tmp);
+    List_Delete(tmp);
+    List_Add(PhysicalGroups, &p);
+  }
+  else if(op == 1){
+    for(unsigned int i = 0; i < tags.size(); i++){
+      List_Add(p->Entities, &tags[i]);
+    }
+  }
+  else if(op == 2){
+    for(unsigned int i = 0; i < tags.size(); i++){
+      List_Suppress(p->Entities, &tags[i], fcmp_int);
+    }
+    if(!List_Nbr(p->Entities)){
+      switch(dim){
+      case 0: DeletePhysicalPoint(num); break;
+      case 1: DeletePhysicalLine(num); break;
+      case 2: DeletePhysicalSurface(num); break;
+      case 3: DeletePhysicalVolume(num); break;
+      }
+    }
+  }
+  else{
+    Msg::Error("Unsupported operation on physical %s %d", str.c_str(), num);
+  }
+}
+
 void GEO_Internals::removeAllDuplicates()
 {
   ReplaceAllDuplicates();
@@ -1159,7 +1208,7 @@ int GModel::writeGEO(const std::string &name, bool printLabels, bool onlyPhysica
 
 int GModel::exportDiscreteGEOInternals()
 {
-  int maxv = 1; // FIXME: temporary - see TODO below
+  int maxv = 1; // FIXME: temorary - see TODO below
 
   if(_geo_internals){
     maxv = _geo_internals->MaxVolumeNum;

Geo/GModelIO_GEO.h

@@ -52,8 +52,9 @@ class GEO_Internals{
   void addVolume(int num, std::vector<int> shellTags);
   void addCompoundVolume(int num, std::vector<int> regionTags);
 
-  // manipulate physical groups (this will eventually move directly to GModel)
+  // manipulate physical groups
   void resetPhysicalGroups();
+  void modifyPhysicalGroup(int dim, int num, int op, std::vector<int> tags);
 
   // coherence
   void removeAllDuplicates();

Parser/Gmsh.y

@@ -2319,41 +2319,8 @@ Shape :
     {
       int num = (int)$4;
       int op = $6;
-      PhysicalGroup *p = FindPhysicalGroup(num, MSH_PHYSICAL_POINT);
-      if(p && op == 0){
-	yymsg(0, "Physical point %d already exists", num);
-      }
-      else if(!p && op > 0){
-	yymsg(0, "Physical point %d does not exist", num);
-      }
-      else if(op == 0){
-	List_T *temp = ListOfDouble2ListOfInt($7);
-	p = Create_PhysicalGroup(num, MSH_PHYSICAL_POINT, temp);
-	List_Delete(temp);
-	List_Add(GModel::current()->getGEOInternals()->PhysicalGroups, &p);
-      }
-      else if(op == 1){
-        for(int i = 0; i < List_Nbr($7); i++){
-          double d;
-          List_Read($7, i, &d);
-          int j = (int)d;
-          List_Add(p->Entities, &j);
-        }
-      }
-      else if(op == 2){
-        for(int i = 0; i < List_Nbr($7); i++){
-          double d;
-          List_Read($7, i, &d);
-          int j = (int)d;
-          List_Suppress(p->Entities, &j, fcmp_int);
-        }
-        if(!List_Nbr(p->Entities)){
-          DeletePhysicalPoint(num);
-        }
-      }
-      else{
-	yymsg(0, "Unsupported operation on physical point %d", num);
-      }
+      std::vector<int> tags; ListOfDouble2Vector($7, tags);
+      GModel::current()->getGEOInternals()->modifyPhysicalGroup(0, num, op, tags);
       List_Delete($7);
       $$.Type = MSH_PHYSICAL_POINT;
       $$.Num = num;
@@ -2362,41 +2329,8 @@ Shape :
     {
       int num = (int)$4;
       int op = $6;
-      PhysicalGroup *p = FindPhysicalGroup(num, MSH_PHYSICAL_LINE);
-      if(p && op == 0){
-	yymsg(0, "Physical line %d already exists", num);
-      }
-      else if(!p && op > 0){
-	yymsg(0, "Physical line %d does not exist", num);
-      }
-      else if(op == 0){
-	List_T *temp = ListOfDouble2ListOfInt($7);
-	p = Create_PhysicalGroup(num, MSH_PHYSICAL_LINE, temp);
-	List_Delete(temp);
-	List_Add(GModel::current()->getGEOInternals()->PhysicalGroups, &p);
-      }
-      else if(op == 1){
-        for(int i = 0; i < List_Nbr($7); i++){
-          double d;
-          List_Read($7, i, &d);
-          int j = (int)d;
-          List_Add(p->Entities, &j);
-        }
-      }
-      else if(op == 2){
-        for(int i = 0; i < List_Nbr($7); i++){
-          double d;
-          List_Read($7, i, &d);
-          int j = (int)d;
-          List_Suppress(p->Entities, &j, fcmp_int);
-        }
-        if(!List_Nbr(p->Entities)){
-          DeletePhysicalLine(num);
-        }
-      }
-      else{
-	yymsg(0, "Unsupported operation on physical line %d", num);
-      }
+      std::vector<int> tags; ListOfDouble2Vector($7, tags);
+      GModel::current()->getGEOInternals()->modifyPhysicalGroup(1, num, op, tags);
       List_Delete($7);
       $$.Type = MSH_PHYSICAL_LINE;
       $$.Num = num;
@@ -2405,41 +2339,8 @@ Shape :
     {
       int num = (int)$4;
       int op = $6;
-      PhysicalGroup *p = FindPhysicalGroup(num, MSH_PHYSICAL_SURFACE);
-      if(p && op == 0){
-	yymsg(0, "Physical surface %d already exists", num);
-      }
-      else if(!p && op > 0){
-	yymsg(0, "Physical surface %d does not exist", num);
-      }
-      else if(op == 0){
-	List_T *temp = ListOfDouble2ListOfInt($7);
-	p = Create_PhysicalGroup(num, MSH_PHYSICAL_SURFACE, temp);
-	List_Delete(temp);
-	List_Add(GModel::current()->getGEOInternals()->PhysicalGroups, &p);
-      }
-      else if(op == 1){
-        for(int i = 0; i < List_Nbr($7); i++){
-          double d;
-          List_Read($7, i, &d);
-          int j = (int)d;
-          List_Add(p->Entities, &j);
-        }
-      }
-      else if(op == 2){
-        for(int i = 0; i < List_Nbr($7); i++){
-          double d;
-          List_Read($7, i, &d);
-          int j = (int)d;
-          List_Suppress(p->Entities, &j, fcmp_int);
-        }
-        if(!List_Nbr(p->Entities)){
-          DeletePhysicalSurface(num);
-        }
-      }
-      else{
-	yymsg(0, "Unsupported operation on physical surface %d", num);
-      }
+      std::vector<int> tags; ListOfDouble2Vector($7, tags);
+      GModel::current()->getGEOInternals()->modifyPhysicalGroup(2, num, op, tags);
       List_Delete($7);
       $$.Type = MSH_PHYSICAL_SURFACE;
       $$.Num = num;
@@ -2448,41 +2349,8 @@ Shape :
     {
       int num = (int)$4;
       int op = $6;
-      PhysicalGroup *p = FindPhysicalGroup(num, MSH_PHYSICAL_VOLUME);
-      if(p && op == 0){
-	yymsg(0, "Physical volume %d already exists", num);
-      }
-      else if(!p && op > 0){
-	yymsg(0, "Physical volume %d does not exist", num);
-      }
-      else if(op == 0){
-	List_T *temp = ListOfDouble2ListOfInt($7);
-	p = Create_PhysicalGroup(num, MSH_PHYSICAL_VOLUME, temp);
-	List_Delete(temp);
-	List_Add(GModel::current()->getGEOInternals()->PhysicalGroups, &p);
-      }
-      else if(op == 1){
-        for(int i = 0; i < List_Nbr($7); i++){
-          double d;
-          List_Read($7, i, &d);
-          int j = (int)d;
-          List_Add(p->Entities, &j);
-        }
-      }
-      else if(op == 2){
-        for(int i = 0; i < List_Nbr($7); i++){
-          double d;
-          List_Read($7, i, &d);
-          int j = (int)d;
-          List_Suppress(p->Entities, &j, fcmp_int);
-        }
-        if(!List_Nbr(p->Entities)){
-          DeletePhysicalVolume(num);
-        }
-      }
-      else{
-	yymsg(0, "Unsupported operation on physical volume %d", num);
-      }
+      std::vector<int> tags; ListOfDouble2Vector($7, tags);
+      GModel::current()->getGEOInternals()->modifyPhysicalGroup(3, num, op, tags);
       List_Delete($7);
       $$.Type = MSH_PHYSICAL_VOLUME;
       $$.Num = num;