ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-01-26 16:50:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Integrate patch for 0021149: [CEA 445] Wrong mesh dimension

Browse Source
This commit is contained in:
vsr 2011-08-01 11:11:14 +00:00
parent 300e285152
commit 4642b0a49e
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
View File

@ -345,8 +345,8 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
aMeshName = myMeshName; aMeshName = myMeshName;
} }
// Mesh dimension definition // Space dimension definition
TInt aMeshDimension; TInt aSpaceDim;
TCoordHelperPtr aCoordHelperPtr; TCoordHelperPtr aCoordHelperPtr;
{ {
bool anIsXDimension = false; bool anIsXDimension = false;
@ -377,24 +377,24 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
anIsXDimension = (aBounds[1] - aBounds[0]) + abs(aBounds[1]) + abs(aBounds[0]) > EPS; anIsXDimension = (aBounds[1] - aBounds[0]) + abs(aBounds[1]) + abs(aBounds[0]) > EPS;
anIsYDimension = (aBounds[3] - aBounds[2]) + abs(aBounds[3]) + abs(aBounds[2]) > EPS; anIsYDimension = (aBounds[3] - aBounds[2]) + abs(aBounds[3]) + abs(aBounds[2]) > EPS;
anIsZDimension = (aBounds[5] - aBounds[4]) + abs(aBounds[5]) + abs(aBounds[4]) > EPS; anIsZDimension = (aBounds[5] - aBounds[4]) + abs(aBounds[5]) + abs(aBounds[4]) > EPS;
aMeshDimension = anIsXDimension + anIsYDimension + anIsZDimension; aSpaceDim = anIsXDimension + anIsYDimension + anIsZDimension;
if(!aMeshDimension) if(!aSpaceDim)
aMeshDimension = 3; aSpaceDim = 3;
// PAL16857(SMESH not conform to the MED convention): // PAL16857(SMESH not conform to the MED convention):
if ( aMeshDimension == 2 && anIsZDimension ) // 2D only if mesh is in XOY plane if ( aSpaceDim == 2 && anIsZDimension ) // 2D only if mesh is in XOY plane
aMeshDimension = 3; aSpaceDim = 3;
// PAL18941(a saved study with a mesh belong Z is opened and the mesh is belong X) // PAL18941(a saved study with a mesh belong Z is opened and the mesh is belong X)
if ( aMeshDimension == 1 && !anIsXDimension ) // 1D only if mesh is along OX if ( aSpaceDim == 1 && !anIsXDimension ) // 1D only if mesh is along OX
if ( anIsYDimension ) { if ( anIsYDimension ) {
aMeshDimension = 2; aSpaceDim = 2;
anIsXDimension = true; anIsXDimension = true;
} else { } else {
aMeshDimension = 3; aSpaceDim = 3;
} }
} }
SMDS_NodeIteratorPtr aNodesIter = myMesh->nodesIterator(/*idInceasingOrder=*/true); SMDS_NodeIteratorPtr aNodesIter = myMesh->nodesIterator(/*idInceasingOrder=*/true);
switch(aMeshDimension){ switch(aSpaceDim){
case 3: case 3:
aCoordHelperPtr.reset(new TCoordHelper(aNodesIter,aXYZGetCoord,aXYZName)); aCoordHelperPtr.reset(new TCoordHelper(aNodesIter,aXYZGetCoord,aXYZName));
break; break;
@ -416,9 +416,17 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
break; break;
} }
} }
TInt aMeshDimension = 0;
if ( myMesh->NbEdges() > 0 )
aMeshDimension = 1;
if ( myMesh->NbFaces() > 0 )
aMeshDimension = 2;
if ( myMesh->NbVolumes() > 0 )
aMeshDimension = 3;
PMeshInfo aMeshInfo = myMed->CrMeshInfo(aMeshDimension,aMeshName); PMeshInfo aMeshInfo = myMed->CrMeshInfo(aSpaceDim,aMeshName);
aMeshInfo->myMeshDim = aMeshDimension;
MESSAGE("Add - aMeshName : "<<aMeshName<<"; "<<aMeshInfo->GetName()); MESSAGE("Add - aMeshName : "<<aMeshName<<"; "<<aMeshInfo->GetName());
myMed->SetMeshInfo(aMeshInfo); myMed->SetMeshInfo(aMeshInfo);
@ -495,7 +503,7 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
{ {
// coordinates // coordinates
TCoordSlice aTCoordSlice = aNodeInfo->GetCoordSlice( iNode ); TCoordSlice aTCoordSlice = aNodeInfo->GetCoordSlice( iNode );
for(TInt iCoord = 0; iCoord < aMeshDimension; iCoord++){ for(TInt iCoord = 0; iCoord < aSpaceDim; iCoord++){
aTCoordSlice[iCoord] = aCoordHelperPtr->GetCoord(iCoord); aTCoordSlice[iCoord] = aCoordHelperPtr->GetCoord(iCoord);
} }
// node number // node number
@ -512,7 +520,7 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
anElemFamMap.Clear(); anElemFamMap.Clear();
// coordinate names and units // coordinate names and units
for (TInt iCoord = 0; iCoord < aMeshDimension; iCoord++) { for (TInt iCoord = 0; iCoord < aSpaceDim; iCoord++) {
aNodeInfo->SetCoordName( iCoord, aCoordHelperPtr->GetName(iCoord)); aNodeInfo->SetCoordName( iCoord, aCoordHelperPtr->GetName(iCoord));
aNodeInfo->SetCoordUnit( iCoord, aCoordHelperPtr->GetUnit(iCoord)); aNodeInfo->SetCoordUnit( iCoord, aCoordHelperPtr->GetUnit(iCoord));
} }