X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FRENUMBER%2Frenumbering.cxx;h=f3fcec95ee872e831c3fff12df6c905189f736cd;hb=c4551c56aa89896595842e5b41b048044681b4e8;hp=6af7b38be209dc77b98a6f8dbaf00ec38e2ed1be;hpb=e197fcb8cc603df9c360df1798e4fce8ca12366e;p=tools%2Fmedcoupling.git diff --git a/src/RENUMBER/renumbering.cxx b/src/RENUMBER/renumbering.cxx index 6af7b38be..f3fcec95e 100644 --- a/src/RENUMBER/renumbering.cxx +++ b/src/RENUMBER/renumbering.cxx @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2013 CEA/DEN, EDF R&D +// Copyright (C) 2007-2016 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 // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -32,7 +32,7 @@ #include using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; using namespace MED_RENUMBER; int main(int argc, char** argv) @@ -57,7 +57,7 @@ int main(int argc, char** argv) } // Reading file structure cout << "Reading : " << flush; - MEDCouplingAutoRefCountObjectPtr fd(MEDFileData::New(filename_in)); + MCAuto fd(MEDFileData::New(filename_in)); MEDFileMesh *m=fd->getMeshes()->getMeshWithName(meshname); MEDFileUMesh *mc=dynamic_cast(m); if(!mc) @@ -68,12 +68,12 @@ int main(int argc, char** argv) t_read_st=clock(); cout << (t_read_st-t_begin)/(double) CLOCKS_PER_SEC << "s" << endl << flush; // Reading mesh - MEDCouplingAutoRefCountObjectPtr workMesh=mc->getMeshAtLevel(0); + MCAuto workMesh=mc->getMeshAtLevel(0); std::vector code=workMesh->getDistributionOfTypes(); cout << "Building the graph : " << flush; DataArrayInt *neighb=0,*neighbI=0; workMesh->computeNeighborsOfCells(neighb,neighbI); - MEDCouplingAutoRefCountObjectPtr neighbSafe(neighb),neighbISafe(neighbI),ipermSafe,permSafe; + MCAuto neighbSafe(neighb),neighbISafe(neighbI),ipermSafe,permSafe; const int *graph=neighbSafe->begin(); const int *graph_index=neighbISafe->begin(); // Compute permutation iperm->new2old perm->old2new @@ -93,7 +93,7 @@ int main(int argc, char** argv) const DataArrayInt *famField=mc->getFamilyFieldAtLevel(0); if(famField) { - MEDCouplingAutoRefCountObjectPtr famField2=famField->renumber(perm->begin()); + MCAuto famField2=famField->renumber(perm->begin()); mc->setFamilyFieldArr(0,famField2); } mc->write(filename_out,2); @@ -107,13 +107,13 @@ int main(int argc, char** argv) for(int i=0;igetNumberOfFields();i++) { MEDFileFieldMultiTS *fmts=dynamic_cast(fs->getFieldAtPos(i)); - if(!fmts) continue; + if(!fmts) continue; if(fmts->getMeshName()==meshname) { for(int j=0;jgetNumberOfTS();j++) { MEDFileField1TS *f1ts=dynamic_cast(fmts->getTimeStepAtPos(j)); - if(!f1ts) continue; + if(!f1ts) continue; DataArrayDouble *arr=f1ts->getUndergroundDataArray(); arr->renumberInPlace(perm->begin()); }