X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FDriverMED%2FDriverMED_R_SMESHDS_Mesh.cxx;h=1433e3208a970c74ef6d00e1f498552e3100d94d;hb=85332362ed87110b788afa215a9bc8e02a160fea;hp=513454316ef57da8f9328384f0d6a4469eae7aad;hpb=e4737e85f0da6d3f90fd08f6be1c2825195fe16f;p=modules%2Fsmesh.git diff --git a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx index 513454316..1433e3208 100644 --- a/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx +++ b/src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx @@ -33,20 +33,28 @@ #include "SMESHDS_Group.hxx" -#include "MEDA_Wrapper.hxx" +#include "MED_Factory.hxx" #include "MED_Utilities.hxx" #include +#ifdef _DEBUG_ +static int MYDEBUG = 0; +#else +static int MYDEBUG = 0; +#endif + #define _EDF_NODE_IDS_ +using namespace MED; + void DriverMED_R_SMESHDS_Mesh::SetMeshName(string theMeshName) { myMeshName = theMeshName; } static const SMDS_MeshNode* -FindNode(const SMDS_Mesh* theMesh, med_int 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 = "< -med_float GetCoord(MEDA::PNodeInfo& thePNodeInfo, med_int theElemId){ +TFloat GetCoord(MED::PNodeInfo& thePNodeInfo, TInt theElemId){ return thePNodeInfo->GetNodeCoord(theElemId,TheCoordId); } template<> -med_float GetCoord(MEDA::PNodeInfo& thePNodeInfo, med_int theElemId){ +TFloat GetCoord(MED::PNodeInfo& thePNodeInfo, TInt theElemId){ return 0.0; } @@ -113,16 +121,16 @@ static TGetCoord aZGetCoord[3] = { class TCoordHelper{ - MEDA::PNodeInfo myPNodeInfo; + MED::PNodeInfo myPNodeInfo; TGetCoord* myGetCoord; public: - TCoordHelper(const MEDA::PNodeInfo& thePNodeInfo, + TCoordHelper(const MED::PNodeInfo& thePNodeInfo, TGetCoord* theGetCoord): myPNodeInfo(thePNodeInfo), myGetCoord(theGetCoord) {} virtual ~TCoordHelper(){} - med_float GetCoord(med_int theElemId, med_int theCoodId){ + TFloat GetCoord(TInt theElemId, TInt theCoodId){ return (*myGetCoord[theCoodId])(myPNodeInfo,theElemId); } }; @@ -133,18 +141,16 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform() { Status aResult = DRS_FAIL; try{ - using namespace MEDA; - myFamilies.clear(); - MESSAGE("Perform - myFile : "<GetNbMeshes()){ for(int iMesh = 0; iMesh < aNbMeshes; iMesh++){ // Reading the MED mesh //--------------------- - PMeshInfo aMeshInfo = aMed.GetMeshInfo(iMesh); + PMeshInfo aMeshInfo = aMed->GetPMeshInfo(iMesh+1); string aMeshName; if (myMeshId != -1) { ostringstream aMeshNameStr; @@ -153,41 +159,44 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform() } else { aMeshName = myMeshName; } - MESSAGE("Perform - aMeshName : "<GetName()); + if(MYDEBUG) MESSAGE("Perform - aMeshName : "<GetName()); if(aMeshName != aMeshInfo->GetName()) continue; aResult = DRS_OK; - med_int aMeshDim = aMeshInfo->GetDim(); + //TInt aMeshDim = aMeshInfo->GetDim(); // Reading MED families to the temporary structure //------------------------------------------------ - med_int aNbFams = aMed.GetNbFamilies(aMeshInfo); - MESSAGE("Read " << aNbFams << " families"); - for (med_int iFam = 0; iFam < aNbFams; iFam++) { - PFamilyInfo aFamilyInfo = aMed.GetFamilyInfo(aMeshInfo, iFam); - med_int aFamId = aFamilyInfo->GetId(); - MESSAGE("Family " << aFamId << " :"); - + TErr anErr; + TInt aNbFams = aMed->GetNbFamilies(aMeshInfo); + if(MYDEBUG) MESSAGE("Read " << aNbFams << " families"); + for (TInt iFam = 0; iFam < aNbFams; iFam++) { + PFamilyInfo aFamilyInfo = aMed->GetPFamilyInfo(aMeshInfo,iFam+1,&anErr); + if(anErr >= 0){ + TInt aFamId = aFamilyInfo->GetId(); + if(MYDEBUG) MESSAGE("Family " << aFamId << " :"); + DriverMED_FamilyPtr aFamily (new DriverMED_Family); - - med_int aNbGrp = aFamilyInfo->GetNbGroup(); - MESSAGE("belong to " << aNbGrp << " groups"); - for (med_int iGr = 0; iGr < aNbGrp; iGr++) { + + TInt aNbGrp = aFamilyInfo->GetNbGroup(); + if(MYDEBUG) MESSAGE("belong to " << aNbGrp << " groups"); + for (TInt iGr = 0; iGr < aNbGrp; iGr++) { string aGroupName = aFamilyInfo->GetGroupName(iGr); - MESSAGE(aGroupName); + if(MYDEBUG) MESSAGE(aGroupName); aFamily->AddGroupName(aGroupName); } myFamilies[aFamId] = aFamily; + } } // Reading MED nodes to the corresponding SMDS structure //------------------------------------------------------ - PNodeInfo aNodeInfo = aMed.GetNodeInfo(aMeshInfo); + PNodeInfo aNodeInfo = aMed->GetPNodeInfo(aMeshInfo); TCoordHelperPtr aCoordHelperPtr; { - med_int aMeshDimension = aMeshInfo->GetDim(); + TInt aMeshDimension = aMeshInfo->GetDim(); bool anIsDimPresent[3] = {false, false, false}; - for(med_int iDim = 0; iDim < aMeshDimension; iDim++){ + for(TInt iDim = 0; iDim < aMeshDimension; iDim++){ string aDimName = aNodeInfo->GetCoordName(iDim); if(aDimName == "x" || aDimName == "X") anIsDimPresent[eX] = true; @@ -219,12 +228,12 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform() } } - med_booleen anIsNodeNum = aNodeInfo->IsElemNum(); - med_int aNbElems = aNodeInfo->GetNbElem(); - MESSAGE("Perform - aNodeInfo->GetNbElem() = "<GetNbElem() = "<X()<<", "<Y()<<", "<Z()<GetFamNum(iElem); + TInt aFamNum = aNodeInfo->GetFamNum(iElem); if (myFamilies.find(aFamNum) != myFamilies.end()) { myFamilies[aFamNum]->AddElement(aNode); @@ -248,81 +257,95 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform() // Reading pre information about all MED cells //-------------------------------------------- bool takeNumbers = true; // initially we trust the numbers from file - MED::TEntityInfo aEntityInfo = aMed.GetEntityInfo(aMeshInfo); + MED::TEntityInfo aEntityInfo = aMed->GetEntityInfo(aMeshInfo); MED::TEntityInfo::iterator anEntityIter = aEntityInfo.begin(); for(; anEntityIter != aEntityInfo.end(); anEntityIter++){ - const med_entite_maillage& anEntity = anEntityIter->first; - if(anEntity == MED_NOEUD) continue; + const EEntiteMaillage& anEntity = anEntityIter->first; + if(anEntity == eNOEUD) continue; // Reading MED cells to the corresponding SMDS structure //------------------------------------------------------ const MED::TGeom& aTGeom = anEntityIter->second; MED::TGeom::const_iterator anTGeomIter = aTGeom.begin(); for(; anTGeomIter != aTGeom.end(); anTGeomIter++){ - const med_geometrie_element& aGeom = anTGeomIter->first; - if(aGeom == MED_POINT1) continue; - PCellInfo aCellInfo = aMed.GetCellInfo(aMeshInfo,anEntity,aGeom); - med_booleen anIsElemNum = takeNumbers ? aCellInfo->IsElemNum() : MED_FAUX; - med_int aNbElems = aCellInfo->GetNbElem(); - MESSAGE("Perform - anEntity = "<GetFamNum(iElem); + TInt aFamNum = aCellInfo->GetFamNum(iElem); try{ switch(aGeom){ - case MED_SEG2: - case MED_SEG3: + case eSEG2: + case eSEG3: if(anIsElemNum) anElement = myMesh->AddEdgeWithID(aNodeIds[0], aNodeIds[1], @@ -333,8 +356,8 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform() isRenum = anIsElemNum; } break; - case MED_TRIA3: - case MED_TRIA6: + case eTRIA3: + case eTRIA6: aNbNodes = 3; if(anIsElemNum) anElement = myMesh->AddFaceWithID(aNodeIds[0], @@ -348,8 +371,8 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform() isRenum = anIsElemNum; } break; - case MED_QUAD4: - case MED_QUAD8: + case eQUAD4: + case eQUAD8: aNbNodes = 4; // There is some differnce between SMDS and MED if(anIsElemNum) @@ -366,8 +389,8 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform() isRenum = anIsElemNum; } break; - case MED_TETRA4: - case MED_TETRA10: + case eTETRA4: + case eTETRA10: aNbNodes = 4; if(anIsElemNum) anElement = myMesh->AddVolumeWithID(aNodeIds[0], @@ -383,8 +406,8 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform() isRenum = anIsElemNum; } break; - case MED_PYRA5: - case MED_PYRA13: + case ePYRA5: + case ePYRA13: aNbNodes = 5; // There is some differnce between SMDS and MED if(anIsElemNum) @@ -403,8 +426,8 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform() isRenum = anIsElemNum; } break; - case MED_PENTA6: - case MED_PENTA15: + case ePENTA6: + case ePENTA15: aNbNodes = 6; if(anIsElemNum) anElement = myMesh->AddVolumeWithID(aNodeIds[0], @@ -424,8 +447,8 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform() isRenum = anIsElemNum; } break; - case MED_HEXA8: - case MED_HEXA20: + case eHEXA8: + case eHEXA20: aNbNodes = 8; if(anIsElemNum) anElement = myMesh->AddVolumeWithID(aNodeIds[0], @@ -463,7 +486,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform() } else { if (isRenum) { - anIsElemNum = MED_FAUX; + anIsElemNum = eFAUX; takeNumbers = false; if (aResult < DRS_WARN_RENUMBER) aResult = DRS_WARN_RENUMBER; @@ -487,7 +510,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform() INFOS("Unknown exception was cought !!!"); aResult = DRS_FAIL; } - MESSAGE("Perform - aResult status = "<GetNbMeshes()) { for (int iMesh = 0; iMesh < aNbMeshes; iMesh++) { // Reading the MED mesh //--------------------- - PMeshInfo aMeshInfo = aMed.GetMeshInfo(iMesh); + PMeshInfo aMeshInfo = aMed->GetPMeshInfo(iMesh+1); aMeshNames.push_back(aMeshInfo->GetName()); } } @@ -551,7 +572,7 @@ list DriverMED_R_SMESHDS_Mesh::GetGroupNames() void DriverMED_R_SMESHDS_Mesh::GetGroup(SMESHDS_Group* theGroup) { string aGroupName (theGroup->GetStoreName()); - MESSAGE("Get Group " << aGroupName); + if(MYDEBUG) MESSAGE("Get Group " << aGroupName); map::iterator aFamsIter = myFamilies.begin(); for (; aFamsIter != myFamilies.end(); aFamsIter++)