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

PAL12992. Store/restore submeshesh directly using HDF but not med families

Browse Source
This commit is contained in:
eap 2006-08-07 12:12:18 +00:00
parent f644c7bfdc
commit e83c4c9cf5
1 changed files with 174 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -74,6 +74,8 @@
#include "SMDS_EdgePosition.hxx"
#include "SMDS_FacePosition.hxx"
#include "SMDS_VertexPosition.hxx"
#include "SMDS_SpacePosition.hxx"
#include CORBA_SERVER_HEADER(SMESH_Group)
#include CORBA_SERVER_HEADER(SMESH_Filter)
@ -1652,8 +1654,9 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
}
}
// All sub-meshes will be stored in MED file
if ( shapeRefFound )
myWriter.AddAllSubMeshes();
// .. will NOT (PAL 12992)
//if ( shapeRefFound )
//myWriter.AddAllSubMeshes();
// groups root sub-branch
SALOMEDS::SObject_var myGroupsBranch;
@ -1755,10 +1758,79 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
myLocMesh.ShapeToMesh( nullShape ); // remove shape referring data
}
// Store node positions on sub-shapes (SMDS_Position):
if ( !mySMESHDSMesh->SubMeshes().empty() )
{
// Store submeshes
// ----------------
aGroup = new HDFgroup( "Submeshes", aTopGroup );
aGroup->CreateOnDisk();
// each element belongs to one or none submesh,
// so for each node/element, we store a submesh ID
// Make maps of submesh IDs of elements sorted by element IDs
typedef int TElemID;
typedef int TSubMID;
map< TElemID, TSubMID > eId2smId, nId2smId;
map< TElemID, TSubMID >::iterator hint; // insertion to map is done before hint
const map<int,SMESHDS_SubMesh*>& aSubMeshes = mySMESHDSMesh->SubMeshes();
map<int,SMESHDS_SubMesh*>::const_iterator itSubM ( aSubMeshes.begin() );
SMDS_NodeIteratorPtr itNode;
SMDS_ElemIteratorPtr itElem;
for ( itSubM = aSubMeshes.begin(); itSubM != aSubMeshes.end() ; itSubM++ )
{
TSubMID aSubMeID = itSubM->first;
SMESHDS_SubMesh* aSubMesh = itSubM->second;
if ( aSubMesh->IsComplexSubmesh() )
continue; // submesh containing other submeshs
// nodes
hint = nId2smId.begin(); // optimize insertion basing on increasing order of elem Ids in submesh
for ( itNode = aSubMesh->GetNodes(); itNode->more(); ++hint)
hint = nId2smId.insert( hint, make_pair( itNode->next()->GetID(), aSubMeID ));
// elements
hint = eId2smId.begin();
for ( itElem = aSubMesh->GetElements(); itElem->more(); ++hint)
hint = eId2smId.insert( hint, make_pair( itElem->next()->GetID(), aSubMeID ));
}
// Care of elements that are not on submeshes
if ( mySMESHDSMesh->NbNodes() != nId2smId.size() ) {
for ( itNode = mySMESHDSMesh->nodesIterator(); itNode->more(); )
/* --- stl_map.h says : */
/* A %map relies on unique keys and thus a %pair is only inserted if its */
/* first element (the key) is not already present in the %map. */
nId2smId.insert( make_pair( itNode->next()->GetID(), 0 ));
}
int nbElems = mySMESHDSMesh->NbEdges() + mySMESHDSMesh->NbFaces() + mySMESHDSMesh->NbVolumes();
if ( nbElems != eId2smId.size() ) {
for ( itElem = mySMESHDSMesh->elementsIterator(); itElem->more(); )
eId2smId.insert( make_pair( itElem->next()->GetID(), 0 ));
}
// Store submesh IDs
for ( int isNode = 0; isNode < 2; ++isNode )
{
map< TElemID, TSubMID >& id2smId = isNode ? nId2smId : eId2smId;
if ( id2smId.empty() ) continue;
map< TElemID, TSubMID >::const_iterator id_smId = id2smId.begin();
// make and fill array of submesh IDs
int* smIDs = new int [ id2smId.size() ];
for ( int i = 0; id_smId != id2smId.end(); ++id_smId, ++i )
smIDs[ i ] = id_smId->second;
// write HDF group
aSize[ 0 ] = id2smId.size();
string aDSName( isNode ? "Node Submeshes" : "Element Submeshes");
aDataset = new HDFdataset( (char*)aDSName.c_str(), aGroup, HDF_INT32, aSize, 1 );
aDataset->CreateOnDisk();
aDataset->WriteOnDisk( smIDs );
aDataset->CloseOnDisk();
//
delete smIDs;
}
// Store node positions on sub-shapes (SMDS_Position):
// ----------------------------------------------------
aGroup = new HDFgroup( "Node Positions", aTopGroup );
aGroup->CreateOnDisk();
@ -1774,9 +1846,7 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
int nbEdgeNodes = 0, nbFaceNodes = 0;
list<SMESHDS_SubMesh*> aEdgeSM, aFaceSM;
// loop on SMESHDS_SubMesh'es
const map<int,SMESHDS_SubMesh*>& aSubMeshes = mySMESHDSMesh->SubMeshes();
map<int,SMESHDS_SubMesh*>::const_iterator itSubM ( aSubMeshes.begin() );
for ( ; itSubM != aSubMeshes.end() ; itSubM++ )
for ( itSubM = aSubMeshes.begin(); itSubM != aSubMeshes.end() ; itSubM++ )
{
SMESHDS_SubMesh* aSubMesh = (*itSubM).second;
if ( aSubMesh->IsComplexSubmesh() )
@ -1817,8 +1887,6 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
for ( ; itSM != pListSM->end(); itSM++ )
{
SMESHDS_SubMesh* aSubMesh = (*itSM);
if ( aSubMesh->IsComplexSubmesh() )
continue; // submesh containing other submeshs
SMDS_NodeIteratorPtr itNode = aSubMesh->GetNodes();
// loop on nodes in aSubMesh
@ -1950,6 +2018,31 @@ void SMESH_Gen_i::loadGeomData( SALOMEDS::SComponent_ptr theCompRoot )
SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder();
aStudyBuilder->LoadWith( theCompRoot, GetGeomEngine() );
}
//=============================================================================
/*!
* \brief Creates SMDS_Position according to shape type
*/
//=============================================================================
class PositionCreator {
public:
SMDS_PositionPtr MakePosition(const TopAbs_ShapeEnum type) {
return (this->*myFuncTable[ type ])();
}
PositionCreator() {
myFuncTable.resize( (size_t) TopAbs_SHAPE, & PositionCreator::defaultPosition );
myFuncTable[ TopAbs_FACE ] = & PositionCreator::facePosition;
myFuncTable[ TopAbs_EDGE ] = & PositionCreator::edgePosition;
myFuncTable[ TopAbs_VERTEX ] = & PositionCreator::vertexPosition;
}
private:
SMDS_PositionPtr edgePosition() const { return SMDS_PositionPtr( new SMDS_EdgePosition ); }
SMDS_PositionPtr facePosition() const { return SMDS_PositionPtr( new SMDS_FacePosition ); }
SMDS_PositionPtr vertexPosition() const { return SMDS_PositionPtr( new SMDS_VertexPosition); }
SMDS_PositionPtr defaultPosition() const { return SMDS_SpacePosition::originSpacePosition(); }
typedef SMDS_PositionPtr (PositionCreator:: * FmakePos)() const;
vector<FmakePos> myFuncTable;
};
//=============================================================================
/*!
@ -2537,10 +2630,80 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
}
if(hasData) {
// Read sub-meshes from MED
if(MYDEBUG) MESSAGE("Create all sub-meshes");
myReader.CreateAllSubMeshes();
// Read sub-meshes from MED
// -------------------------
if(MYDEBUG) MESSAGE("Create all sub-meshes");
bool submeshesInFamilies = ( ! aTopGroup->ExistInternalObject( "Submeshes" ));
if ( submeshesInFamilies )
{
// old way working before fix of PAL 12992
myReader.CreateAllSubMeshes();
}
else
{
// open a group
aGroup = new HDFgroup( "Submeshes", aTopGroup );
aGroup->OpenOnDisk();
int maxID = mySMESHDSMesh->MaxShapeIndex();
vector< SMESHDS_SubMesh * > subMeshes( maxID + 1, (SMESHDS_SubMesh*) 0 );
vector< TopAbs_ShapeEnum > smType ( maxID + 1, TopAbs_SHAPE );
PositionCreator aPositionCreator;
SMDS_NodeIteratorPtr nIt = mySMESHDSMesh->nodesIterator();
SMDS_ElemIteratorPtr eIt = mySMESHDSMesh->elementsIterator();
for ( int isNode = 0; isNode < 2; ++isNode )
{
string aDSName( isNode ? "Node Submeshes" : "Element Submeshes");
if ( aGroup->ExistInternalObject( (char*) aDSName.c_str() ))
{
aDataset = new HDFdataset( (char*) aDSName.c_str(), aGroup );
aDataset->OpenOnDisk();
// read submesh IDs for all elements sorted by ID
int nbElems = aDataset->GetSize();
int* smIDs = new int [ nbElems ];
aDataset->ReadFromDisk( smIDs );
aDataset->CloseOnDisk();
// get elements sorted by ID
::SMESH_MeshEditor::TIDSortedElemSet elemSet;
if ( isNode )
while ( nIt->more() ) elemSet.insert( nIt->next() );
else
while ( eIt->more() ) elemSet.insert( eIt->next() );
ASSERT( elemSet.size() == nbElems );
// add elements to submeshes
::SMESH_MeshEditor::TIDSortedElemSet::iterator iE = elemSet.begin();
for ( int i = 0; i < nbElems; ++i, ++iE )
{
int smID = smIDs[ i ];
if ( smID == 0 ) continue;
ASSERT( smID <= maxID );
const SMDS_MeshElement* elem = *iE;
// get or create submesh
SMESHDS_SubMesh* & sm = subMeshes[ smID ];
if ( ! sm ) {
sm = mySMESHDSMesh->NewSubMesh( smID );
smType[ smID ] = mySMESHDSMesh->IndexToShape( smID ).ShapeType();
}
// add
if ( isNode ) {
SMDS_PositionPtr pos = aPositionCreator.MakePosition( smType[ smID ]);
pos->SetShapeId( smID );
SMDS_MeshNode* node = const_cast<SMDS_MeshNode*>( static_cast<const SMDS_MeshNode*>( elem ));
node->SetPosition( pos );
sm->AddNode( node );
} else {
sm->AddElement( elem );
}
}
delete smIDs;
}
}
} // end reading submeshes
// Read node positions on sub-shapes (SMDS_Position)
@ -2609,6 +2772,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
nbFids = aSize;
}
}
aDataset->CloseOnDisk();
} // loop on 5 datasets
// Set node positions on edges or faces