From d01db06847c682680541e8b61744fcc6cb5cc561 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Wed, 8 Mar 2017 12:35:04 +0000
Subject: [PATCH] GEO_Internals::synchronize should delete all entities in
GModel that do not exist anymore in the internal data (similar to what is
being done in OCC_Internals)
---
Geo/GModelIO_GEO.cpp | 49 ++++++++++++++++++++++++++++++++++++++------
Geo/GModelIO_OCC.cpp | 12 +++++------
2 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/Geo/GModelIO_GEO.cpp b/Geo/GModelIO_GEO.cpp
index ee99242410..14cb38d79d 100644
--- a/Geo/GModelIO_GEO.cpp
+++ b/Geo/GModelIO_GEO.cpp
@@ -1040,10 +1040,45 @@ void GEO_Internals::synchronize(GModel *model)
{
Msg::Debug("Syncing GEO_Internals with GModel");
- // if the entities do not exist, we create them; if they exist, we update the
- // pointer (and the underlying dependencies, e.g. surface boundaries): this is
- // necessary because a GEO entity can change (while keeping the same tag), due
- // e.g. to ReplaceDuplicates.
+ // if the entities do not exist in GModel, we create them; if they exist as
+ // GEO entities in GModel but don't exist (anymore) in the internal CAD data,
+ // we remove them. And if they exist in both the internal CAD data and in the
+ // GModel, we update the pointer and the underlying dependencies (e.g. surface
+ // boundaries): this is necessary because a GEO entity can change (while
+ // keeping the same tag), due e.g. to ReplaceDuplicates.
+
+ std::vector<std::pair<int, int> > toRemove;
+ for(GModel::viter it = model->firstVertex(); it != model->lastVertex(); ++it){
+ GVertex *gv = *it;
+ if(gv->getNativeType() == GEntity::GmshModel){
+ Vertex *v = (Vertex*)gv->getNativePtr();
+ if(!FindPoint(gv->tag()))
+ toRemove.push_back(std::pair<int, int>(0, gv->tag()));
+ }
+ }
+ for(GModel::eiter it = model->firstEdge(); it != model->lastEdge(); ++it){
+ GEdge *ge = *it;
+ if(ge->getNativeType() == GEntity::GmshModel){
+ if(!FindCurve(ge->tag()))
+ toRemove.push_back(std::pair<int, int>(1, ge->tag()));
+ }
+ }
+ for(GModel::fiter it = model->firstFace(); it != model->lastFace(); ++it){
+ GFace *gf = *it;
+ if(gf->getNativeType() == GEntity::GmshModel){
+ if(!FindSurface(gf->tag()))
+ toRemove.push_back(std::pair<int, int>(2, gf->tag()));
+ }
+ }
+ for(GModel::riter it = model->firstRegion(); it != model->lastRegion(); ++it){
+ GRegion *gr = *it;
+ if(gr->getNativeType() == GEntity::GmshModel){
+ if(!FindVolume(gr->tag()))
+ toRemove.push_back(std::pair<int, int>(3, gr->tag()));
+ }
+ }
+ Msg::Debug("Sync is removing %d model entities", toRemove.size());
+ model->remove(toRemove);
if(Tree_Nbr(Points)) {
List_T *points = Tree2List(Points);
@@ -1218,7 +1253,9 @@ void GEO_Internals::synchronize(GModel *model)
}
// we might want to store physical groups directly in GModel; but this is OK
- // for efficiency
+ // for now. We always start from scratch in GModel, as physical groups are
+ // only stored in GEO internals anyway
+ model->deletePhysicalGroups();
for(int i = 0; i < List_Nbr(PhysicalGroups); i++){
PhysicalGroup *p;
List_Read(PhysicalGroups, i, &p);
@@ -1242,7 +1279,7 @@ void GEO_Internals::synchronize(GModel *model)
}
// we might want to store mesh compounds directly in GModel; but this is OK
- // for efficiency
+ // for now.
for(std::multimap<int, std::vector<int> >::iterator it = _meshCompounds.begin();
it != _meshCompounds.end(); ++it){
int dim = it->first;
diff --git a/Geo/GModelIO_OCC.cpp b/Geo/GModelIO_OCC.cpp
index 596dc9878a..609db930a4 100644
--- a/Geo/GModelIO_OCC.cpp
+++ b/Geo/GModelIO_OCC.cpp
@@ -1813,19 +1813,13 @@ void OCC_Internals::synchronize(GModel *model)
{
Msg::Debug("Syncing OCC_Internals with GModel");
- int vTagMax = std::max(model->getMaxElementaryNumber(0), getMaxTag(0));
- int eTagMax = std::max(model->getMaxElementaryNumber(1), getMaxTag(1));
- int fTagMax = std::max(model->getMaxElementaryNumber(2), getMaxTag(2));
- int rTagMax = std::max(model->getMaxElementaryNumber(3), getMaxTag(3));
-
+ // iterate over all shapes with tags, and import them into the (sub)shape _maps
_somap.Clear();
_shmap.Clear();
_fmap.Clear();
_wmap.Clear();
_emap.Clear();
_vmap.Clear();
-
- // iterate over all shapes with tags, and import them into the (sub)shape _maps
TopTools_DataMapIteratorOfDataMapOfIntegerShape exp0(_tagVertex);
for(; exp0.More(); exp0.Next()) _addShapeToMaps(exp0.Value());
TopTools_DataMapIteratorOfDataMapOfIntegerShape exp1(_tagEdge);
@@ -1877,6 +1871,10 @@ void OCC_Internals::synchronize(GModel *model)
model->remove(toRemove);
// import all shapes in _maps into the GModel, preserving all explicit tags
+ int vTagMax = std::max(model->getMaxElementaryNumber(0), getMaxTag(0));
+ int eTagMax = std::max(model->getMaxElementaryNumber(1), getMaxTag(1));
+ int fTagMax = std::max(model->getMaxElementaryNumber(2), getMaxTag(2));
+ int rTagMax = std::max(model->getMaxElementaryNumber(3), getMaxTag(3));
for(int i = 1; i <= _vmap.Extent(); i++){
TopoDS_Vertex vertex = TopoDS::Vertex(_vmap(i));
if(!getOCCVertexByNativePtr(model, vertex)){
--
GitLab