*** empty log message ***

Geo/GEntity.h

@@ -83,7 +83,7 @@ class GEntity {
   virtual ~GEntity() {};
 
   // Spatial dimension of the entity 
-  virtual int dim() const = 0;
+  virtual int dim() const {throw;}
 
   // Returns true if ent is in the closure of this entity
   virtual int inClosure(GEntity *ent) const {throw;} 
@@ -101,7 +101,7 @@ class GEntity {
   virtual std::list<GVertex*> vertices() const{throw;}
 
   /// Underlying geometric representation of this entity.
-  virtual GeomType geomType() const = 0;
+  virtual GeomType geomType() const {throw;}
 
   // True if parametric space is continuous in the "dim" direction.
   virtual bool continuous(int dim) const {return true;}
@@ -122,7 +122,7 @@ class GEntity {
   virtual int containsPoint(const SPoint3 &pt) const{throw;}
 
   // Get the native pointer of the particular representation
-  virtual void * getNativePtr() const= 0;
+  virtual void * getNativePtr() const {throw;}
 
   // The model owning this entity.
   GModel *model() const {return _model;}
@@ -178,16 +178,7 @@ class GEntity {
   virtual std::string getAdditionalInfoString() { return std::string(""); }
 };
 
-// A minimal, non-abstract entity that can be used for sorting
-class dummyEntity : public GEntity {
-public:
-  dummyEntity(GModel *model, int tag) : GEntity(model, tag){}
-  virtual int dim() const {return -1;}
-  virtual GeomType geomType() const {return Unknown;}
-  virtual void * getNativePtr() const {return 0;}
-};
-
-class EntityLessThan {
+class GEntityLessThan {
  public:
   bool operator()(const GEntity *ent1, const GEntity *ent2) const
   {

Geo/GModel.cpp

 #include "GModel.h"
 
-int GModel::numRegion() const
-{
-  return regions.size();
-}
-
-int GModel::numFace  () const
-{
-  return faces.size();
-}
-
-int GModel::numEdge  () const
-{
-  return edges.size();
-}
-
-int GModel::numVertex() const
-{
-  return vertices.size();
-}
-
 int GModel::meshStatus()
 {
   for(riter it = firstRegion(); it != lastRegion(); ++it)
@@ -35,40 +15,40 @@ int GModel::meshStatus()
 
 GRegion * GModel::regionByTag(int n) const
 {
-  dummyEntity tmp((GModel*)this, n);
+  GEntity tmp((GModel*)this, n);
   riter it = regions.find((GRegion*)&tmp);
   if(it != regions.end())
-    return (GRegion *) (*it);
+    return *it;
   else
     return 0;
 }
 
 GFace * GModel::faceByTag(int n) const
 {
-  dummyEntity tmp((GModel*)this, n);
+  GEntity tmp((GModel*)this, n);
   fiter it = faces.find((GFace*)&tmp);
   if(it != faces.end())
-    return (GFace *) (*it);
+    return *it;
   else
     return 0;
 }
 
 GEdge * GModel::edgeByTag(int n) const
 {
-  dummyEntity tmp((GModel*)this, n);
+  GEntity tmp((GModel*)this, n);
   eiter it = edges.find((GEdge*)&tmp);
   if(it != edges.end())
-    return (GEdge *) (*it);
+    return *it;
   else
     return 0;
 }
 
 GVertex * GModel::vertexByTag(int n) const
 {
-  dummyEntity tmp((GModel*)this, n);
+  GEntity tmp((GModel*)this, n);
   viter it = vertices.find((GVertex*)&tmp);
   if(it != vertices.end())
-    return (GVertex *) (*it);
+    return *it;
   else
     return 0;
 }
@@ -93,20 +73,15 @@ int GModel::renumberMeshVertices()
 
 bool GModel::noPhysicals()
 {
-  bool somePhysicals = false;
   for(viter it = firstVertex(); it != lastVertex(); ++it)
-    if((*it)->physicals.size()){ somePhysicals = true; break; }
-  if(!somePhysicals)
-    for(eiter it = firstEdge(); it != lastEdge(); ++it)
-      if((*it)->physicals.size()){ somePhysicals = true; break; }
-  if(!somePhysicals)
-    for(fiter it = firstFace(); it != lastFace(); ++it)
-      if((*it)->physicals.size()){ somePhysicals = true; break; }
-  if(!somePhysicals)
-    for(riter it = firstRegion(); it != lastRegion(); ++it)
-      if((*it)->physicals.size()){ somePhysicals = true; break; }
-
-  return !somePhysicals;
+    if((*it)->physicals.size()) return false;
+  for(eiter it = firstEdge(); it != lastEdge(); ++it)
+    if((*it)->physicals.size()) return false;
+  for(fiter it = firstFace(); it != lastFace(); ++it)
+    if((*it)->physicals.size()) return false;
+  for(riter it = firstRegion(); it != lastRegion(); ++it)
+    if((*it)->physicals.size()) return false;
+  return true;
 }
 
 static void addInGroup(GEntity* ge, std::map<int, std::vector<GEntity*> > &group)
@@ -146,4 +121,3 @@ SBoundingBox3d GModel::recomputeBounds()
   boundingBox = bb;
   return bounds();
 }
-

Geo/GModel.h

@@ -16,20 +16,20 @@ class GModel
 {
  protected:
   std::string modelName;
-  std::set<GRegion*, EntityLessThan> regions;
-  std::set<GFace*, EntityLessThan> faces;
-  std::set<GEdge*, EntityLessThan> edges;
-  std::set<GVertex*, EntityLessThan> vertices;
+  std::set<GRegion*, GEntityLessThan> regions;
+  std::set<GFace*, GEntityLessThan> faces;
+  std::set<GEdge*, GEntityLessThan> edges;
+  std::set<GVertex*, GEntityLessThan> vertices;
   SBoundingBox3d boundingBox;
 
  public:
   GModel(const std::string &name) : modelName(name) {}
   virtual ~GModel() {}
 
-  typedef std::set<GRegion*, EntityLessThan>::iterator riter;
-  typedef std::set<GFace*, EntityLessThan>::iterator fiter;
-  typedef std::set<GEdge*, EntityLessThan>::iterator eiter;
-  typedef std::set<GVertex*, EntityLessThan>::iterator viter;
+  typedef std::set<GRegion*, GEntityLessThan>::iterator riter;
+  typedef std::set<GFace*, GEntityLessThan>::iterator fiter;
+  typedef std::set<GEdge*, GEntityLessThan>::iterator eiter;
+  typedef std::set<GVertex*, GEntityLessThan>::iterator viter;
 
   // Returns the geometric tolerance for the entire model.
   virtual double tolerance() const { return 1.e-14; }
@@ -38,10 +38,10 @@ class GModel
   virtual int meshStatus();
 
   // Get the number of regions in this model.
-  int numRegion() const;
-  int numFace() const;
-  int numEdge() const;
-  int numVertex() const;
+  int numRegion() const { return regions.size(); }
+  int numFace() const { return faces.size(); }
+  int numEdge() const { return edges.size(); }
+  int numVertex() const  { return vertices.size(); }
 
   // Get an iterator initialized to the first entity in this model.
   riter firstRegion() { return regions.begin(); }