ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-25 17:00:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

23608: [EDF] HYDRO: crash when compute copied mesh

Browse Source 
23609: [EDF] HYDRO: wrong warning appears
23607: [EDF] HYDRO: Copy mesh with geometry - problems of Copy elements
This commit is contained in:
eap 2018-10-19 15:09:48 +03:00
parent a001da2228
commit 6eba85f740
1 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -2952,6 +2952,7 @@ namespace // utils for CopyMeshWithGeom()
{ {
typedef std::map< std::string, std::string > TStr2StrMap; typedef std::map< std::string, std::string > TStr2StrMap;
typedef std::map< std::string, std::set< std::string > > TStr2StrSetMap; typedef std::map< std::string, std::set< std::string > > TStr2StrSetMap;
//typedef std::map< std::set<int>, int > TIdSet2IndexMap;
//================================================================================ //================================================================================
/*! /*!
@ -2969,6 +2970,9 @@ namespace // utils for CopyMeshWithGeom()
TStr2StrMap myOld2NewEntryMap; // map of study entries TStr2StrMap myOld2NewEntryMap; // map of study entries
//GEOM::ListOfGO_var mySubshapes; // sub-shapes existing in the new geometry
//TIdSet2IndexMap myIds2SubshapeIndex; // to find an existing sub-shape
bool myGIPMapDone; bool myGIPMapDone;
GEOM::ListOfListOfLong_var myGIPMap; // filled by GetInPlaceMap() GEOM::ListOfListOfLong_var myGIPMap; // filled by GetInPlaceMap()
@ -3158,12 +3162,20 @@ namespace // utils for CopyMeshWithGeom()
if ( 0 < oldID && oldID < (int)myGIPMap->length() ) if ( 0 < oldID && oldID < (int)myGIPMap->length() )
{ {
if (( myGIPMap[ oldID ].length() == 1 ) || if ( myGIPMap[ oldID ].length() == 1 )
( myGIPMap[ oldID ].length() > 1 &&
getShapeType( mySrcMesh_i, oldID ) == TopAbs_VERTEX ))
{ {
newID = myGIPMap[ oldID ][ 0 ]; newID = myGIPMap[ oldID ][ 0 ];
} }
else if ( myGIPMap[ oldID ].length() > 1 &&
getShapeType( mySrcMesh_i, oldID ) == TopAbs_VERTEX )
{
// select a meshed VERTEX
SMESH_subMesh* newSM;
for ( CORBA::ULong i = 0; i < myGIPMap[ oldID ].length() && !newID; ++i )
if (( newSM = myNewMesh_i->GetImpl().GetSubMeshContaining( myGIPMap[ oldID ][ i ] )) &&
( !newSM->IsEmpty() ))
newID = myGIPMap[ oldID ][ i ];
}
} }
return newID; return newID;
} }
@ -3392,7 +3404,7 @@ namespace // utils for CopyMeshWithGeom()
seq[ seq->length() - 1 ] = item; seq[ seq->length() - 1 ] = item;
} }
} }
} } // namespace // utils for CopyMeshWithGeom()
//================================================================================ //================================================================================
/*! /*!
@ -3627,6 +3639,8 @@ throw ( SALOME::SALOME_Exception )
if ( SMESH_subMesh* newSM = newMesh_i->GetImpl().GetSubMeshContaining( newID )) if ( SMESH_subMesh* newSM = newMesh_i->GetImpl().GetSubMeshContaining( newID ))
newSM->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE ); newSM->ComputeStateEngine( SMESH_subMesh::CHECK_COMPUTE_STATE );
} }
newMeshDS->Modified();
} }
@ -3637,7 +3651,7 @@ throw ( SALOME::SALOME_Exception )
SALOME::GenericObj_wrap< SMESH::FilterManager > filterMgr = CreateFilterManager(); SALOME::GenericObj_wrap< SMESH::FilterManager > filterMgr = CreateFilterManager();
SMESH::ListOfGroups_var groups = theSourceMesh->GetGroups(); SMESH::ListOfGroups_var groups = theSourceMesh->GetGroups();
CORBA::ULong nbGroups = groups->length(), nbAddedGroups = 0; CORBA::ULong nbGroups = theToCopyGroups ? groups->length() : 0, nbAddedGroups = 0;
for ( CORBA::ULong i = 0; i < nbGroups + nbAddedGroups; ++i ) for ( CORBA::ULong i = 0; i < nbGroups + nbAddedGroups; ++i )
{ {
SMESH::SMESH_Group_var stdlGroup = SMESH::SMESH_Group::_narrow ( groups[ i ]); SMESH::SMESH_Group_var stdlGroup = SMESH::SMESH_Group::_narrow ( groups[ i ]);
@ -3792,6 +3806,8 @@ throw ( SALOME::SALOME_Exception )
} // loop on groups } // loop on groups
newMeshDS->CompactMesh();
// set mesh name // set mesh name
if ( !theMeshName || !theMeshName[0] ) if ( !theMeshName || !theMeshName[0] )
{ {