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

0021149: [CEA 445] Wrong mesh dimension

Browse Source
This commit is contained in:
eap 2011-04-19 14:40:23 +00:00
parent ae2ceb426e
commit 4558b6ca1c
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
View File

@ -346,7 +346,7 @@ Driver_Mesh::Status DriverMED_W_SMESHDS_Mesh::Perform()
} }
// Mesh dimension definition // Mesh dimension definition
TInt aMeshDimension; TInt aSpaceDimension;
TCoordHelperPtr aCoordHelperPtr; TCoordHelperPtr aCoordHelperPtr;
{ {
bool anIsXDimension = false; bool anIsXDimension = false;
@ -377,25 +377,25 @@ 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; aSpaceDimension = anIsXDimension + anIsYDimension + anIsZDimension;
if(!aMeshDimension) if(!aSpaceDimension)
aMeshDimension = 3; aSpaceDimension = 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 ( aSpaceDimension == 2 && anIsZDimension ) // 2D only if mesh is in XOY plane
aMeshDimension = 3; aSpaceDimension = 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 ( aSpaceDimension == 1 && !anIsXDimension ) {// 1D only if mesh is along OX
if ( anIsYDimension ) { if ( anIsYDimension ) {
aMeshDimension = 2; aSpaceDimension = 2;
anIsXDimension = true; anIsXDimension = true;
} else { } else {
aMeshDimension = 3; aSpaceDimension = 3;
} }
} }
} }
SMDS_NodeIteratorPtr aNodesIter = myMesh->nodesIterator(/*idInceasingOrder=*/true); SMDS_NodeIteratorPtr aNodesIter = myMesh->nodesIterator(/*idInceasingOrder=*/true);
switch(aMeshDimension){ switch(aSpaceDimension){
case 3: case 3:
aCoordHelperPtr.reset(new TCoordHelper(aNodesIter,aXYZGetCoord,aXYZName)); aCoordHelperPtr.reset(new TCoordHelper(aNodesIter,aXYZGetCoord,aXYZName));
break; break;
@ -417,9 +417,15 @@ 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,aMeshDimension,aMeshName); PMeshInfo aMeshInfo = myMed->CrMeshInfo(aMeshDimension,aSpaceDimension,aMeshName);
MESSAGE("Add - aMeshName : "<<aMeshName<<"; "<<aMeshInfo->GetName()); MESSAGE("Add - aMeshName : "<<aMeshName<<"; "<<aMeshInfo->GetName());
myMed->SetMeshInfo(aMeshInfo); myMed->SetMeshInfo(aMeshInfo);
@ -496,7 +502,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 < aSpaceDimension; iCoord++){
aTCoordSlice[iCoord] = aCoordHelperPtr->GetCoord(iCoord); aTCoordSlice[iCoord] = aCoordHelperPtr->GetCoord(iCoord);
} }
// node number // node number
@ -513,7 +519,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 < aSpaceDimension; 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));
} }