X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FMEDPartitioner%2FMEDPARTITIONER_MeshCollectionDriver.cxx;h=8b6340e82bc6f37cbfff9faa0c3efcc503656ecc;hb=8411b13fec372c7635bf04d2bb81a869dc038fdd;hp=516deff4e11a68c362de1b7be8ebc713ecd028fc;hpb=c8d33262ed6d2041da8512b02f8c8b4ffadf733d;p=tools%2Fmedcoupling.git diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.cxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.cxx index 516deff4e..8b6340e82 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D +// Copyright (C) 2007-2020 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -72,8 +72,8 @@ int MeshCollectionDriver::readSeq(const char* filename, const char* meshname) (_collection->getFaceMesh()).push_back(mfm->getLevelM1Mesh(false)); //reading family ids - MEDCoupling::DataArrayInt* cellIds(mfm->getFamilyFieldAtLevel(0)->deepCpy()); - MEDCoupling::DataArrayInt* faceIds(mfm->getFamilyFieldAtLevel(-1)->deepCpy()); + MEDCoupling::DataArrayIdType* cellIds(mfm->getFamilyFieldAtLevel(0)->deepCopy()); + MEDCoupling::DataArrayIdType* faceIds(mfm->getFamilyFieldAtLevel(-1)->deepCopy()); (_collection->getCellFamilyIds()).push_back(cellIds); (_collection->getFaceFamilyIds()).push_back(faceIds); @@ -136,13 +136,13 @@ void MeshCollectionDriver::readData(MEDCoupling::MEDFileUMesh* mfm, int idomain) { (_collection->getMesh())[idomain]=mfm->getLevel0Mesh(false); //reading families groups - MEDCoupling::DataArrayInt* cellIds(mfm->getFamilyFieldAtLevel(0)->deepCpy()); + MEDCoupling::DataArrayIdType* cellIds(mfm->getFamilyFieldAtLevel(0)->deepCopy()); (_collection->getCellFamilyIds())[idomain]=cellIds; } catch(...) { (_collection->getMesh())[idomain]=CreateEmptyMEDCouplingUMesh(); // or 0 if you want tests; - MEDCoupling::DataArrayInt* empty=MEDCoupling::DataArrayInt::New(); + MEDCoupling::DataArrayIdType* empty=MEDCoupling::DataArrayIdType::New(); empty->alloc(0,1); (_collection->getCellFamilyIds())[idomain]=empty; std::cout<<"\nNO Level0Mesh (Cells)\n"; @@ -153,7 +153,7 @@ void MeshCollectionDriver::readData(MEDCoupling::MEDFileUMesh* mfm, int idomain) { (_collection->getFaceMesh())[idomain]=mfm->getLevelM1Mesh(false); //reading families groups - MEDCoupling::DataArrayInt* faceIds(mfm->getFamilyFieldAtLevel(-1)->deepCpy()); + MEDCoupling::DataArrayIdType* faceIds(mfm->getFamilyFieldAtLevel(-1)->deepCopy()); (_collection->getFaceFamilyIds())[idomain]=faceIds; if (MyGlobals::_Verbose>10) std::cout << "proc " << MyGlobals::_Rank << " : WITH Faces\n"; @@ -166,7 +166,7 @@ void MeshCollectionDriver::readData(MEDCoupling::MEDFileUMesh* mfm, int idomain) catch(...) { (_collection->getFaceMesh())[idomain]=CreateEmptyMEDCouplingUMesh(); // or 0 if you want test; - MEDCoupling::DataArrayInt* empty=MEDCoupling::DataArrayInt::New(); + MEDCoupling::DataArrayIdType* empty=MEDCoupling::DataArrayIdType::New(); (_collection->getFaceFamilyIds())[idomain]=empty; if (MyGlobals::_Verbose>10) std::cout << "proc " << MyGlobals::_Rank << " : WITHOUT Faces\n"; @@ -225,7 +225,7 @@ MEDCoupling::MEDFileMesh* MeshCollectionDriver::getMesh(int idomain) const cellMesh->setName(finalMeshName); mfm->setMeshAtLevel( 0, cellMesh ); - faceMesh->checkCoherency(); + faceMesh->checkConsistencyLight(); if (faceMesh->getNumberOfCells()>0) { faceMesh->tryToShareSameCoordsPermute(*cellMesh, 1e-10); @@ -234,7 +234,7 @@ MEDCoupling::MEDFileMesh* MeshCollectionDriver::getMesh(int idomain) const } // MEDCoupling::MEDCouplingUMesh* boundaryMesh=0; - // if (MyGlobals::_Creates_Boundary_Faces>0) + // if (MyGlobals::_Create_Boundary_Faces>0) // { // //try to write Boundary meshes // bool keepCoords=false; //TODO or true @@ -258,7 +258,7 @@ MEDCoupling::MEDFileMesh* MeshCollectionDriver::getMesh(int idomain) const // add joints - using MEDCoupling::MEDCouplingAutoRefCountObjectPtr; + using MEDCoupling::MCAuto; using MEDCoupling::MEDCouplingSkyLineArray; using MEDCoupling::MEDFileJoint; using MEDCoupling::MEDFileJointCorrespondence; @@ -268,7 +268,7 @@ MEDCoupling::MEDFileMesh* MeshCollectionDriver::getMesh(int idomain) const if ( _collection->getCZ().size() > 0 ) { - MEDCouplingAutoRefCountObjectPtr< MEDFileJoints > joints = MEDFileJoints::New(); + MCAuto< MEDFileJoints > joints = MEDFileJoints::New(); for ( size_t i = 0; i < _collection->getCZ().size(); ++i ) { @@ -287,24 +287,24 @@ MEDCoupling::MEDFileMesh* MeshCollectionDriver::getMesh(int idomain) const cz->setDescription( oss.str() ); } - MEDCouplingAutoRefCountObjectPtr< MEDFileJoint> + MCAuto< MEDFileJoint> joint = MEDFileJoint::New( cz->getName(), finalMeshName, finalMeshName, cz->getDistantDomainNumber() ); joint->setDescription( cz->getDescription() ); joints->pushJoint( joint ); - MEDCouplingAutoRefCountObjectPtr< MEDFileJointOneStep> j1st = MEDFileJointOneStep::New(); + MCAuto< MEDFileJointOneStep> j1st = MEDFileJointOneStep::New(); joint->pushStep( j1st ); const MEDCouplingSkyLineArray * nodeCorr = cz->getNodeCorresp(); if ( nodeCorr ) { - MEDCouplingAutoRefCountObjectPtr< MEDFileJointCorrespondence > - corr = MEDFileJointCorrespondence::New( nodeCorr->getValueArray() ); + MCAuto< MEDFileJointCorrespondence > + corr = MEDFileJointCorrespondence::New( nodeCorr->getValuesArray() ); j1st->pushCorrespondence( corr ); } - std::vector< std::pair< int,int > > types = cz->getEntities(); + std::vector< std::pair< mcIdType,mcIdType > > types = cz->getEntities(); INTERP_KERNEL::NormalizedCellType t1, t2; for ( size_t it = 0; it < types.size(); ++it ) { @@ -314,8 +314,8 @@ MEDCoupling::MEDFileMesh* MeshCollectionDriver::getMesh(int idomain) const { t1 = INTERP_KERNEL::NormalizedCellType( types[it].first ); t2 = INTERP_KERNEL::NormalizedCellType( types[it].second ); - MEDCouplingAutoRefCountObjectPtr< MEDFileJointCorrespondence> - corr = MEDFileJointCorrespondence::New( cellCorr->getValueArray(), t1, t2 ); + MCAuto< MEDFileJointCorrespondence> + corr = MEDFileJointCorrespondence::New( cellCorr->getValuesArray(), t1, t2 ); j1st->pushCorrespondence( corr ); } } @@ -368,10 +368,10 @@ MEDCoupling::MEDCouplingFieldDouble* MeshCollectionDriver::getField(std::string r1=SelectTagsInVectorOfString(r1,"DT="+IntToStr(DT)); r1=SelectTagsInVectorOfString(r1,"IT="+IntToStr(IT)); //not saved in file? field->setDescription(ExtractFromDescription(r1[0], "fieldDescription=")); - int nbc=StrToInt(ExtractFromDescription(r1[0], "nbComponents=")); + std::size_t nbc=StrToInt(ExtractFromDescription(r1[0], "nbComponents=")); if (nbc==da->getNumberOfComponents()) { - for (int i=0; isetInfoOnComponent(i,ExtractFromDescription(r1[0], "componentInfo"+IntToStr(i)+"=")); } else @@ -380,7 +380,7 @@ MEDCoupling::MEDCouplingFieldDouble* MeshCollectionDriver::getField(std::string } field->setArray(da); field->setTime(time,DT,IT); - field->checkCoherency(); + field->checkConsistencyLight(); } return field; } @@ -424,12 +424,12 @@ MEDCoupling::MEDFileData* MeshCollectionDriver::getMEDFileData() { MEDCoupling::MEDFileData* newdata = MEDCoupling::MEDFileData::New(); - MEDCoupling::MEDCouplingAutoRefCountObjectPtr meshes; - MEDCoupling::MEDCouplingAutoRefCountObjectPtr fields; + MEDCoupling::MCAuto meshes; + MEDCoupling::MCAuto fields; meshes = MEDCoupling::MEDFileMeshes::New(); fields = MEDCoupling::MEDFileFields::New(); - for (size_t i=0; i<_collection->getMesh().size(); i++) + for (unsigned int i=0; i<_collection->getMesh().size(); i++) { MEDCoupling::MEDFileMesh* mfm = getMesh( i ); meshes->pushMesh(mfm);