X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDriverMED%2FDriverMED_R_SMESHDS_Mesh.cxx;h=35caa0286e17d144444063469d93701754119c82;hb=3816b8e97cddde55139b37ed8cd589ad1216e900;hp=c679edd9bca473f2612d5a372ec83245abeeefe8;hpb=8fa039a796957b302d86d90b22afc0a998573f83;p=modules%2Fsmesh.git diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx index c679edd9b..35caa0286 100644 --- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx +++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx @@ -1,23 +1,23 @@ -// Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE // -// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2.1 of the License. +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License. // -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. // -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // SMESH DriverMED : driver to read and write 'med' files @@ -25,7 +25,6 @@ // Module : SMESH // #include "DriverMED_R_SMESHDS_Mesh.h" -#include "DriverMED_R_SMDS_Mesh.h" #include "SMESHDS_Mesh.hxx" #include "utilities.h" @@ -59,7 +58,8 @@ DriverMED_R_SMESHDS_Mesh } static const SMDS_MeshNode* -FindNode(const SMDS_Mesh* theMesh, TInt theId){ +FindNode(const SMDS_Mesh* theMesh, TInt theId) +{ const SMDS_MeshNode* aNode = theMesh->FindNode(theId); if(aNode) return aNode; EXCEPTION(runtime_error,"SMDS_Mesh::FindNode - cannot find a SMDS_MeshNode for ID = "<GetName()) continue; aResult = DRS_OK; - //TInt aMeshDim = aMeshInfo->GetDim(); - // Reading MED families to the temporary structure //------------------------------------------------ TErr anErr; @@ -145,7 +143,7 @@ DriverMED_R_SMESHDS_Mesh aResult = DRS_FAIL; continue; } - + aMeshInfo->myDim=aMeshInfo->mySpaceDim;// ignore meshdim in MEDFile because it can be false PCoordHelper aCoordHelper = GetCoordHelper(aNodeInfo); EBooleen anIsNodeNum = aNodeInfo->IsElemNum(); @@ -161,13 +159,10 @@ DriverMED_R_SMESHDS_Mesh if(anIsNodeNum) { aNode = myMesh->AddNodeWithID (aCoords[0],aCoords[1],aCoords[2],aNodeInfo->GetElemNum(iElem)); - //MESSAGE("AddNodeWithID " << aNodeInfo->GetElemNum(iElem)); } else { aNode = myMesh->AddNodeWithID (aCoords[0],aCoords[1],aCoords[2], iElem+1); - //MESSAGE("AddNode " << aNode->GetID()); } - //cout<GetID()<<": "<X()<<", "<Y()<<", "<Z()<GetFamNum(iElem); @@ -194,6 +189,70 @@ DriverMED_R_SMESHDS_Mesh for(; aGeom2SizeIter != aGeom2Size.end(); aGeom2SizeIter++){ const EGeometrieElement& aGeom = aGeom2SizeIter->first; + if ( anEntity == eSTRUCT_ELEMENT ) // MED_BALL (issue 0021459) + { + PBallInfo aBallInfo = aMed->GetPBallInfo(aMeshInfo); + TInt aNbBalls = aBallInfo->GetNbElem(); + + EBooleen anIsElemNum = takeNumbers ? aBallInfo->IsElemNum() : eFAUX; + if ( anIsElemNum && aBallInfo->myElemNum->empty() ) + anIsElemNum = eFAUX; + + // get supporting nodes + TNodeIds aNodeIds; +#ifdef _EDF_NODE_IDS_ + if(anIsNodeNum) { + aNodeIds.resize( aNbBalls ); + for(TInt iBall = 0; iBall < aNbBalls && anIsNodeNum; iBall++) + { + aNodeIds[iBall] = aNodeInfo->GetElemNum( (*aBallInfo->myConn)[ iBall ]-1 ); + anIsNodeNum = myMesh->FindNode( aNodeIds[iBall] ) ? eVRAI : eFAUX; + } + } +#endif + if ( !anIsNodeNum ) + aNodeIds.swap( *(aBallInfo->myConn )); + + // allocate array of diameters + vtkIdType maxID = myMesh->MaxElementID() + aNbBalls; + if ( anIsElemNum && !aBallInfo->myElemNum->empty() ) + maxID = *std::max_element( aBallInfo->myElemNum->begin(), + aBallInfo->myElemNum->end() ); + myMesh->getGrid()->AllocateDiameters( maxID ); // performance optimization + + // create balls + SMDS_MeshElement* anElement; + DriverMED_FamilyPtr aFamily; + for ( TInt iBall = 0; iBall < aNbBalls; iBall++) + { + anElement = 0; + if ( anIsElemNum ) { + if (!(anElement = myMesh->AddBallWithID( aNodeIds[iBall], + aBallInfo->myDiameters[iBall], + aBallInfo->GetElemNum(iBall)))) + anIsElemNum = eFAUX; + } + if ( !anElement ) + myMesh->AddBall( myMesh->FindNode( aNodeIds[iBall]), + aBallInfo->myDiameters[iBall] ); + + // Save reference to this element from its family + TInt aFamNum = aBallInfo->GetFamNum(iBall); + if ( checkFamilyID ( aFamily, aFamNum )) + { + aFamily->AddElement(anElement); + aFamily->SetType( SMDSAbs_Ball ); + } + } + + if ( !anIsElemNum && + ( takeNumbers && aBallInfo->IsElemNum() && !aBallInfo->myElemNum->empty() )) + if ( aResult < DRS_WARN_RENUMBER ) + aResult = DRS_WARN_RENUMBER; + + continue; + } // MED_BALL + switch(aGeom) { // case ePOINT1: ## PAL16410 // break; @@ -227,14 +286,12 @@ DriverMED_R_SMESHDS_Mesh if(anIsElemNum){ TInt anElemId = aPolygoneInfo->GetElemNum(iElem); anElement = myMesh->AddPolygonalFaceWithID(aNodeIds,anElemId); - //MESSAGE("AddPolygonalFaceWithID " << anElemId); } if(!anElement){ vector aNodes(aNbConn); for(TInt iConn = 0; iConn < aNbConn; iConn++) aNodes[iConn] = FindNode(myMesh,aNodeIds[iConn]); anElement = myMesh->AddPolygonalFace(aNodes); - //MESSAGE("AddPolygonalFace " << anElement->GetID()); isRenum = anIsElemNum; } #ifndef _DEXCEPT_ @@ -274,33 +331,26 @@ DriverMED_R_SMESHDS_Mesh typedef MED::TVector TQuantities; TQuantities aQuantities(aNbFaces); TInt aNbNodes = aPolyedreInfo->GetNbNodes(iElem); - //MESSAGE("--- aNbNodes " << aNbNodes); TNodeIds aNodeIds(aNbNodes); for(TInt iFace = 0, iNode = 0; iFace < aNbFaces; iFace++){ - //MESSAGE("--- iface " << aNbFaces << " " << iFace); MED::TCConnSlice aConnSlice = aConnSliceArr[iFace]; TInt aNbConn = aConnSlice.size(); aQuantities[iFace] = aNbConn; #ifdef _EDF_NODE_IDS_ - //MESSAGE(anIsNodeNum); if(anIsNodeNum) for(TInt iConn = 0; iConn < aNbConn; iConn++) { - //MESSAGE("iConn " << iConn << " aConnSlice[iConn] " << aConnSlice[iConn]); aNodeIds[iNode] = aNodeInfo->GetElemNum(aConnSlice[iConn] - 1); - //MESSAGE("aNodeIds[" << iNode << "]=" << aNodeIds[iNode]); iNode++; } else for(TInt iConn = 0; iConn < aNbConn; iConn++) { - //MESSAGE("iConn " << iConn); aNodeIds[iNode++] = aConnSlice[iConn]; } #else for(TInt iConn = 0; iConn < aNbConn; iConn++) { - //MESSAGE("iConn " << iConn); aNodeIds[iNode++] = aConnSlice[iConn]; } #endif @@ -316,14 +366,12 @@ DriverMED_R_SMESHDS_Mesh if(anIsElemNum){ TInt anElemId = aPolyedreInfo->GetElemNum(iElem); anElement = myMesh->AddPolyhedralVolumeWithID(aNodeIds,aQuantities,anElemId); - //MESSAGE("AddPolyhedralVolumeWithID " << anElemId); } if(!anElement){ vector aNodes(aNbNodes); for(TInt iConn = 0; iConn < aNbNodes; iConn++) aNodes[iConn] = FindNode(myMesh,aNodeIds[iConn]); anElement = myMesh->AddPolyhedralVolume(aNodes,aQuantities); - //MESSAGE("AddPolyhedralVolume " << anElement->GetID()); isRenum = anIsElemNum; } #ifndef _DEXCEPT_ @@ -366,6 +414,7 @@ DriverMED_R_SMESHDS_Mesh case eTRIA6: aNbNodes = 6; break; case eQUAD4: aNbNodes = 4; break; case eQUAD8: aNbNodes = 8; break; + case eQUAD9: aNbNodes = 9; break; case eTETRA4: aNbNodes = 4; break; case eTETRA10: aNbNodes = 10; break; case ePYRA5: aNbNodes = 5; break; @@ -374,6 +423,8 @@ DriverMED_R_SMESHDS_Mesh case ePENTA15: aNbNodes = 15; break; case eHEXA8: aNbNodes = 8; break; case eHEXA20: aNbNodes = 20; break; + case eHEXA27: aNbNodes = 27; break; + case eOCTA12: aNbNodes = 12; break; case ePOINT1: aNbNodes = 1; break; default:; } @@ -401,7 +452,7 @@ DriverMED_R_SMESHDS_Mesh INFOS("Following exception was caught:\n\t"<AddFaceWithID(aNodeIds[0], aNodeIds[1], + aNodeIds[2], aNodeIds[3], + aNodeIds[4], aNodeIds[5], + aNodeIds[6], aNodeIds[7], aNodeIds[8], + aCellInfo->GetElemNum(iElem)); + if (!anElement) { + anElement = myMesh->AddFace(FindNode(myMesh,aNodeIds[0]), + FindNode(myMesh,aNodeIds[1]), + FindNode(myMesh,aNodeIds[2]), + FindNode(myMesh,aNodeIds[3]), + FindNode(myMesh,aNodeIds[4]), + FindNode(myMesh,aNodeIds[5]), + FindNode(myMesh,aNodeIds[6]), + FindNode(myMesh,aNodeIds[7]), + FindNode(myMesh,aNodeIds[8])); + isRenum = anIsElemNum; + } + break; case eTETRA4: aNbNodes = 4; if(anIsElemNum) @@ -555,7 +627,6 @@ DriverMED_R_SMESHDS_Mesh break; case ePYRA5: aNbNodes = 5; - // There is some differnce between SMDS and MED if(anIsElemNum) anElement = myMesh->AddVolumeWithID(aNodeIds[0], aNodeIds[1], aNodeIds[2], aNodeIds[3], @@ -572,7 +643,6 @@ DriverMED_R_SMESHDS_Mesh break; case ePYRA13: aNbNodes = 13; - // There is some difference between SMDS and MED if(anIsElemNum) anElement = myMesh->AddVolumeWithID(aNodeIds[0], aNodeIds[1], aNodeIds[2], aNodeIds[3], @@ -674,6 +744,7 @@ DriverMED_R_SMESHDS_Mesh isRenum = anIsElemNum; } break; + case eHEXA20: aNbNodes = 20; if(anIsElemNum) @@ -712,13 +783,86 @@ DriverMED_R_SMESHDS_Mesh isRenum = anIsElemNum; } break; - } -// if (anIsElemNum) { -// MESSAGE("add element with id " << aCellInfo->GetElemNum(iElem)); -// } -// else { -// MESSAGE("add element "<< anElement->GetID()); -// } + + case eHEXA27: + aNbNodes = 27; + if(anIsElemNum) + anElement = myMesh->AddVolumeWithID(aNodeIds[0], aNodeIds[1], + aNodeIds[2], aNodeIds[3], + aNodeIds[4], aNodeIds[5], + aNodeIds[6], aNodeIds[7], + aNodeIds[8], aNodeIds[9], + aNodeIds[10], aNodeIds[11], + aNodeIds[12], aNodeIds[13], + aNodeIds[14], aNodeIds[15], + aNodeIds[16], aNodeIds[17], + aNodeIds[18], aNodeIds[19], + aNodeIds[20], aNodeIds[21], + aNodeIds[22], aNodeIds[23], + aNodeIds[24], aNodeIds[25], + aNodeIds[26], + aCellInfo->GetElemNum(iElem)); + if (!anElement) { + anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]), + FindNode(myMesh,aNodeIds[1]), + FindNode(myMesh,aNodeIds[2]), + FindNode(myMesh,aNodeIds[3]), + FindNode(myMesh,aNodeIds[4]), + FindNode(myMesh,aNodeIds[5]), + FindNode(myMesh,aNodeIds[6]), + FindNode(myMesh,aNodeIds[7]), + FindNode(myMesh,aNodeIds[8]), + FindNode(myMesh,aNodeIds[9]), + FindNode(myMesh,aNodeIds[10]), + FindNode(myMesh,aNodeIds[11]), + FindNode(myMesh,aNodeIds[12]), + FindNode(myMesh,aNodeIds[13]), + FindNode(myMesh,aNodeIds[14]), + FindNode(myMesh,aNodeIds[15]), + FindNode(myMesh,aNodeIds[16]), + FindNode(myMesh,aNodeIds[17]), + FindNode(myMesh,aNodeIds[18]), + FindNode(myMesh,aNodeIds[19]), + FindNode(myMesh,aNodeIds[20]), + FindNode(myMesh,aNodeIds[21]), + FindNode(myMesh,aNodeIds[22]), + FindNode(myMesh,aNodeIds[23]), + FindNode(myMesh,aNodeIds[24]), + FindNode(myMesh,aNodeIds[25]), + FindNode(myMesh,aNodeIds[26])); + isRenum = anIsElemNum; + } + break; + + case eOCTA12: + aNbNodes = 12; + if(anIsElemNum) + anElement = myMesh->AddVolumeWithID(aNodeIds[0], aNodeIds[1], + aNodeIds[2], aNodeIds[3], + aNodeIds[4], aNodeIds[5], + aNodeIds[6], aNodeIds[7], + aNodeIds[8], aNodeIds[9], + aNodeIds[10], aNodeIds[11], + aCellInfo->GetElemNum(iElem)); + if (!anElement) { + anElement = myMesh->AddVolume(FindNode(myMesh,aNodeIds[0]), + FindNode(myMesh,aNodeIds[1]), + FindNode(myMesh,aNodeIds[2]), + FindNode(myMesh,aNodeIds[3]), + FindNode(myMesh,aNodeIds[4]), + FindNode(myMesh,aNodeIds[5]), + FindNode(myMesh,aNodeIds[6]), + FindNode(myMesh,aNodeIds[7]), + FindNode(myMesh,aNodeIds[8]), + FindNode(myMesh,aNodeIds[9]), + FindNode(myMesh,aNodeIds[10]), + FindNode(myMesh,aNodeIds[11])); + isRenum = anIsElemNum; + } + break; + + } // switch(aGeom) + #ifndef _DEXCEPT_ }catch(const std::exception& exc){ INFOS("The following exception was caught:\n\t"<GetCoord(iNode); for(MED::TInt iDim=0;iDimAddNodeWithID(aCoords[0],aCoords[1],aCoords[2],(int)iNode); + aNode = myMesh->AddNodeWithID(aCoords[0],aCoords[1],aCoords[2],iNode+1); if (!aNode) { EXCEPTION(runtime_error,"buildMeshGrille Error. Node not created! "<<(int)iNode); } @@ -996,35 +1140,35 @@ bool DriverMED_R_SMESHDS_Mesh::buildMeshGrille(const MED::PWrapper& theWrapper, res = false; EXCEPTION(runtime_error,"buildMeshGrille Error. Incorrect size of ids 2!="<AddEdgeWithID(aNodeIds[0], - aNodeIds[1], - iCell); + anElement = myMesh->AddEdgeWithID(aNodeIds[0]+1, + aNodeIds[1]+1, + iCell+1); break; case MED::eQUAD4: if(aNodeIds.size() != 4){ res = false; EXCEPTION(runtime_error,"buildMeshGrille Error. Incorrect size of ids 4!="<AddFaceWithID(aNodeIds[0], - aNodeIds[2], - aNodeIds[3], - aNodeIds[1], - iCell); + anElement = myMesh->AddFaceWithID(aNodeIds[0]+1, + aNodeIds[2]+1, + aNodeIds[3]+1, + aNodeIds[1]+1, + iCell+1); break; case MED::eHEXA8: if(aNodeIds.size() != 8){ res = false; EXCEPTION(runtime_error,"buildMeshGrille Error. Incorrect size of ids 8!="<AddVolumeWithID(aNodeIds[0], - aNodeIds[2], - aNodeIds[3], - aNodeIds[1], - aNodeIds[4], - aNodeIds[6], - aNodeIds[7], - aNodeIds[5], - iCell); + anElement = myMesh->AddVolumeWithID(aNodeIds[0]+1, + aNodeIds[2]+1, + aNodeIds[3]+1, + aNodeIds[1]+1, + aNodeIds[4]+1, + aNodeIds[6]+1, + aNodeIds[7]+1, + aNodeIds[5]+1, + iCell+1); break; default: break;