From: Anthony Geay Date: Tue, 19 Jan 2016 16:39:37 +0000 (+0100) Subject: 3rd step. X-Git-Tag: V8_0_0b1~14 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e8f616a523471bd47f2eb60e6fded7b2b6363639;p=tools%2Fmedcoupling.git 3rd step. --- diff --git a/src/ParaMEDLoader/ParaMEDFileMesh.cxx b/src/ParaMEDLoader/ParaMEDFileMesh.cxx index cf0bba357..947d9f2e0 100644 --- a/src/ParaMEDLoader/ParaMEDFileMesh.cxx +++ b/src/ParaMEDLoader/ParaMEDFileMesh.cxx @@ -24,16 +24,16 @@ #include "MEDFileMeshLL.hxx" #include "MEDLoader.hxx" -using namespace ParaMEDMEM; +using namespace MEDCoupling; MEDFileMesh *ParaMEDFileMesh::New(int iPart, int nbOfParts, const std::string& fileName, const std::string& mName, int dt, int it, MEDFileMeshReadSelector *mrs) { MEDFileUtilities::CheckFileForRead(fileName); - ParaMEDMEM::MEDCouplingMeshType meshType; + MEDCoupling::MEDCouplingMeshType meshType; MEDFileUtilities::AutoFid fid(MEDfileOpen(fileName.c_str(),MED_ACC_RDONLY)); int dummy0,dummy1; std::string dummy2; - ParaMEDMEM::MEDCouplingAxisType dummy3; + MEDCoupling::MEDCouplingAxisType dummy3; MEDFileMeshL2::GetMeshIdFromName(fid,mName,meshType,dummy3,dummy0,dummy1,dummy2); switch(meshType) { @@ -49,11 +49,11 @@ MEDFileMesh *ParaMEDFileMesh::New(int iPart, int nbOfParts, const std::string& f MEDFileMesh *ParaMEDFileMesh::ParaNew(int iPart, int nbOfParts, const MPI_Comm& com, const MPI_Info& nfo, const std::string& fileName, const std::string& mName, int dt, int it, MEDFileMeshReadSelector *mrs) { MEDFileUtilities::CheckFileForRead(fileName); - ParaMEDMEM::MEDCouplingMeshType meshType; + MEDCoupling::MEDCouplingMeshType meshType; MEDFileUtilities::AutoFid fid(MEDfileOpen(fileName.c_str(),MED_ACC_RDONLY)); int dummy0,dummy1; std::string dummy2; - ParaMEDMEM::MEDCouplingAxisType dummy3; + MEDCoupling::MEDCouplingAxisType dummy3; MEDFileMeshL2::GetMeshIdFromName(fid,mName,meshType,dummy3,dummy0,dummy1,dummy2); switch(meshType) { diff --git a/src/ParaMEDLoader/ParaMEDFileMesh.hxx b/src/ParaMEDLoader/ParaMEDFileMesh.hxx index f034c471d..0de583895 100644 --- a/src/ParaMEDLoader/ParaMEDFileMesh.hxx +++ b/src/ParaMEDLoader/ParaMEDFileMesh.hxx @@ -27,7 +27,7 @@ #include -namespace ParaMEDMEM +namespace MEDCoupling { class MEDFileMesh; class MEDFileUMesh; diff --git a/src/ParaMEDLoader/ParaMEDLoader.cxx b/src/ParaMEDLoader/ParaMEDLoader.cxx index 43a4eec9d..c8f205732 100644 --- a/src/ParaMEDLoader/ParaMEDLoader.cxx +++ b/src/ParaMEDLoader/ParaMEDLoader.cxx @@ -26,13 +26,13 @@ #include -using namespace ParaMEDMEM; +using namespace MEDCoupling; ParaMEDLoader::ParaMEDLoader() { } -void ParaMEDLoader::WriteParaMesh(const char *fileName, ParaMEDMEM::ParaMESH *mesh) +void ParaMEDLoader::WriteParaMesh(const char *fileName, MEDCoupling::ParaMESH *mesh) { if(!mesh->getBlockTopology()->getProcGroup()->containsMyRank()) return ; diff --git a/src/ParaMEDLoader/ParaMEDLoader.hxx b/src/ParaMEDLoader/ParaMEDLoader.hxx index 6a49a470d..408074708 100644 --- a/src/ParaMEDLoader/ParaMEDLoader.hxx +++ b/src/ParaMEDLoader/ParaMEDLoader.hxx @@ -24,7 +24,7 @@ #include #include -namespace ParaMEDMEM +namespace MEDCoupling { class ParaMESH; class ParaFIELD; @@ -33,7 +33,7 @@ namespace ParaMEDMEM class ParaMEDLoader { public: - static void WriteParaMesh(const char *fileName, ParaMEDMEM::ParaMESH *mesh); + static void WriteParaMesh(const char *fileName, MEDCoupling::ParaMESH *mesh); static void WriteMasterFile(const char *fileName, const std::vector& fileNames, const char *meshName); private: ParaMEDLoader(); diff --git a/src/ParaMEDMEM/BASICS_JR b/src/ParaMEDMEM/BASICS_JR index 61a724d45..2d3a6fc46 100644 --- a/src/ParaMEDMEM/BASICS_JR +++ b/src/ParaMEDMEM/BASICS_JR @@ -306,7 +306,7 @@ Presentation-ParaMEDMEM : dans MxN_Mapping.hxx . Le choix des options se fait avec le Data Exchange Channel : - + ParaMEDMEM::InterpKernelDEC dec (*source_group,*target_group); + + MEDCoupling::InterpKernelDEC dec (*source_group,*target_group); + dec.setOption("Asynchronous",true); + dec.setOption("TimeInterpolation",LinearTimeInterp); + dec.setOption("AllToAllMethod",PointToPoint); @@ -321,7 +321,7 @@ Presentation-ParaMEDMEM : et TimeInterpolation : methodes Asynchronous et SetTimeInterpolator de MPI_AccessDEC. -. ParaMEDMEM::InterpKernelDEC comporte maintenant une surcharge des +. MEDCoupling::InterpKernelDEC comporte maintenant une surcharge des methodes recvData() et sendData() : + void InterpKernelDEC::recvData( double time ) qui appelle SetTime(time) de MPI_AccessDEC et @@ -331,7 +331,7 @@ Presentation-ParaMEDMEM : SetTime(time,deltatime) de MPI_AccessDEC et sendData() -. recvData() et sendData() de ParaMEDMEM::InterpKernelDEC +. recvData() et sendData() de MEDCoupling::InterpKernelDEC appellent multiply et transposeMultiply de l'InterpolationMatrix qui appellent sendRecv et reverseSendRecv de MxN_Mapping qui appellent comm_interface.allToAllV en mode "Native" diff --git a/src/ParaMEDMEM/BlockTopology.cxx b/src/ParaMEDMEM/BlockTopology.cxx index 7297be21c..c315f4208 100644 --- a/src/ParaMEDMEM/BlockTopology.cxx +++ b/src/ParaMEDMEM/BlockTopology.cxx @@ -33,7 +33,7 @@ using namespace std; -namespace ParaMEDMEM +namespace MEDCoupling { /*! * Default ctor. @@ -86,7 +86,7 @@ namespace ParaMEDMEM } _cycle_type.resize(_dimension); for (int i=0; i<_dimension; i++) - _cycle_type[i]=ParaMEDMEM::Block; + _cycle_type[i]=MEDCoupling::Block; } /*! @@ -163,7 +163,7 @@ namespace ParaMEDMEM _nb_elems+=nbelems_per_proc[i-1]; } _cycle_type.resize(1); - _cycle_type[0]=ParaMEDMEM::Block; + _cycle_type[0]=MEDCoupling::Block; delete[] nbelems_per_proc; } diff --git a/src/ParaMEDMEM/BlockTopology.hxx b/src/ParaMEDMEM/BlockTopology.hxx index 37466731d..3843b05d3 100644 --- a/src/ParaMEDMEM/BlockTopology.hxx +++ b/src/ParaMEDMEM/BlockTopology.hxx @@ -25,7 +25,7 @@ #include -namespace ParaMEDMEM +namespace MEDCoupling { class ComponentTopology; class MEDCouplingCMesh; diff --git a/src/ParaMEDMEM/CommInterface.cxx b/src/ParaMEDMEM/CommInterface.cxx index 54e06e6fc..def8bbf8b 100644 --- a/src/ParaMEDMEM/CommInterface.cxx +++ b/src/ParaMEDMEM/CommInterface.cxx @@ -19,7 +19,7 @@ #include "CommInterface.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { /*! \anchor CommInterface-det \class CommInterface @@ -43,12 +43,12 @@ namespace ParaMEDMEM { //initialization MPI_Init(&argc, &argv); - ParaMEDMEM::CommInterface comm_interface; + MEDCoupling::CommInterface comm_interface; //setting up a processor group with proc 0 set procs; procs.insert(0); - ParaMEDMEM::ProcessorGroup group(procs, comm_interface); + MEDCoupling::ProcessorGroup group(procs, comm_interface); //cleanup MPI_Finalize(); diff --git a/src/ParaMEDMEM/CommInterface.hxx b/src/ParaMEDMEM/CommInterface.hxx index ae430eddd..01d77c899 100644 --- a/src/ParaMEDMEM/CommInterface.hxx +++ b/src/ParaMEDMEM/CommInterface.hxx @@ -21,7 +21,7 @@ #define __COMMINTERFACE_HXX__ #include -namespace ParaMEDMEM +namespace MEDCoupling { class CommInterface diff --git a/src/ParaMEDMEM/ComponentTopology.cxx b/src/ParaMEDMEM/ComponentTopology.cxx index 8af706e59..f66d8dc8e 100644 --- a/src/ParaMEDMEM/ComponentTopology.cxx +++ b/src/ParaMEDMEM/ComponentTopology.cxx @@ -21,7 +21,7 @@ #include "ProcessorGroup.hxx" #include "InterpolationUtils.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { /* Generic constructor for \a nb_comp components equally parted * in \a nb_blocks blocks diff --git a/src/ParaMEDMEM/ComponentTopology.hxx b/src/ParaMEDMEM/ComponentTopology.hxx index 9b84607a3..3fdebe58a 100644 --- a/src/ParaMEDMEM/ComponentTopology.hxx +++ b/src/ParaMEDMEM/ComponentTopology.hxx @@ -24,7 +24,7 @@ #include -namespace ParaMEDMEM +namespace MEDCoupling { class ProcessorGroup; diff --git a/src/ParaMEDMEM/DEC.cxx b/src/ParaMEDMEM/DEC.cxx index cbd0ea45d..975771b05 100644 --- a/src/ParaMEDMEM/DEC.cxx +++ b/src/ParaMEDMEM/DEC.cxx @@ -30,7 +30,7 @@ #include -namespace ParaMEDMEM +namespace MEDCoupling { DEC::DEC():_comm_interface(0) { diff --git a/src/ParaMEDMEM/DEC.hxx b/src/ParaMEDMEM/DEC.hxx index 6df677bbc..31c61f708 100644 --- a/src/ParaMEDMEM/DEC.hxx +++ b/src/ParaMEDMEM/DEC.hxx @@ -24,7 +24,7 @@ #include "NormalizedUnstructuredMesh.hxx" #include "DECOptions.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { class CommInterface; diff --git a/src/ParaMEDMEM/DECOptions.hxx b/src/ParaMEDMEM/DECOptions.hxx index eb9271237..1bfa9d7f0 100644 --- a/src/ParaMEDMEM/DECOptions.hxx +++ b/src/ParaMEDMEM/DECOptions.hxx @@ -22,7 +22,7 @@ #include -namespace ParaMEDMEM +namespace MEDCoupling { //! Enum describing the allToAll method used in the communication pattern typedef enum { Native, PointToPoint } AllToAllMethod; diff --git a/src/ParaMEDMEM/DisjointDEC.cxx b/src/ParaMEDMEM/DisjointDEC.cxx index b2ba8f795..365e8d6aa 100644 --- a/src/ParaMEDMEM/DisjointDEC.cxx +++ b/src/ParaMEDMEM/DisjointDEC.cxx @@ -32,7 +32,7 @@ #include -namespace ParaMEDMEM +namespace MEDCoupling { /*! @@ -43,14 +43,14 @@ namespace ParaMEDMEM * * Abstract interface class representing a link between two * processor groups for exchanging mesh or field data. The two processor groups must - * have a void intersection (\ref ParaMEDMEM::OverlapDEC "OverlapDEC" is to be considered otherwise). + * have a void intersection (\ref MEDCoupling::OverlapDEC "OverlapDEC" is to be considered otherwise). * The %DEC is initialized by attaching a field on the receiving or on the * sending side. * * The data is sent or received through calls to the (abstract) methods recvData() and sendData(). * - * One can attach either a \c ParaMEDMEM::ParaFIELD, or a - * \c ICoCo::Field, or directly a \c ParaMEDMEM::MEDCouplingFieldDouble instance. + * One can attach either a \c MEDCoupling::ParaFIELD, or a + * \c ICoCo::Field, or directly a \c MEDCoupling::MEDCouplingFieldDouble instance. * See the various signatures of the method DisjointDEC::attachLocalField() * * The derivations of this class should be considered for practical instanciation: @@ -60,7 +60,7 @@ namespace ParaMEDMEM * * \section DisjointDEC-options DisjointDEC options * The options supported by %DisjointDEC objects are the same that the ones supported for all - * DECs in general and are all inherited from the class \ref ParaMEDMEM::DECOptions "DECOptions" + * DECs in general and are all inherited from the class \ref MEDCoupling::DECOptions "DECOptions" * */ @@ -124,7 +124,7 @@ namespace ParaMEDMEM _comm_interface(0), _union_comm(MPI_COMM_NULL) { - ParaMEDMEM::CommInterface comm; + MEDCoupling::CommInterface comm; // Create the list of procs including source and target std::set union_ids; // source and target ids in world_comm union_ids.insert(source_ids.begin(),source_ids.end()); diff --git a/src/ParaMEDMEM/DisjointDEC.hxx b/src/ParaMEDMEM/DisjointDEC.hxx index a4073a292..7ab0f95c5 100644 --- a/src/ParaMEDMEM/DisjointDEC.hxx +++ b/src/ParaMEDMEM/DisjointDEC.hxx @@ -32,7 +32,7 @@ namespace ICoCo class MEDField; } -namespace ParaMEDMEM +namespace MEDCoupling { class ProcessorGroup; class ParaFIELD; diff --git a/src/ParaMEDMEM/ElementLocator.cxx b/src/ParaMEDMEM/ElementLocator.cxx index 1374387ee..df7828060 100644 --- a/src/ParaMEDMEM/ElementLocator.cxx +++ b/src/ParaMEDMEM/ElementLocator.cxx @@ -38,7 +38,7 @@ using namespace std; //#define USE_DIRECTED_BB -namespace ParaMEDMEM +namespace MEDCoupling { ElementLocator::ElementLocator(const ParaFIELD& sourceField, const ProcessorGroup& distant_group, diff --git a/src/ParaMEDMEM/ElementLocator.hxx b/src/ParaMEDMEM/ElementLocator.hxx index 4edd27de6..69db75dad 100644 --- a/src/ParaMEDMEM/ElementLocator.hxx +++ b/src/ParaMEDMEM/ElementLocator.hxx @@ -27,7 +27,7 @@ #include #include -namespace ParaMEDMEM +namespace MEDCoupling { class ParaFIELD; class ProcessorGroup; diff --git a/src/ParaMEDMEM/ExplicitCoincidentDEC.cxx b/src/ParaMEDMEM/ExplicitCoincidentDEC.cxx index db0396725..fe2f43018 100644 --- a/src/ParaMEDMEM/ExplicitCoincidentDEC.cxx +++ b/src/ParaMEDMEM/ExplicitCoincidentDEC.cxx @@ -30,7 +30,7 @@ using namespace std; -namespace ParaMEDMEM +namespace MEDCoupling { /*! diff --git a/src/ParaMEDMEM/ExplicitCoincidentDEC.hxx b/src/ParaMEDMEM/ExplicitCoincidentDEC.hxx index 6205e11ef..fd55b6cc8 100644 --- a/src/ParaMEDMEM/ExplicitCoincidentDEC.hxx +++ b/src/ParaMEDMEM/ExplicitCoincidentDEC.hxx @@ -26,7 +26,7 @@ #include -namespace ParaMEDMEM +namespace MEDCoupling { class BlockTopology; diff --git a/src/ParaMEDMEM/ExplicitMapping.cxx b/src/ParaMEDMEM/ExplicitMapping.cxx index f4e754571..77b6ba452 100644 --- a/src/ParaMEDMEM/ExplicitMapping.cxx +++ b/src/ParaMEDMEM/ExplicitMapping.cxx @@ -19,7 +19,7 @@ #include "ExplicitMapping.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { ExplicitMapping::ExplicitMapping(): diff --git a/src/ParaMEDMEM/ExplicitMapping.hxx b/src/ParaMEDMEM/ExplicitMapping.hxx index 3098b706f..db851374a 100644 --- a/src/ParaMEDMEM/ExplicitMapping.hxx +++ b/src/ParaMEDMEM/ExplicitMapping.hxx @@ -24,7 +24,7 @@ #include #include -namespace ParaMEDMEM +namespace MEDCoupling { /*! * Internal class, not part of the public API. diff --git a/src/ParaMEDMEM/ExplicitTopology.cxx b/src/ParaMEDMEM/ExplicitTopology.cxx index 4facf53e0..b873e7569 100644 --- a/src/ParaMEDMEM/ExplicitTopology.cxx +++ b/src/ParaMEDMEM/ExplicitTopology.cxx @@ -30,7 +30,7 @@ #include using namespace std; -namespace ParaMEDMEM +namespace MEDCoupling { ExplicitTopology::ExplicitTopology(): diff --git a/src/ParaMEDMEM/ExplicitTopology.hxx b/src/ParaMEDMEM/ExplicitTopology.hxx index d7d73f9be..be8bf3fd5 100644 --- a/src/ParaMEDMEM/ExplicitTopology.hxx +++ b/src/ParaMEDMEM/ExplicitTopology.hxx @@ -27,7 +27,7 @@ #include #include -namespace ParaMEDMEM +namespace MEDCoupling { class ParaMESH; class Topology; diff --git a/src/ParaMEDMEM/ICoCoMEDField.cxx b/src/ParaMEDMEM/ICoCoMEDField.cxx index 1bf60fc75..1eea0d71d 100644 --- a/src/ParaMEDMEM/ICoCoMEDField.cxx +++ b/src/ParaMEDMEM/ICoCoMEDField.cxx @@ -31,7 +31,7 @@ namespace ICoCo \a field. */ - MEDField::MEDField(ParaMEDMEM::MEDCouplingFieldDouble *field):_field(field) + MEDField::MEDField(MEDCoupling::MEDCouplingFieldDouble *field):_field(field) { if(_field) _field->incrRef(); diff --git a/src/ParaMEDMEM/ICoCoMEDField.hxx b/src/ParaMEDMEM/ICoCoMEDField.hxx index c5dbdbb14..33eca22e4 100644 --- a/src/ParaMEDMEM/ICoCoMEDField.hxx +++ b/src/ParaMEDMEM/ICoCoMEDField.hxx @@ -32,14 +32,14 @@ namespace ICoCo { public: MEDField():_field(0) { } - MEDField(ParaMEDMEM::MEDCouplingFieldDouble* field); + MEDField(MEDCoupling::MEDCouplingFieldDouble* field); MEDField(const MEDField& field); MEDField& operator=(const MEDField& field); virtual ~MEDField(); - ParaMEDMEM::MEDCouplingFieldDouble *getField() const { return _field; } - const ParaMEDMEM::MEDCouplingMesh *getMesh() const { return _field->getMesh(); } + MEDCoupling::MEDCouplingFieldDouble *getField() const { return _field; } + const MEDCoupling::MEDCouplingMesh *getMesh() const { return _field->getMesh(); } private: - ParaMEDMEM::MEDCouplingFieldDouble *_field; + MEDCoupling::MEDCouplingFieldDouble *_field; }; } diff --git a/src/ParaMEDMEM/InterpKernelDEC.cxx b/src/ParaMEDMEM/InterpKernelDEC.cxx index 7f1be4b36..61518d268 100644 --- a/src/ParaMEDMEM/InterpKernelDEC.cxx +++ b/src/ParaMEDMEM/InterpKernelDEC.cxx @@ -30,7 +30,7 @@ #include "InterpKernelDEC.hxx" #include "ElementLocator.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { /*! @@ -53,7 +53,7 @@ namespace ParaMEDMEM The name "InterpKernelDEC" comes from the fact that this class uses exactly the same algorithms as the sequential remapper. Both this class and the sequential - \ref ParaMEDMEM::MEDCouplingRemapper "MEDCouplingRemapper" are built on top of the %INTERP_KERNEL + \ref MEDCoupling::MEDCouplingRemapper "MEDCouplingRemapper" are built on top of the %INTERP_KERNEL algorithms (notably the computation of the intersection volumes). Among the important properties inherited from the parent abstract class \ref DisjointDEC-det "DisjointDEC", @@ -112,7 +112,7 @@ namespace ParaMEDMEM \f] \section InterpKernelDEC-options Options - On top of the usual \ref ParaMEDMEM::DECOptions "DEC options", the options supported by %InterpKernelDEC objects are + On top of the usual \ref MEDCoupling::DECOptions "DEC options", the options supported by %InterpKernelDEC objects are related to the underlying \ref InterpKerIntersectors "intersector class". All the options available in the intersector objects are available for the %InterpKernelDEC object. The various options available for intersectors can diff --git a/src/ParaMEDMEM/InterpKernelDEC.hxx b/src/ParaMEDMEM/InterpKernelDEC.hxx index 54b8819da..bcdb7aeb7 100644 --- a/src/ParaMEDMEM/InterpKernelDEC.hxx +++ b/src/ParaMEDMEM/InterpKernelDEC.hxx @@ -24,7 +24,7 @@ #include "MxN_Mapping.hxx" #include "InterpolationOptions.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { class InterpolationMatrix; diff --git a/src/ParaMEDMEM/InterpolationMatrix.cxx b/src/ParaMEDMEM/InterpolationMatrix.cxx index ea878e8fe..06a51e42d 100644 --- a/src/ParaMEDMEM/InterpolationMatrix.cxx +++ b/src/ParaMEDMEM/InterpolationMatrix.cxx @@ -41,7 +41,7 @@ using namespace std; -namespace ParaMEDMEM +namespace MEDCoupling { /**! @@ -53,7 +53,7 @@ namespace ParaMEDMEM \param target_group processor group containing the distant processors \param method interpolation method */ - InterpolationMatrix::InterpolationMatrix(const ParaMEDMEM::ParaFIELD *source_field, + InterpolationMatrix::InterpolationMatrix(const MEDCoupling::ParaFIELD *source_field, const ProcessorGroup& source_group, const ProcessorGroup& target_group, const DECOptions& dec_options, diff --git a/src/ParaMEDMEM/InterpolationMatrix.hxx b/src/ParaMEDMEM/InterpolationMatrix.hxx index b60c9ee54..368528aa8 100644 --- a/src/ParaMEDMEM/InterpolationMatrix.hxx +++ b/src/ParaMEDMEM/InterpolationMatrix.hxx @@ -25,7 +25,7 @@ #include "InterpolationOptions.hxx" #include "DECOptions.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { class ElementLocator; @@ -42,7 +42,7 @@ namespace ParaMEDMEM { public: - InterpolationMatrix(const ParaMEDMEM::ParaFIELD *source_field, + InterpolationMatrix(const MEDCoupling::ParaFIELD *source_field, const ProcessorGroup& source_group, const ProcessorGroup& target_group, const DECOptions& dec_opt, @@ -93,7 +93,7 @@ namespace ParaMEDMEM private: bool isSurfaceComputationNeeded(const std::string& method) const; private: - const ParaMEDMEM::ParaFIELD *_source_field; + const MEDCoupling::ParaFIELD *_source_field; std::vector _row_offsets; std::map, int > _col_offsets; MEDCouplingPointSet *_source_support; diff --git a/src/ParaMEDMEM/LinearTimeInterpolator.cxx b/src/ParaMEDMEM/LinearTimeInterpolator.cxx index 79524983e..df4220570 100644 --- a/src/ParaMEDMEM/LinearTimeInterpolator.cxx +++ b/src/ParaMEDMEM/LinearTimeInterpolator.cxx @@ -21,7 +21,7 @@ using namespace std; -namespace ParaMEDMEM +namespace MEDCoupling { LinearTimeInterpolator::LinearTimeInterpolator( double InterpPrecision, int nStepBefore, diff --git a/src/ParaMEDMEM/LinearTimeInterpolator.hxx b/src/ParaMEDMEM/LinearTimeInterpolator.hxx index 76eca3fc7..9a08a647e 100644 --- a/src/ParaMEDMEM/LinearTimeInterpolator.hxx +++ b/src/ParaMEDMEM/LinearTimeInterpolator.hxx @@ -25,7 +25,7 @@ #include #include -namespace ParaMEDMEM +namespace MEDCoupling { class DEC; diff --git a/src/ParaMEDMEM/MPIAccess.cxx b/src/ParaMEDMEM/MPIAccess.cxx index b7fe80393..cbcf5c335 100644 --- a/src/ParaMEDMEM/MPIAccess.cxx +++ b/src/ParaMEDMEM/MPIAccess.cxx @@ -24,7 +24,7 @@ using namespace std; -namespace ParaMEDMEM +namespace MEDCoupling { /**! \anchor MPIAccess-det @@ -49,14 +49,14 @@ namespace ParaMEDMEM { //initialization MPI_Init(&argc, &argv); - ParaMEDMEM::CommInterface comm_interface; + MEDCoupling::CommInterface comm_interface; //setting up a processor group with proc 0 set procs; procs.insert(0); - ParaMEDMEM::ProcessorGroup group(procs, comm_interface); + MEDCoupling::ProcessorGroup group(procs, comm_interface); - ParaMEDMEM::MPIAccess mpi_access(group); + MEDCoupling::MPIAccess mpi_access(group); //cleanup MPI_Finalize(); @@ -788,7 +788,7 @@ namespace ParaMEDMEM source = aMPIStatus.MPI_SOURCE ; MPITag = aMPIStatus.MPI_TAG ; int MethodId = (MPITag % MODULO_TAG) ; - myDatatype = datatype( (ParaMEDMEM::_MessageIdent) MethodId ) ; + myDatatype = datatype( (MEDCoupling::_MessageIdent) MethodId ) ; _comm_interface.getCount(&aMPIStatus, myDatatype, &outcount ) ; if ( _trace ) cout << "MPIAccess::Probe" << _my_rank << " FromSource " << FromSource @@ -822,7 +822,7 @@ namespace ParaMEDMEM source = aMPIStatus.MPI_SOURCE ; MPITag = aMPIStatus.MPI_TAG ; int MethodId = (MPITag % MODULO_TAG) ; - myDataType = datatype( (ParaMEDMEM::_MessageIdent) MethodId ) ; + myDataType = datatype( (MEDCoupling::_MessageIdent) MethodId ) ; _comm_interface.getCount(&aMPIStatus, myDataType, &outcount ) ; if ( _trace ) cout << "MPIAccess::IProbe" << _my_rank << " FromSource " << FromSource diff --git a/src/ParaMEDMEM/MPIAccess.hxx b/src/ParaMEDMEM/MPIAccess.hxx index d438c8cec..039925d80 100644 --- a/src/ParaMEDMEM/MPIAccess.hxx +++ b/src/ParaMEDMEM/MPIAccess.hxx @@ -29,7 +29,7 @@ #include #include -namespace ParaMEDMEM +namespace MEDCoupling { typedef struct { diff --git a/src/ParaMEDMEM/MPIAccessDEC.cxx b/src/ParaMEDMEM/MPIAccessDEC.cxx index 18184dc27..f88fc22a0 100644 --- a/src/ParaMEDMEM/MPIAccessDEC.cxx +++ b/src/ParaMEDMEM/MPIAccessDEC.cxx @@ -23,7 +23,7 @@ using namespace std; -namespace ParaMEDMEM +namespace MEDCoupling { /*! @@ -52,7 +52,7 @@ namespace ParaMEDMEM procs.insert(i) ; } MPIProcessorGroup *mpilg = static_cast(const_cast(&source_group)); - _MPI_union_group = new ParaMEDMEM::MPIProcessorGroup( union_group->getCommInterface(),procs,mpilg->getWorldComm()); + _MPI_union_group = new MEDCoupling::MPIProcessorGroup( union_group->getCommInterface(),procs,mpilg->getWorldComm()); delete union_group ; _my_rank = _MPI_union_group->myRank() ; _group_size = _MPI_union_group->size() ; diff --git a/src/ParaMEDMEM/MPIAccessDEC.hxx b/src/ParaMEDMEM/MPIAccessDEC.hxx index aba86958f..0ec7647e3 100644 --- a/src/ParaMEDMEM/MPIAccessDEC.hxx +++ b/src/ParaMEDMEM/MPIAccessDEC.hxx @@ -27,7 +27,7 @@ #include #include -namespace ParaMEDMEM +namespace MEDCoupling { /* * Internal class, not part of the public API. diff --git a/src/ParaMEDMEM/MPIProcessorGroup.cxx b/src/ParaMEDMEM/MPIProcessorGroup.cxx index 0114877b4..80dffe0f3 100644 --- a/src/ParaMEDMEM/MPIProcessorGroup.cxx +++ b/src/ParaMEDMEM/MPIProcessorGroup.cxx @@ -30,7 +30,7 @@ using namespace std; -namespace ParaMEDMEM +namespace MEDCoupling { /*! \anchor MPIProcessorGroup-det diff --git a/src/ParaMEDMEM/MPIProcessorGroup.hxx b/src/ParaMEDMEM/MPIProcessorGroup.hxx index b51a7adea..db46a2b85 100644 --- a/src/ParaMEDMEM/MPIProcessorGroup.hxx +++ b/src/ParaMEDMEM/MPIProcessorGroup.hxx @@ -25,7 +25,7 @@ #include #include -namespace ParaMEDMEM +namespace MEDCoupling { class CommInterface; diff --git a/src/ParaMEDMEM/MxN_Mapping.cxx b/src/ParaMEDMEM/MxN_Mapping.cxx index a6a0bcba3..5c3f8d0bb 100644 --- a/src/ParaMEDMEM/MxN_Mapping.cxx +++ b/src/ParaMEDMEM/MxN_Mapping.cxx @@ -25,7 +25,7 @@ using namespace std; -namespace ParaMEDMEM +namespace MEDCoupling { MxN_Mapping::MxN_Mapping(const ProcessorGroup& source_group, const ProcessorGroup& target_group,const DECOptions& dec_options) diff --git a/src/ParaMEDMEM/MxN_Mapping.hxx b/src/ParaMEDMEM/MxN_Mapping.hxx index cd613a8eb..6a5e8befb 100644 --- a/src/ParaMEDMEM/MxN_Mapping.hxx +++ b/src/ParaMEDMEM/MxN_Mapping.hxx @@ -26,7 +26,7 @@ #include -namespace ParaMEDMEM +namespace MEDCoupling { class ProcessorGroup; diff --git a/src/ParaMEDMEM/NonCoincidentDEC.cxx b/src/ParaMEDMEM/NonCoincidentDEC.cxx index 95b9d6acd..9d3ad0c98 100644 --- a/src/ParaMEDMEM/NonCoincidentDEC.cxx +++ b/src/ParaMEDMEM/NonCoincidentDEC.cxx @@ -34,7 +34,7 @@ extern "C" { #include } -namespace ParaMEDMEM +namespace MEDCoupling { /*! @@ -286,7 +286,7 @@ namespace ParaMEDMEM if (_source_group->containsMyRank()) { MEDMEM::MESH* mesh = _local_field->getField()->getSupport()->getMesh(); - fvm_nodal_t* source_nodal = ParaMEDMEM::medmemMeshToFVMMesh(mesh); + fvm_nodal_t* source_nodal = MEDCoupling::medmemMeshToFVMMesh(mesh); int target_size = _target_group->size() ; int start_rank= _source_group->size(); @@ -314,7 +314,7 @@ namespace ParaMEDMEM { MEDMEM::MESH* mesh = _local_field->getField()->getSupport()->getMesh(); - fvm_nodal_t* target_nodal = ParaMEDMEM::medmemMeshToFVMMesh(mesh); + fvm_nodal_t* target_nodal = MEDCoupling::medmemMeshToFVMMesh(mesh); int source_size = _source_group->size(); int start_rank= 0 ; const MPI_Comm* comm = (dynamic_cast (_union_group))->getComm(); diff --git a/src/ParaMEDMEM/NonCoincidentDEC.hxx b/src/ParaMEDMEM/NonCoincidentDEC.hxx index 6691336b7..3db4c455a 100644 --- a/src/ParaMEDMEM/NonCoincidentDEC.hxx +++ b/src/ParaMEDMEM/NonCoincidentDEC.hxx @@ -26,7 +26,7 @@ struct _fvm_locator_t; typedef enum {NN} InterpolationMethod; -namespace ParaMEDMEM +namespace MEDCoupling { class NonCoincidentDEC : public DEC { diff --git a/src/ParaMEDMEM/OverlapDEC.cxx b/src/ParaMEDMEM/OverlapDEC.cxx index af842fb9d..47f2c6d21 100644 --- a/src/ParaMEDMEM/OverlapDEC.cxx +++ b/src/ParaMEDMEM/OverlapDEC.cxx @@ -26,7 +26,7 @@ #include "OverlapElementLocator.hxx" #include "OverlapInterpolationMatrix.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { /*! \anchor OverlapDEC-det @@ -71,7 +71,7 @@ namespace ParaMEDMEM Here the pair (0,2) does not appear because the bounding box of fieldtemplateA of proc#2 does not intersect that of fieldtemplate B on proc#0. - Stage performed by ParaMEDMEM::OverlapElementLocator::computeBoundingBoxes. + Stage performed by MEDCoupling::OverlapElementLocator::computeBoundingBoxes. \subsection ParaMEDMEMOverlapDECAlgoStep2 Step 2 : Computation of local TODO list @@ -156,7 +156,7 @@ namespace ParaMEDMEM keep track of the ids sent to proc \#m for te matrix-vector computation. This is incarnated by OverlapMapping::keepTracksOfSourceIds in proc k. - This step is performed in ParaMEDMEM::OverlapElementLocator::exchangeMeshes method. + This step is performed in MEDCoupling::OverlapElementLocator::exchangeMeshes method. \subsection ParaMEDMEMOverlapDECAlgoStep4 Step 4 : Computation of the interpolation matrix @@ -166,7 +166,7 @@ namespace ParaMEDMEM the \b local TODO list per proc is expected to be as well balanced as possible. - The interpolation is performed as the \ref ParaMEDMEM::MEDCouplingRemapper "remapper" does. + The interpolation is performed as the \ref MEDCoupling::MEDCouplingRemapper "remapper" does. This operation is performed by OverlapInterpolationMatrix::addContribution method. @@ -184,7 +184,7 @@ namespace ParaMEDMEM is equal to k. After this step, the matrix repartition is the following after a call to - ParaMEDMEM::OverlapMapping::prepare : + MEDCoupling::OverlapMapping::prepare : - proc\#0 : (0,0),(1,0),(2,0) - proc\#1 : (0,1),(2,1) @@ -194,19 +194,19 @@ namespace ParaMEDMEM "prepare". This is an example of item 0 in \ref ParaMEDMEMOverlapDECAlgoStep2 "Step2". Tuple (0,1) computed on proc 1 is stored in proc 1 too. This is an example of item 1 in \ref ParaMEDMEMOverlapDECAlgoStep2 "Step2". - In the end ParaMEDMEM::OverlapMapping::_proc_ids_to_send_vector_st will contain : + In the end MEDCoupling::OverlapMapping::_proc_ids_to_send_vector_st will contain : - Proc\#0 : 0,1 - Proc\#1 : 0,2 - Proc\#2 : 0,1,2 - In the end ParaMEDMEM::OverlapMapping::_proc_ids_to_recv_vector_st will contain : + In the end MEDCoupling::OverlapMapping::_proc_ids_to_recv_vector_st will contain : - Proc\#0 : 0,1,2 - Proc\#1 : 0,2 - Proc\#2 : 1,2 - The method in charge to perform this is : ParaMEDMEM::OverlapMapping::prepare. + The method in charge to perform this is : MEDCoupling::OverlapMapping::prepare. */ OverlapDEC::OverlapDEC(const std::set& procIds, const MPI_Comm& world_comm): _load_balancing_algo(1), @@ -216,7 +216,7 @@ namespace ParaMEDMEM _default_field_value(0.0), _comm(MPI_COMM_NULL) { - ParaMEDMEM::CommInterface comm; + MEDCoupling::CommInterface comm; int *ranks_world=new int[procIds.size()]; // ranks of sources and targets in world_comm std::copy(procIds.begin(),procIds.end(),ranks_world); MPI_Group group,world_group; @@ -249,7 +249,7 @@ namespace ParaMEDMEM delete _locator; if (_comm != MPI_COMM_NULL) { - ParaMEDMEM::CommInterface comm; + MEDCoupling::CommInterface comm; comm.commFree(&_comm); } } diff --git a/src/ParaMEDMEM/OverlapDEC.hxx b/src/ParaMEDMEM/OverlapDEC.hxx index 2d63789b7..a2d4591ca 100644 --- a/src/ParaMEDMEM/OverlapDEC.hxx +++ b/src/ParaMEDMEM/OverlapDEC.hxx @@ -27,7 +27,7 @@ #include #include -namespace ParaMEDMEM +namespace MEDCoupling { class OverlapInterpolationMatrix; class OverlapElementLocator; diff --git a/src/ParaMEDMEM/OverlapElementLocator.cxx b/src/ParaMEDMEM/OverlapElementLocator.cxx index 81cb987db..95ffee449 100644 --- a/src/ParaMEDMEM/OverlapElementLocator.cxx +++ b/src/ParaMEDMEM/OverlapElementLocator.cxx @@ -37,7 +37,7 @@ using namespace std; -namespace ParaMEDMEM +namespace MEDCoupling { const int OverlapElementLocator::START_TAG_MESH_XCH = 1140; diff --git a/src/ParaMEDMEM/OverlapElementLocator.hxx b/src/ParaMEDMEM/OverlapElementLocator.hxx index 3ffd028db..9cc75a4c1 100644 --- a/src/ParaMEDMEM/OverlapElementLocator.hxx +++ b/src/ParaMEDMEM/OverlapElementLocator.hxx @@ -34,7 +34,7 @@ //#define DEC_DEBUG -namespace ParaMEDMEM +namespace MEDCoupling { class ParaFIELD; class ProcessorGroup; diff --git a/src/ParaMEDMEM/OverlapInterpolationMatrix.cxx b/src/ParaMEDMEM/OverlapInterpolationMatrix.cxx index 9be3646f2..842ba5f96 100644 --- a/src/ParaMEDMEM/OverlapInterpolationMatrix.cxx +++ b/src/ParaMEDMEM/OverlapInterpolationMatrix.cxx @@ -42,7 +42,7 @@ using namespace std; -namespace ParaMEDMEM +namespace MEDCoupling { OverlapInterpolationMatrix::OverlapInterpolationMatrix(ParaFIELD *source_field, ParaFIELD *target_field, diff --git a/src/ParaMEDMEM/OverlapInterpolationMatrix.hxx b/src/ParaMEDMEM/OverlapInterpolationMatrix.hxx index d652ad024..a059faab8 100644 --- a/src/ParaMEDMEM/OverlapInterpolationMatrix.hxx +++ b/src/ParaMEDMEM/OverlapInterpolationMatrix.hxx @@ -26,7 +26,7 @@ #include "InterpolationOptions.hxx" #include "DECOptions.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { class ParaFIELD; class MEDCouplingPointSet; diff --git a/src/ParaMEDMEM/OverlapMapping.cxx b/src/ParaMEDMEM/OverlapMapping.cxx index f66dee02c..c0c966399 100644 --- a/src/ParaMEDMEM/OverlapMapping.cxx +++ b/src/ParaMEDMEM/OverlapMapping.cxx @@ -29,7 +29,7 @@ #include #include -using namespace ParaMEDMEM; +using namespace MEDCoupling; OverlapMapping::OverlapMapping(const ProcessorGroup& group, const OverlapElementLocator & loc): _group(group),_locator(loc) diff --git a/src/ParaMEDMEM/OverlapMapping.hxx b/src/ParaMEDMEM/OverlapMapping.hxx index ab9cb3139..70826f843 100644 --- a/src/ParaMEDMEM/OverlapMapping.hxx +++ b/src/ParaMEDMEM/OverlapMapping.hxx @@ -28,7 +28,7 @@ #include //#define DEC_DEBUG -namespace ParaMEDMEM +namespace MEDCoupling { class ProcessorGroup; class DataArrayInt; diff --git a/src/ParaMEDMEM/ParaFIELD.cxx b/src/ParaMEDMEM/ParaFIELD.cxx index e8e31e4ee..776986ccd 100644 --- a/src/ParaMEDMEM/ParaFIELD.cxx +++ b/src/ParaMEDMEM/ParaFIELD.cxx @@ -32,7 +32,7 @@ #include -namespace ParaMEDMEM +namespace MEDCoupling { /*! \anchor ParaFIELD-det diff --git a/src/ParaMEDMEM/ParaFIELD.hxx b/src/ParaMEDMEM/ParaFIELD.hxx index fe0a6f9d7..2d2766064 100644 --- a/src/ParaMEDMEM/ParaFIELD.hxx +++ b/src/ParaMEDMEM/ParaFIELD.hxx @@ -23,7 +23,7 @@ #include "MEDCouplingRefCountObject.hxx" #include "ComponentTopology.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { class DataArrayInt; class ParaMESH; @@ -39,8 +39,8 @@ namespace ParaMEDMEM ParaFIELD(MEDCouplingFieldDouble* field, ParaMESH *sup, const ProcessorGroup& group); virtual ~ParaFIELD(); - void synchronizeTarget( ParaMEDMEM::ParaFIELD* source_field); - void synchronizeSource( ParaMEDMEM::ParaFIELD* target_field); + void synchronizeTarget( MEDCoupling::ParaFIELD* source_field); + void synchronizeSource( MEDCoupling::ParaFIELD* target_field); MEDCouplingFieldDouble* getField() const { return _field; } void setOwnSupport(bool v) const { _own_support=v; } DataArrayInt* returnCumulativeGlobalNumbering() const; @@ -53,7 +53,7 @@ namespace ParaMEDMEM private: MEDCouplingFieldDouble* _field; - ParaMEDMEM::ComponentTopology _component_topology; + MEDCoupling::ComponentTopology _component_topology; Topology* _topology; mutable bool _own_support; ParaMESH* _support; diff --git a/src/ParaMEDMEM/ParaGRID.cxx b/src/ParaMEDMEM/ParaGRID.cxx index 8b26bd5f9..b873bfd7e 100644 --- a/src/ParaMEDMEM/ParaGRID.cxx +++ b/src/ParaMEDMEM/ParaGRID.cxx @@ -28,7 +28,7 @@ using namespace std; -namespace ParaMEDMEM +namespace MEDCoupling { ParaGRID::ParaGRID(MEDCouplingCMesh* global_grid, Topology* topology) throw(INTERP_KERNEL::Exception) : diff --git a/src/ParaMEDMEM/ParaGRID.hxx b/src/ParaMEDMEM/ParaGRID.hxx index 72a0109ec..ddf4dd78c 100644 --- a/src/ParaMEDMEM/ParaGRID.hxx +++ b/src/ParaMEDMEM/ParaGRID.hxx @@ -24,7 +24,7 @@ #include -namespace ParaMEDMEM +namespace MEDCoupling { class Topology; class BlockTopology; @@ -44,7 +44,7 @@ namespace ParaMEDMEM private: MEDCouplingCMesh* _grid; // structured grid topology - ParaMEDMEM::BlockTopology* _block_topology; + MEDCoupling::BlockTopology* _block_topology; // stores the x,y,z axes on the global grid std::vector > _global_axis; //id of the local grid diff --git a/src/ParaMEDMEM/ParaMESH.cxx b/src/ParaMEDMEM/ParaMESH.cxx index 70b1ffff7..5904ed9ad 100644 --- a/src/ParaMEDMEM/ParaMESH.cxx +++ b/src/ParaMEDMEM/ParaMESH.cxx @@ -30,7 +30,7 @@ //inclusion for the namespaces using namespace std; -namespace ParaMEDMEM +namespace MEDCoupling { ParaMESH::ParaMESH( MEDCouplingPointSet *subdomain_mesh, MEDCouplingPointSet *subdomain_face, DataArrayInt *CorrespElt_local2global, DataArrayInt *CorrespFace_local2global, diff --git a/src/ParaMEDMEM/ParaMESH.hxx b/src/ParaMEDMEM/ParaMESH.hxx index 06c6d754a..420494e64 100644 --- a/src/ParaMEDMEM/ParaMESH.hxx +++ b/src/ParaMEDMEM/ParaMESH.hxx @@ -27,7 +27,7 @@ #include #include -namespace ParaMEDMEM +namespace MEDCoupling { class Topology; class BlockTopology; @@ -81,7 +81,7 @@ namespace ParaMEDMEM int _my_domain_id; //global topology of the cells - ParaMEDMEM::BlockTopology* _block_topology; + MEDCoupling::BlockTopology* _block_topology; Topology* _explicit_topology; // pointers to global numberings DataArrayInt* _node_global; diff --git a/src/ParaMEDMEM/ProcessorGroup.cxx b/src/ParaMEDMEM/ProcessorGroup.cxx index 011695016..33f962d55 100644 --- a/src/ParaMEDMEM/ProcessorGroup.cxx +++ b/src/ParaMEDMEM/ProcessorGroup.cxx @@ -20,7 +20,7 @@ #include "ProcessorGroup.hxx" #include "InterpolationUtils.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { ProcessorGroup::ProcessorGroup (const CommInterface& interface, int start, int end):_comm_interface(interface) { diff --git a/src/ParaMEDMEM/ProcessorGroup.hxx b/src/ParaMEDMEM/ProcessorGroup.hxx index 972219b9e..74767634b 100644 --- a/src/ParaMEDMEM/ProcessorGroup.hxx +++ b/src/ParaMEDMEM/ProcessorGroup.hxx @@ -24,7 +24,7 @@ #include -namespace ParaMEDMEM +namespace MEDCoupling { /*! * Abstract class defining a group of processors (computation nodes) in a parallel run of a code. diff --git a/src/ParaMEDMEM/StructuredCoincidentDEC.cxx b/src/ParaMEDMEM/StructuredCoincidentDEC.cxx index 9620ba135..5f12d1c44 100644 --- a/src/ParaMEDMEM/StructuredCoincidentDEC.cxx +++ b/src/ParaMEDMEM/StructuredCoincidentDEC.cxx @@ -31,7 +31,7 @@ using namespace std; -namespace ParaMEDMEM +namespace MEDCoupling { /*! diff --git a/src/ParaMEDMEM/StructuredCoincidentDEC.hxx b/src/ParaMEDMEM/StructuredCoincidentDEC.hxx index 1653467b1..174e3dcf3 100644 --- a/src/ParaMEDMEM/StructuredCoincidentDEC.hxx +++ b/src/ParaMEDMEM/StructuredCoincidentDEC.hxx @@ -24,7 +24,7 @@ #include "BlockTopology.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { class DEC; class BlockTopology; diff --git a/src/ParaMEDMEM/TimeInterpolator.cxx b/src/ParaMEDMEM/TimeInterpolator.cxx index 86c3bfb74..d9c7ebc7c 100644 --- a/src/ParaMEDMEM/TimeInterpolator.cxx +++ b/src/ParaMEDMEM/TimeInterpolator.cxx @@ -19,7 +19,7 @@ #include "TimeInterpolator.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { TimeInterpolator::TimeInterpolator( double InterpPrecision, int nStepBefore, int nStepAfter ) { diff --git a/src/ParaMEDMEM/TimeInterpolator.hxx b/src/ParaMEDMEM/TimeInterpolator.hxx index e284acc8e..65aebb885 100644 --- a/src/ParaMEDMEM/TimeInterpolator.hxx +++ b/src/ParaMEDMEM/TimeInterpolator.hxx @@ -25,7 +25,7 @@ #include #include -namespace ParaMEDMEM +namespace MEDCoupling { /*! diff --git a/src/ParaMEDMEM/Topology.cxx b/src/ParaMEDMEM/Topology.cxx index 49a7fc20d..8af5d66a6 100644 --- a/src/ParaMEDMEM/Topology.cxx +++ b/src/ParaMEDMEM/Topology.cxx @@ -19,7 +19,7 @@ #include "Topology.hxx" -namespace ParaMEDMEM +namespace MEDCoupling { Topology::Topology() { diff --git a/src/ParaMEDMEM/Topology.hxx b/src/ParaMEDMEM/Topology.hxx index 19ce03458..c5143e090 100644 --- a/src/ParaMEDMEM/Topology.hxx +++ b/src/ParaMEDMEM/Topology.hxx @@ -20,7 +20,7 @@ #ifndef __TOPOLOGY_HXX__ #define __TOPOLOGY_HXX__ -namespace ParaMEDMEM +namespace MEDCoupling { class ProcessorGroup; diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTestMPI2_1.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTestMPI2_1.cxx index e56972116..50cbc3eb2 100644 --- a/src/ParaMEDMEMTest/ParaMEDMEMTestMPI2_1.cxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTestMPI2_1.cxx @@ -41,7 +41,7 @@ public: void testBasicMPI2_1(); }; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPI2ParaMEDMEMTest::testBasicMPI2_1() { @@ -49,11 +49,11 @@ void MPI2ParaMEDMEMTest::testBasicMPI2_1() MPI_Comm gcom; std::string service = "SERVICE"; std::ostringstream meshfilename, meshname; - ParaMEDMEM::ParaMESH *paramesh=0; - ParaMEDMEM::MEDCouplingUMesh *mesh; - ParaMEDMEM::ParaFIELD *parafield=0; - ParaMEDMEM::CommInterface *interface; - ParaMEDMEM::MPIProcessorGroup *source, *target; + MEDCoupling::ParaMESH *paramesh=0; + MEDCoupling::MEDCouplingUMesh *mesh; + MEDCoupling::ParaFIELD *parafield=0; + MEDCoupling::CommInterface *interface; + MEDCoupling::MPIProcessorGroup *source, *target; MPI_Comm_size( MPI_COMM_WORLD, &lsize ); MPI_Comm_rank( MPI_COMM_WORLD, &lrank ); @@ -73,9 +73,9 @@ void MPI2ParaMEDMEMTest::testBasicMPI2_1() CPPUNIT_ASSERT(false); return; } - interface = new ParaMEDMEM::CommInterface; - source = new ParaMEDMEM::MPIProcessorGroup(*interface,0,lsize-1,gcom); - target = new ParaMEDMEM::MPIProcessorGroup(*interface,lsize,gsize-1,gcom); + interface = new MEDCoupling::CommInterface; + source = new MEDCoupling::MPIProcessorGroup(*interface,0,lsize-1,gcom); + target = new MEDCoupling::MPIProcessorGroup(*interface,lsize,gsize-1,gcom); const double sourceCoordsAll[2][8]={{0.4,0.5,0.4,1.5,1.6,1.5,1.6,0.5}, {0.3,-0.5,1.6,-0.5,1.6,-1.5,0.3,-1.5}}; @@ -94,12 +94,12 @@ void MPI2ParaMEDMEMTest::testBasicMPI2_1() mesh->setCoords(myCoords); myCoords->decrRef(); paramesh=new ParaMESH(mesh,*source,"source mesh"); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); double *value=parafield->getField()->getArray()->getPointer(); value[0]=34+13*((double)grank); - ParaMEDMEM::InterpKernelDEC dec(*source,*target); + MEDCoupling::InterpKernelDEC dec(*source,*target); parafield->getField()->setNature(ConservativeVolumic); diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTestMPI2_2.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTestMPI2_2.cxx index 102443ef0..21f7ff932 100644 --- a/src/ParaMEDMEMTest/ParaMEDMEMTestMPI2_2.cxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTestMPI2_2.cxx @@ -41,7 +41,7 @@ public: void testBasicMPI2_1(); }; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPI2ParaMEDMEMTest::testBasicMPI2_1() { @@ -49,11 +49,11 @@ void MPI2ParaMEDMEMTest::testBasicMPI2_1() MPI_Comm gcom; std::string service = "SERVICE"; std::ostringstream meshfilename, meshname; - ParaMEDMEM::ParaMESH *paramesh=0; - ParaMEDMEM::MEDCouplingUMesh* mesh; - ParaMEDMEM::ParaFIELD *parafield=0; - ParaMEDMEM::CommInterface* interface; - ParaMEDMEM::MPIProcessorGroup* source, *target; + MEDCoupling::ParaMESH *paramesh=0; + MEDCoupling::MEDCouplingUMesh* mesh; + MEDCoupling::ParaFIELD *parafield=0; + MEDCoupling::CommInterface* interface; + MEDCoupling::MPIProcessorGroup* source, *target; MPI_Comm_size( MPI_COMM_WORLD, &lsize ); MPI_Comm_rank( MPI_COMM_WORLD, &lrank ); @@ -75,9 +75,9 @@ void MPI2ParaMEDMEMTest::testBasicMPI2_1() return; } - interface = new ParaMEDMEM::CommInterface; - source = new ParaMEDMEM::MPIProcessorGroup(*interface,0,gsize-lsize-1,gcom); - target = new ParaMEDMEM::MPIProcessorGroup(*interface,gsize-lsize,gsize-1,gcom); + interface = new MEDCoupling::CommInterface; + source = new MEDCoupling::MPIProcessorGroup(*interface,0,gsize-lsize-1,gcom); + target = new MEDCoupling::MPIProcessorGroup(*interface,gsize-lsize,gsize-1,gcom); const double targetCoordsAll[3][16]={{0.7,1.45,0.7,1.65,0.9,1.65,0.9,1.45, 1.1,1.4,1.1,1.6,1.3,1.6,1.3,1.4}, {0.7,-0.6,0.7,0.7,0.9,0.7,0.9,-0.6, 1.1,-0.7,1.1,0.6,1.3,0.6,1.3,-0.7}, @@ -98,10 +98,10 @@ void MPI2ParaMEDMEMTest::testBasicMPI2_1() mesh->setCoords(myCoords); myCoords->decrRef(); paramesh=new ParaMESH (mesh,*target,"target mesh"); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); - ParaMEDMEM::InterpKernelDEC dec(*source,*target); + MEDCoupling::InterpKernelDEC dec(*source,*target); parafield->getField()->setNature(ConservativeVolumic); dec.setMethod("P0"); diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_BlockTopology.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_BlockTopology.cxx index dc129ccf1..9241b6c04 100644 --- a/src/ParaMEDMEMTest/ParaMEDMEMTest_BlockTopology.cxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_BlockTopology.cxx @@ -37,7 +37,7 @@ using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; /* * Check methods defined in BlockTopology.hxx diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_FabienAPI.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_FabienAPI.cxx index 341ed7c4e..5b5bbaebb 100644 --- a/src/ParaMEDMEMTest/ParaMEDMEMTest_FabienAPI.cxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_FabienAPI.cxx @@ -29,7 +29,7 @@ #include -using namespace ParaMEDMEM; +using namespace MEDCoupling; void ParaMEDMEMTest::testFabienAPI1() { @@ -45,17 +45,17 @@ void ParaMEDMEMTest::testFabienAPI1() int procs_target_c[1]={1}; std::set procs_target(procs_target_c,procs_target_c+1); // - ParaMEDMEM::MEDCouplingUMesh *mesh=0; - ParaMEDMEM::ParaMESH *paramesh=0; - ParaMEDMEM::ParaFIELD *parafield=0; + MEDCoupling::MEDCouplingUMesh *mesh=0; + MEDCoupling::ParaMESH *paramesh=0; + MEDCoupling::ParaFIELD *parafield=0; // - ParaMEDMEM::CommInterface interface; + MEDCoupling::CommInterface interface; // MPI_Barrier(MPI_COMM_WORLD); double targetCoords[8]={ 0.,0., 1., 0., 0., 1., 1., 1. }; CommInterface comm; // - ParaMEDMEM::InterpKernelDEC *dec=new ParaMEDMEM::InterpKernelDEC(procs_source,procs_target); + MEDCoupling::InterpKernelDEC *dec=new MEDCoupling::InterpKernelDEC(procs_source,procs_target); if(dec->isInSourceSide()) { mesh=MEDCouplingUMesh::New(); @@ -69,7 +69,7 @@ void ParaMEDMEMTest::testFabienAPI1() mesh->allocateCells(1); mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn); mesh->finishInsertingCells(); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; paramesh=new ParaMESH(mesh,*dec->getSourceGrp(),"source mesh"); parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); parafield->getField()->setNature(ConservativeVolumic); @@ -90,7 +90,7 @@ void ParaMEDMEMTest::testFabienAPI1() mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn); mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+3); mesh->finishInsertingCells(); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; paramesh=new ParaMESH(mesh,*dec->getTargetGrp(),"target mesh"); parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); parafield->getField()->setNature(ConservativeVolumic); @@ -130,17 +130,17 @@ void ParaMEDMEMTest::testFabienAPI2() int procs_target_c[1]={1}; std::set procs_target(procs_target_c,procs_target_c+1); // - ParaMEDMEM::MEDCouplingUMesh *mesh=0; - ParaMEDMEM::ParaMESH *paramesh=0; - ParaMEDMEM::ParaFIELD *parafield=0; + MEDCoupling::MEDCouplingUMesh *mesh=0; + MEDCoupling::ParaMESH *paramesh=0; + MEDCoupling::ParaFIELD *parafield=0; // - ParaMEDMEM::CommInterface interface; + MEDCoupling::CommInterface interface; // MPI_Barrier(MPI_COMM_WORLD); double targetCoords[8]={ 0.,0., 1., 0., 0., 1., 1., 1. }; CommInterface comm; // - ParaMEDMEM::InterpKernelDEC *dec=new ParaMEDMEM::InterpKernelDEC(procs_source,procs_target); + MEDCoupling::InterpKernelDEC *dec=new MEDCoupling::InterpKernelDEC(procs_source,procs_target); if(dec->isInSourceSide()) { mesh=MEDCouplingUMesh::New(); @@ -154,7 +154,7 @@ void ParaMEDMEMTest::testFabienAPI2() mesh->allocateCells(1); mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn); mesh->finishInsertingCells(); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; paramesh=new ParaMESH(mesh,*dec->getSourceGrp(),"source mesh"); parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); parafield->getField()->setNature(ConservativeVolumic); @@ -175,7 +175,7 @@ void ParaMEDMEMTest::testFabienAPI2() mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn); mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+3); mesh->finishInsertingCells(); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; paramesh=new ParaMESH(mesh,*dec->getTargetGrp(),"target mesh"); parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); parafield->getField()->setNature(ConservativeVolumic); diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_Gauthier1.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_Gauthier1.cxx index e11b5a944..52e05b95c 100644 --- a/src/ParaMEDMEMTest/ParaMEDMEMTest_Gauthier1.cxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_Gauthier1.cxx @@ -40,7 +40,7 @@ #include using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; using namespace ICoCo; void afficheGauthier1(const ParaFIELD& field, const double *vals, int lgth) @@ -153,8 +153,8 @@ void ParaMEDMEMTest::testGauthier1() for (int rec=0;rec<2;rec++) { InterpKernelDEC dec_emetteur(emetteur_group, recepteur_group); - ParaMEDMEM::ParaFIELD *champ_emetteur(0),*champ_recepteur(0); - ParaMEDMEM::ParaMESH *paramesh(0); + MEDCoupling::ParaFIELD *champ_emetteur(0),*champ_recepteur(0); + MEDCoupling::ParaMESH *paramesh(0); MEDCouplingAutoRefCountObjectPtr mesh; dec_emetteur.setOrientation(2); if (send==0) @@ -165,9 +165,9 @@ void ParaMEDMEMTest::testGauthier1() { mesh=init_triangleGauthier1(is_master); } - paramesh=new ParaMEDMEM::ParaMESH(mesh,recepteur_group.containsMyRank()?recepteur_group:emetteur_group,"emetteur mesh"); - ParaMEDMEM::ComponentTopology comptopo; - champ_emetteur=new ParaMEDMEM::ParaFIELD(ON_CELLS,ONE_TIME,paramesh,comptopo); + paramesh=new MEDCoupling::ParaMESH(mesh,recepteur_group.containsMyRank()?recepteur_group:emetteur_group,"emetteur mesh"); + MEDCoupling::ComponentTopology comptopo; + champ_emetteur=new MEDCoupling::ParaFIELD(ON_CELLS,ONE_TIME,paramesh,comptopo); champ_emetteur->getField()->setNature(ConservativeVolumic); champ_emetteur->setOwnSupport(true); if (rec==0) @@ -178,8 +178,8 @@ void ParaMEDMEMTest::testGauthier1() { mesh=init_quadGauthier1(is_master); } - paramesh=new ParaMEDMEM::ParaMESH(mesh,recepteur_group.containsMyRank()?recepteur_group:emetteur_group,"recepteur mesh"); - champ_recepteur=new ParaMEDMEM::ParaFIELD(ON_CELLS,ONE_TIME,paramesh,comptopo); + paramesh=new MEDCoupling::ParaMESH(mesh,recepteur_group.containsMyRank()?recepteur_group:emetteur_group,"recepteur mesh"); + champ_recepteur=new MEDCoupling::ParaFIELD(ON_CELLS,ONE_TIME,paramesh,comptopo); champ_recepteur->getField()->setNature(ConservativeVolumic); champ_recepteur->setOwnSupport(true); if (cas=="emetteur") @@ -274,7 +274,7 @@ void ParaMEDMEMTest::testGauthier2() MPIProcessorGroup entree_chaude_group(comm,entree_chaude_ids); MPIProcessorGroup Genepi_group(comm,Genepi_ids); - ParaMEDMEM::ParaFIELD *vitesse(0); + MEDCoupling::ParaFIELD *vitesse(0); InterpKernelDEC dec_vit_in_chaude(entree_chaude_group, Genepi_group); if ( entree_chaude_group.containsMyRank()) @@ -294,8 +294,8 @@ void ParaMEDMEMTest::testGauthier2() arr=DataArrayDouble::New(); arr->alloc(63,3); std::copy(valsOfField,valsOfField+189,arr->getPointer()); f->setArray(arr); f->setNature(ConservativeVolumic); - ParaMEDMEM::ParaMESH *paramesh(new ParaMEDMEM::ParaMESH(mesh,entree_chaude_group,"emetteur mesh")); - vitesse=new ParaMEDMEM::ParaFIELD(f,paramesh,entree_chaude_group); + MEDCoupling::ParaMESH *paramesh(new MEDCoupling::ParaMESH(mesh,entree_chaude_group,"emetteur mesh")); + vitesse=new MEDCoupling::ParaFIELD(f,paramesh,entree_chaude_group); vitesse->setOwnSupport(true); dec_vit_in_chaude.setMethod("P1"); } @@ -314,8 +314,8 @@ void ParaMEDMEMTest::testGauthier2() f->setMesh(mesh); f->setName("vitesse_in_chaude"); arr=DataArrayDouble::New(); arr->alloc(f->getNumberOfTuplesExpected()*3); arr->fillWithZero(); arr->rearrange(3); f->setArray(arr); f->setNature(ConservativeVolumic); - ParaMEDMEM::ParaMESH *paramesh(new ParaMEDMEM::ParaMESH(mesh,Genepi_group,"recepteur mesh")); - vitesse=new ParaMEDMEM::ParaFIELD(f,paramesh,Genepi_group); + MEDCoupling::ParaMESH *paramesh(new MEDCoupling::ParaMESH(mesh,Genepi_group,"recepteur mesh")); + vitesse=new MEDCoupling::ParaFIELD(f,paramesh,Genepi_group); vitesse->setOwnSupport(true); dec_vit_in_chaude.setMethod(f->getDiscretization()->getRepr()); } @@ -416,8 +416,8 @@ void ParaMEDMEMTest::testGauthier3() std::vector decu(1); decu[0]=InterpKernelDEC(emetteur_group,recepteur_group); InterpKernelDEC& dec_emetteur=decu[0]; - ParaMEDMEM::ParaFIELD *champ_emetteur(0),*champ_recepteur(0); - ParaMEDMEM::ParaMESH *paramesh(0); + MEDCoupling::ParaFIELD *champ_emetteur(0),*champ_recepteur(0); + MEDCoupling::ParaMESH *paramesh(0); MEDCouplingAutoRefCountObjectPtr mesh; dec_emetteur.setOrientation(2); if (send==0) @@ -428,9 +428,9 @@ void ParaMEDMEMTest::testGauthier3() { mesh=init_triangleGauthier1(is_master); } - paramesh=new ParaMEDMEM::ParaMESH(mesh,recepteur_group.containsMyRank()?recepteur_group:emetteur_group,"emetteur mesh"); - ParaMEDMEM::ComponentTopology comptopo; - champ_emetteur=new ParaMEDMEM::ParaFIELD(ON_CELLS,ONE_TIME,paramesh,comptopo); + paramesh=new MEDCoupling::ParaMESH(mesh,recepteur_group.containsMyRank()?recepteur_group:emetteur_group,"emetteur mesh"); + MEDCoupling::ComponentTopology comptopo; + champ_emetteur=new MEDCoupling::ParaFIELD(ON_CELLS,ONE_TIME,paramesh,comptopo); champ_emetteur->getField()->setNature(ConservativeVolumic); champ_emetteur->setOwnSupport(true); if (rec==0) @@ -441,8 +441,8 @@ void ParaMEDMEMTest::testGauthier3() { mesh=init_quadGauthier1(is_master); } - paramesh=new ParaMEDMEM::ParaMESH(mesh,recepteur_group.containsMyRank()?recepteur_group:emetteur_group,"recepteur mesh"); - champ_recepteur=new ParaMEDMEM::ParaFIELD(ON_CELLS,ONE_TIME,paramesh,comptopo); + paramesh=new MEDCoupling::ParaMESH(mesh,recepteur_group.containsMyRank()?recepteur_group:emetteur_group,"recepteur mesh"); + champ_recepteur=new MEDCoupling::ParaFIELD(ON_CELLS,ONE_TIME,paramesh,comptopo); champ_recepteur->getField()->setNature(ConservativeVolumic); champ_recepteur->setOwnSupport(true); if (cas=="emetteur") @@ -542,15 +542,15 @@ void ParaMEDMEMTest::testGauthier4() procs_target.insert(i); self_procs.insert(rank); // - ParaMEDMEM::MEDCouplingUMesh *mesh=0; - ParaMEDMEM::ParaMESH *paramesh=0; - ParaMEDMEM::ParaFIELD* parafield=0; + MEDCoupling::MEDCouplingUMesh *mesh=0; + MEDCoupling::ParaMESH *paramesh=0; + MEDCoupling::ParaFIELD* parafield=0; // - ParaMEDMEM::CommInterface interface; + MEDCoupling::CommInterface interface; // - ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs); - ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target); - ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source); + ProcessorGroup* self_group = new MEDCoupling::MPIProcessorGroup(interface,self_procs); + ProcessorGroup* target_group = new MEDCoupling::MPIProcessorGroup(interface,procs_target); + ProcessorGroup* source_group = new MEDCoupling::MPIProcessorGroup(interface,procs_source); // MPI_Barrier(MPI_COMM_WORLD); if(source_group->containsMyRank()) @@ -567,7 +567,7 @@ void ParaMEDMEMTest::testGauthier4() mesh->setCoords(myCoords); myCoords->decrRef(); paramesh=new ParaMESH(mesh,*source_group,"source mesh"); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafield = new ParaFIELD(ON_NODES,NO_TIME,paramesh,comptopo); double *value=parafield->getField()->getArray()->getPointer(); std::copy(sourceVals,sourceVals+19,value); @@ -588,7 +588,7 @@ void ParaMEDMEMTest::testGauthier4() mesh->setCoords(myCoords); myCoords->decrRef(); paramesh=new ParaMESH (mesh,*target_group,"target mesh"); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); } else if(rank==2) @@ -605,12 +605,12 @@ void ParaMEDMEMTest::testGauthier4() mesh->setCoords(myCoords); myCoords->decrRef(); paramesh=new ParaMESH (mesh,*target_group,"target mesh"); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); } } //test 1 - primaire -> secondaire - ParaMEDMEM::InterpKernelDEC dec(*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec(*source_group,*target_group); dec.setIntersectionType(INTERP_KERNEL::PointLocator); parafield->getField()->setNature(ConservativeVolumic);//very important if (source_group->containsMyRank()) diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_ICoco.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_ICoco.cxx index f46c76749..0a15f5589 100644 --- a/src/ParaMEDMEMTest/ParaMEDMEMTest_ICoco.cxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_ICoco.cxx @@ -35,7 +35,7 @@ #include using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; using namespace ICoCo; typedef enum {sync_and,sync_or} synctype; @@ -122,24 +122,24 @@ void ParaMEDMEMTest::testICoco1() InterpKernelDEC dec_emetteur(emetteur_group,recepteur_group); dec_emetteur.setOrientation(2); - ParaMEDMEM::ParaFIELD *champ_emetteur(0),*champ_recepteur(0); - ParaMEDMEM::ParaMESH *paramesh(0); + MEDCoupling::ParaFIELD *champ_emetteur(0),*champ_recepteur(0); + MEDCoupling::ParaMESH *paramesh(0); if (cas=="emetteur") { - MEDCouplingAutoRefCountObjectPtr mesh_emetteur(init_triangle()); - paramesh=new ParaMEDMEM::ParaMESH(mesh_emetteur,emetteur_group,"emetteur mesh"); - ParaMEDMEM::ComponentTopology comptopo; - champ_emetteur=new ParaMEDMEM::ParaFIELD(ON_CELLS,ONE_TIME,paramesh,comptopo); + MEDCouplingAutoRefCountObjectPtr mesh_emetteur(init_triangle()); + paramesh=new MEDCoupling::ParaMESH(mesh_emetteur,emetteur_group,"emetteur mesh"); + MEDCoupling::ComponentTopology comptopo; + champ_emetteur=new MEDCoupling::ParaFIELD(ON_CELLS,ONE_TIME,paramesh,comptopo); champ_emetteur->getField()->setNature(ConservativeVolumic); champ_emetteur->setOwnSupport(true); champ_emetteur->getField()->getArray()->fillWithValue(1.); } else { - MEDCouplingAutoRefCountObjectPtr mesh_recepteur(init_quad()); - paramesh=new ParaMEDMEM::ParaMESH(mesh_recepteur,recepteur_group,"recepteur mesh"); - ParaMEDMEM::ComponentTopology comptopo; - champ_recepteur=new ParaMEDMEM::ParaFIELD(ON_CELLS,ONE_TIME,paramesh,comptopo); + MEDCouplingAutoRefCountObjectPtr mesh_recepteur(init_quad()); + paramesh=new MEDCoupling::ParaMESH(mesh_recepteur,recepteur_group,"recepteur mesh"); + MEDCoupling::ComponentTopology comptopo; + champ_recepteur=new MEDCoupling::ParaFIELD(ON_CELLS,ONE_TIME,paramesh,comptopo); champ_recepteur->getField()->setNature(ConservativeVolumic); champ_recepteur->setOwnSupport(true); } diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_InterpKernelDEC.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_InterpKernelDEC.cxx index e71170e4d..0f75367f1 100644 --- a/src/ParaMEDMEMTest/ParaMEDMEMTest_InterpKernelDEC.cxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_InterpKernelDEC.cxx @@ -47,7 +47,7 @@ using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void ParaMEDMEMTest::testInterpKernelDEC_2D() { @@ -89,15 +89,15 @@ void ParaMEDMEMTest::testInterpKernelDEC_1D() procs_target.insert(i); self_procs.insert(rank); // - ParaMEDMEM::MEDCouplingUMesh *mesh=0; - ParaMEDMEM::ParaMESH *paramesh=0; - ParaMEDMEM::ParaFIELD *parafieldP0=0; + MEDCoupling::MEDCouplingUMesh *mesh=0; + MEDCoupling::ParaMESH *paramesh=0; + MEDCoupling::ParaFIELD *parafieldP0=0; // - ParaMEDMEM::CommInterface interface; + MEDCoupling::CommInterface interface; // - ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs); - ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target); - ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source); + ProcessorGroup* self_group = new MEDCoupling::MPIProcessorGroup(interface,self_procs); + ProcessorGroup* target_group = new MEDCoupling::MPIProcessorGroup(interface,procs_target); + ProcessorGroup* source_group = new MEDCoupling::MPIProcessorGroup(interface,procs_source); // MPI_Barrier(MPI_COMM_WORLD); if(source_group->containsMyRank()) @@ -146,7 +146,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_1D() myCoords->decrRef(); } paramesh=new ParaMESH(mesh,*source_group,"source mesh"); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafieldP0 = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); double *valueP0=parafieldP0->getField()->getArray()->getPointer(); parafieldP0->getField()->setNature(ConservativeVolumic); @@ -196,12 +196,12 @@ void ParaMEDMEMTest::testInterpKernelDEC_1D() myCoords->decrRef(); paramesh=new ParaMESH(mesh,*target_group,targetMeshName); } - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafieldP0 = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); parafieldP0->getField()->setNature(ConservativeVolumic); } // test 1 - ParaMEDMEM::InterpKernelDEC dec(*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec(*source_group,*target_group); if (source_group->containsMyRank()) { dec.setMethod("P0"); @@ -278,15 +278,15 @@ void ParaMEDMEMTest::testInterpKernelDEC_2DCurve() procs_target.insert(i); self_procs.insert(rank); // - ParaMEDMEM::MEDCouplingUMesh *mesh=0; - ParaMEDMEM::ParaMESH *paramesh=0; - ParaMEDMEM::ParaFIELD *parafieldP0=0; + MEDCoupling::MEDCouplingUMesh *mesh=0; + MEDCoupling::ParaMESH *paramesh=0; + MEDCoupling::ParaFIELD *parafieldP0=0; // - ParaMEDMEM::CommInterface interface; + MEDCoupling::CommInterface interface; // - ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs); - ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target); - ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source); + ProcessorGroup* self_group = new MEDCoupling::MPIProcessorGroup(interface,self_procs); + ProcessorGroup* target_group = new MEDCoupling::MPIProcessorGroup(interface,procs_target); + ProcessorGroup* source_group = new MEDCoupling::MPIProcessorGroup(interface,procs_source); // MPI_Barrier(MPI_COMM_WORLD); if(source_group->containsMyRank()) @@ -335,7 +335,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_2DCurve() myCoords->decrRef(); } paramesh=new ParaMESH(mesh,*source_group,"source mesh"); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafieldP0 = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); double *valueP0=parafieldP0->getField()->getArray()->getPointer(); parafieldP0->getField()->setNature(ConservativeVolumic); @@ -385,12 +385,12 @@ void ParaMEDMEMTest::testInterpKernelDEC_2DCurve() myCoords->decrRef(); paramesh=new ParaMESH(mesh,*target_group,targetMeshName); } - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafieldP0 = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); parafieldP0->getField()->setNature(ConservativeVolumic); } // test 1 - ParaMEDMEM::InterpKernelDEC dec(*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec(*source_group,*target_group); if (source_group->containsMyRank()) { dec.setMethod("P0"); @@ -482,19 +482,19 @@ void ParaMEDMEMTest::testInterpKernelDEC_2D_(const char *srcMeth, const char *ta procs_target.insert(i); self_procs.insert(rank); - ParaMEDMEM::CommInterface interface; + MEDCoupling::CommInterface interface; - ParaMEDMEM::ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs); - ParaMEDMEM::ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target); - ParaMEDMEM::ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source); + MEDCoupling::ProcessorGroup* self_group = new MEDCoupling::MPIProcessorGroup(interface,self_procs); + MEDCoupling::ProcessorGroup* target_group = new MEDCoupling::MPIProcessorGroup(interface,procs_target); + MEDCoupling::ProcessorGroup* source_group = new MEDCoupling::MPIProcessorGroup(interface,procs_source); //loading the geometry for the source group - ParaMEDMEM::InterpKernelDEC dec (*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec (*source_group,*target_group); - ParaMEDMEM::MEDCouplingUMesh* mesh; - ParaMEDMEM::ParaMESH* paramesh; - ParaMEDMEM::ParaFIELD* parafield; + MEDCoupling::MEDCouplingUMesh* mesh; + MEDCoupling::ParaMESH* paramesh; + MEDCoupling::ParaFIELD* parafield; ICoCo::MEDField* icocofield ; string filename_xml1 = "square1_split"; @@ -521,8 +521,8 @@ void ParaMEDMEMTest::testInterpKernelDEC_2D_(const char *srcMeth, const char *ta paramesh=new ParaMESH (mesh,*source_group,"source mesh"); - // ParaMEDMEM::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT( support,*source_group); - ParaMEDMEM::ComponentTopology comptopo; + // MEDCoupling::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT( support,*source_group); + MEDCoupling::ComponentTopology comptopo; if(srcM=="P0") { parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); @@ -558,8 +558,8 @@ void ParaMEDMEMTest::testInterpKernelDEC_2D_(const char *srcMeth, const char *ta mesh = MEDLoader::ReadUMeshFromFile(fName.c_str(),meshname.str().c_str(),0); paramesh=new ParaMESH (mesh,*target_group,"target mesh"); - // ParaMEDMEM::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT(support,*target_group); - ParaMEDMEM::ComponentTopology comptopo; + // MEDCoupling::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT(support,*target_group); + MEDCoupling::ComponentTopology comptopo; if(targetM=="P0") { parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); @@ -690,18 +690,18 @@ void ParaMEDMEMTest::testInterpKernelDEC2_2D_(const char *srcMeth, const char *t procs_target.insert(i); self_procs.insert(rank); - ParaMEDMEM::CommInterface interface; + MEDCoupling::CommInterface interface; - ParaMEDMEM::ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs); - ParaMEDMEM::ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target); - ParaMEDMEM::ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source); + MEDCoupling::ProcessorGroup* self_group = new MEDCoupling::MPIProcessorGroup(interface,self_procs); + MEDCoupling::ProcessorGroup* target_group = new MEDCoupling::MPIProcessorGroup(interface,procs_target); + MEDCoupling::ProcessorGroup* source_group = new MEDCoupling::MPIProcessorGroup(interface,procs_source); //loading the geometry for the source group - ParaMEDMEM::InterpKernelDEC dec (*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec (*source_group,*target_group); - ParaMEDMEM::MEDCouplingUMesh* mesh; - ParaMEDMEM::MEDCouplingFieldDouble* mcfield; + MEDCoupling::MEDCouplingUMesh* mesh; + MEDCoupling::MEDCouplingFieldDouble* mcfield; string filename_xml1 = "square1_split"; string filename_xml2 = "square2_split"; @@ -721,7 +721,7 @@ void ParaMEDMEMTest::testInterpKernelDEC2_2D_(const char *srcMeth, const char *t meshname<< "Mesh_2_"<< rank+1; mesh=MEDLoader::ReadUMeshFromFile(fName.c_str(),meshname.str().c_str(),0); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; if(srcM=="P0") { mcfield = MEDCouplingFieldDouble::New(ON_CELLS,NO_TIME); @@ -764,7 +764,7 @@ void ParaMEDMEMTest::testInterpKernelDEC2_2D_(const char *srcMeth, const char *t ostringstream meshname ; meshname<< "Mesh_3_"<containsMyRank()) @@ -1140,7 +1140,7 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() mesh->setCoords(myCoords); myCoords->decrRef(); paramesh=new ParaMESH(mesh,*source_group,"source mesh"); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); double *value=parafield->getField()->getArray()->getPointer(); value[0]=34+13*((double)rank); @@ -1160,11 +1160,11 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() mesh->setCoords(myCoords); myCoords->decrRef(); paramesh=new ParaMESH (mesh,*target_group,"target mesh"); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); } //test 1 - Conservative volumic - ParaMEDMEM::InterpKernelDEC dec(*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec(*source_group,*target_group); parafield->getField()->setNature(ConservativeVolumic); if (source_group->containsMyRank()) { @@ -1187,7 +1187,7 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[1],res[1],1e-13); } //test 2 - Integral - ParaMEDMEM::InterpKernelDEC dec2(*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec2(*source_group,*target_group); parafield->getField()->setNature(Integral); if (source_group->containsMyRank()) { @@ -1210,7 +1210,7 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[1],res[1],1e-13); } //test 3 - Integral with global constraint - ParaMEDMEM::InterpKernelDEC dec3(*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec3(*source_group,*target_group); parafield->getField()->setNature(IntegralGlobConstraint); if (source_group->containsMyRank()) { @@ -1233,7 +1233,7 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[1],res[1],1e-13); } //test 4 - RevIntegral - ParaMEDMEM::InterpKernelDEC dec4(*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec4(*source_group,*target_group); parafield->getField()->setNature(RevIntegral); if (source_group->containsMyRank()) { @@ -1256,7 +1256,7 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[1],res[1],1e-13); } //test 5 - Conservative volumic reversed - ParaMEDMEM::InterpKernelDEC dec5(*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec5(*source_group,*target_group); parafield->getField()->setNature(ConservativeVolumic); if (source_group->containsMyRank()) { @@ -1283,7 +1283,7 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() dec5.sendData(); } //test 6 - Integral reversed - ParaMEDMEM::InterpKernelDEC dec6(*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec6(*source_group,*target_group); parafield->getField()->setNature(Integral); if (source_group->containsMyRank()) { @@ -1310,7 +1310,7 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() dec6.sendData(); } //test 7 - Integral with global constraint reversed - ParaMEDMEM::InterpKernelDEC dec7(*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec7(*source_group,*target_group); parafield->getField()->setNature(IntegralGlobConstraint); if (source_group->containsMyRank()) { @@ -1337,7 +1337,7 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() dec7.sendData(); } //test 8 - Integral with RevIntegral reversed - ParaMEDMEM::InterpKernelDEC dec8(*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec8(*source_group,*target_group); parafield->getField()->setNature(RevIntegral); if (source_group->containsMyRank()) { @@ -1394,15 +1394,15 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P1P1P0() procs_target.insert(i); self_procs.insert(rank); // - ParaMEDMEM::MEDCouplingUMesh *mesh=0; - ParaMEDMEM::ParaMESH *paramesh=0; - ParaMEDMEM::ParaFIELD *parafieldP0=0,*parafieldP1=0; + MEDCoupling::MEDCouplingUMesh *mesh=0; + MEDCoupling::ParaMESH *paramesh=0; + MEDCoupling::ParaFIELD *parafieldP0=0,*parafieldP1=0; // - ParaMEDMEM::CommInterface interface; + MEDCoupling::CommInterface interface; // - ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs); - ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target); - ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source); + ProcessorGroup* self_group = new MEDCoupling::MPIProcessorGroup(interface,self_procs); + ProcessorGroup* target_group = new MEDCoupling::MPIProcessorGroup(interface,procs_target); + ProcessorGroup* source_group = new MEDCoupling::MPIProcessorGroup(interface,procs_source); // MPI_Barrier(MPI_COMM_WORLD); if(source_group->containsMyRank()) @@ -1438,7 +1438,7 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P1P1P0() myCoords->decrRef(); } paramesh=new ParaMESH(mesh,*source_group,"source mesh"); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafieldP0 = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); parafieldP1 = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo); double *valueP0=parafieldP0->getField()->getArray()->getPointer(); @@ -1524,14 +1524,14 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P1P1P0() paramesh->setNodeGlobal(da); da->decrRef(); } - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafieldP0 = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); parafieldP1 = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo); parafieldP0->getField()->setNature(ConservativeVolumic); parafieldP1->getField()->setNature(ConservativeVolumic); } // test 1 - P0 P1 - ParaMEDMEM::InterpKernelDEC dec(*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec(*source_group,*target_group); if (source_group->containsMyRank()) { dec.setMethod("P0"); @@ -1614,14 +1614,14 @@ void ParaMEDMEMTest::testInterpKernelDEC2DM1D_P0P0() for (int i=nproc_source;icontainsMyRank()) @@ -1651,7 +1651,7 @@ void ParaMEDMEMTest::testInterpKernelDEC2DM1D_P0P0() mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+7); mesh->finishInsertingCells(); } - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; paramesh=new ParaMESH(mesh,*source_group,"source mesh"); parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); parafield->getField()->setNature(ConservativeVolumic); @@ -1664,12 +1664,12 @@ void ParaMEDMEMTest::testInterpKernelDEC2DM1D_P0P0() else { mesh=MEDCouplingUMesh::New("an example of -1 D mesh",-1); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; paramesh=new ParaMESH(mesh,*target_group,"target mesh"); parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); parafield->getField()->setNature(ConservativeVolumic); } - ParaMEDMEM::InterpKernelDEC dec(*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec(*source_group,*target_group); if(source_group->containsMyRank()) { dec.setMethod("P0"); @@ -1702,7 +1702,7 @@ void ParaMEDMEMTest::testInterpKernelDEC2DM1D_P0P0() CPPUNIT_ASSERT_DOUBLES_EQUAL(9.125,res[0],1e-12); dec.sendData(); } - ParaMEDMEM::InterpKernelDEC dec2(*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec2(*source_group,*target_group); dec2.setMethod("P0"); parafield->getField()->setNature(IntegralGlobConstraint); if(source_group->containsMyRank()) @@ -1739,7 +1739,7 @@ void ParaMEDMEMTest::testInterpKernelDEC2DM1D_P0P0() dec2.sendData(); } // - ParaMEDMEM::InterpKernelDEC dec3(*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec3(*source_group,*target_group); dec3.setMethod("P0"); parafield->getField()->setNature(Integral); if(source_group->containsMyRank()) @@ -1776,7 +1776,7 @@ void ParaMEDMEMTest::testInterpKernelDEC2DM1D_P0P0() dec3.sendData(); } // - ParaMEDMEM::InterpKernelDEC dec4(*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec4(*source_group,*target_group); dec4.setMethod("P0"); parafield->getField()->setNature(RevIntegral); if(source_group->containsMyRank()) @@ -1836,11 +1836,11 @@ void ParaMEDMEMTest::testInterpKernelDECPartialProcs() procs_source.insert(0); procs_target.insert(1); // - ParaMEDMEM::MEDCouplingUMesh *mesh=0; - ParaMEDMEM::ParaMESH *paramesh=0; - ParaMEDMEM::ParaFIELD *parafield=0; + MEDCoupling::MEDCouplingUMesh *mesh=0; + MEDCoupling::ParaMESH *paramesh=0; + MEDCoupling::ParaFIELD *parafield=0; // - ParaMEDMEM::CommInterface interface; + MEDCoupling::CommInterface interface; // MPI_Barrier(MPI_COMM_WORLD); double targetCoords[8]={ 0.,0., 1., 0., 0., 1., 1., 1. }; @@ -1855,11 +1855,11 @@ void ParaMEDMEMTest::testInterpKernelDECPartialProcs() ProcessorGroup* target_group=0; ProcessorGroup* source_group=0; // - ParaMEDMEM::InterpKernelDEC *dec=0; + MEDCoupling::InterpKernelDEC *dec=0; if(rank==0 || rank==1) { - target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target,partialComm); - source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source,partialComm); + target_group = new MEDCoupling::MPIProcessorGroup(interface,procs_target,partialComm); + source_group = new MEDCoupling::MPIProcessorGroup(interface,procs_source,partialComm); if(source_group->containsMyRank()) { mesh=MEDCouplingUMesh::New(); @@ -1873,13 +1873,13 @@ void ParaMEDMEMTest::testInterpKernelDECPartialProcs() mesh->allocateCells(1); mesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn); mesh->finishInsertingCells(); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; paramesh=new ParaMESH(mesh,*source_group,"source mesh"); parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); parafield->getField()->setNature(ConservativeVolumic); double *vals=parafield->getField()->getArray()->getPointer(); vals[0]=7.; - dec=new ParaMEDMEM::InterpKernelDEC(*source_group,*target_group); + dec=new MEDCoupling::InterpKernelDEC(*source_group,*target_group); dec->attachLocalField(parafield); dec->synchronize(); dec->sendData(); @@ -1899,11 +1899,11 @@ void ParaMEDMEMTest::testInterpKernelDECPartialProcs() mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn); mesh->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,targetConn+3); mesh->finishInsertingCells(); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; paramesh=new ParaMESH(mesh,*target_group,"target mesh"); parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); parafield->getField()->setNature(ConservativeVolumic); - dec=new ParaMEDMEM::InterpKernelDEC(*source_group,*target_group); + dec=new MEDCoupling::InterpKernelDEC(*source_group,*target_group); dec->attachLocalField(parafield); dec->synchronize(); dec->recvData(); @@ -1948,15 +1948,15 @@ void ParaMEDMEMTest::testInterpKernelDEC3DSurfEmptyBBox() procs_target.insert(i); self_procs.insert(rank); // - ParaMEDMEM::MEDCouplingUMesh *mesh=0; - ParaMEDMEM::ParaMESH *paramesh=0; - ParaMEDMEM::ParaFIELD *parafieldP0=0; + MEDCoupling::MEDCouplingUMesh *mesh=0; + MEDCoupling::ParaMESH *paramesh=0; + MEDCoupling::ParaFIELD *parafieldP0=0; // - ParaMEDMEM::CommInterface interface; + MEDCoupling::CommInterface interface; // - ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs); - ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target); - ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source); + ProcessorGroup* self_group = new MEDCoupling::MPIProcessorGroup(interface,self_procs); + ProcessorGroup* target_group = new MEDCoupling::MPIProcessorGroup(interface,procs_target); + ProcessorGroup* source_group = new MEDCoupling::MPIProcessorGroup(interface,procs_source); // MPI_Barrier(MPI_COMM_WORLD); if(source_group->containsMyRank()) @@ -1975,7 +1975,7 @@ void ParaMEDMEMTest::testInterpKernelDEC3DSurfEmptyBBox() myCoords->decrRef(); // paramesh=new ParaMESH(mesh,*source_group,"source mesh"); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafieldP0 = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); double *valueP0=parafieldP0->getField()->getArray()->getPointer(); parafieldP0->getField()->setNature(ConservativeVolumic); @@ -2014,12 +2014,12 @@ void ParaMEDMEMTest::testInterpKernelDEC3DSurfEmptyBBox() myCoords->decrRef(); paramesh=new ParaMESH(mesh,*target_group,targetMeshName); } - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafieldP0 = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); parafieldP0->getField()->setNature(ConservativeVolumic); } // test 1 - ParaMEDMEM::InterpKernelDEC dec(*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec(*source_group,*target_group); if (source_group->containsMyRank()) { dec.setMethod("P0"); @@ -2106,19 +2106,19 @@ void ParaMEDMEMTest::testAsynchronousInterpKernelDEC_2D(double dtA, double tmaxA procs_target.insert(i); self_procs.insert(rank); - ParaMEDMEM::CommInterface interface; + MEDCoupling::CommInterface interface; - ParaMEDMEM::ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs); - ParaMEDMEM::ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target); - ParaMEDMEM::ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source); + MEDCoupling::ProcessorGroup* self_group = new MEDCoupling::MPIProcessorGroup(interface,self_procs); + MEDCoupling::ProcessorGroup* target_group = new MEDCoupling::MPIProcessorGroup(interface,procs_target); + MEDCoupling::ProcessorGroup* source_group = new MEDCoupling::MPIProcessorGroup(interface,procs_source); //loading the geometry for the source group - ParaMEDMEM::InterpKernelDEC dec (*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec (*source_group,*target_group); - ParaMEDMEM::MEDCouplingUMesh* mesh; - ParaMEDMEM::ParaMESH* paramesh; - ParaMEDMEM::ParaFIELD* parafield; + MEDCoupling::MEDCouplingUMesh* mesh; + MEDCoupling::ParaMESH* paramesh; + MEDCoupling::ParaFIELD* parafield; ICoCo::MEDField* icocofield ; @@ -2152,8 +2152,8 @@ void ParaMEDMEMTest::testAsynchronousInterpKernelDEC_2D(double dtA, double tmaxA paramesh=new ParaMESH (mesh,*source_group,"source mesh"); - // ParaMEDMEM::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT( support,*source_group); - ParaMEDMEM::ComponentTopology comptopo; + // MEDCoupling::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT( support,*source_group); + MEDCoupling::ComponentTopology comptopo; if(srcM=="P0") { parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); @@ -2193,8 +2193,8 @@ void ParaMEDMEMTest::testAsynchronousInterpKernelDEC_2D(double dtA, double tmaxA mesh = MEDLoader::ReadUMeshFromFile(fName.c_str(),meshname.str().c_str(),0); paramesh=new ParaMESH (mesh,*target_group,"target mesh"); - // ParaMEDMEM::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT(support,*target_group); - ParaMEDMEM::ComponentTopology comptopo; + // MEDCoupling::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT(support,*target_group); + MEDCoupling::ComponentTopology comptopo; if(targetM=="P0") { parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_MEDLoader.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_MEDLoader.cxx index 01dc8227c..a13aca12a 100644 --- a/src/ParaMEDMEMTest/ParaMEDMEMTest_MEDLoader.cxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_MEDLoader.cxx @@ -31,5 +31,5 @@ using namespace std; using namespace INTERP_KERNEL; -using namespace ParaMEDMEM; +using namespace MEDCoupling; diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_MPIProcessorGroup.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_MPIProcessorGroup.cxx index 91ef8bb8a..505656bb5 100644 --- a/src/ParaMEDMEMTest/ParaMEDMEMTest_MPIProcessorGroup.cxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_MPIProcessorGroup.cxx @@ -34,7 +34,7 @@ using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; /* * Check methods defined in MPPIProcessorGroup.hxx diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx index 0648200b4..c28520d53 100644 --- a/src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_NonCoincidentDEC.cxx @@ -44,7 +44,7 @@ using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; using namespace MEDMEM; /* @@ -113,24 +113,24 @@ void ParaMEDMEMTest::testNonCoincidentDEC(const string& filename1, procs_target.insert(i); self_procs.insert(rank); - ParaMEDMEM::CommInterface interface; + MEDCoupling::CommInterface interface; - ParaMEDMEM::ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs); - ParaMEDMEM::ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target); - ParaMEDMEM::ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source); + MEDCoupling::ProcessorGroup* self_group = new MEDCoupling::MPIProcessorGroup(interface,self_procs); + MEDCoupling::ProcessorGroup* target_group = new MEDCoupling::MPIProcessorGroup(interface,procs_target); + MEDCoupling::ProcessorGroup* source_group = new MEDCoupling::MPIProcessorGroup(interface,procs_source); - ParaMEDMEM::ParaMESH* source_mesh=0; - ParaMEDMEM::ParaMESH* target_mesh=0; - ParaMEDMEM::ParaSUPPORT* parasupport=0; + MEDCoupling::ParaMESH* source_mesh=0; + MEDCoupling::ParaMESH* target_mesh=0; + MEDCoupling::ParaSUPPORT* parasupport=0; //loading the geometry for the source group - ParaMEDMEM::NonCoincidentDEC dec (*source_group,*target_group); + MEDCoupling::NonCoincidentDEC dec (*source_group,*target_group); MEDMEM::MESH* mesh; MEDMEM::SUPPORT* support; MEDMEM::FIELD* field; - ParaMEDMEM::ParaMESH* paramesh; - ParaMEDMEM::ParaFIELD* parafield; + MEDCoupling::ParaMESH* paramesh; + MEDCoupling::ParaFIELD* parafield; string filename_xml1 = getResourceFile(filename1); string filename_xml2 = getResourceFile(filename2); @@ -158,7 +158,7 @@ void ParaMEDMEMTest::testNonCoincidentDEC(const string& filename1, paramesh=new ParaMESH (*mesh,*source_group,"source mesh"); parasupport=new UnstructuredParaSUPPORT( support,*source_group); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafield = new ParaFIELD(parasupport, comptopo); @@ -188,7 +188,7 @@ void ParaMEDMEMTest::testNonCoincidentDEC(const string& filename1, paramesh=new ParaMESH (*mesh,*target_group,"target mesh"); parasupport=new UnstructuredParaSUPPORT(support,*target_group); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafield = new ParaFIELD(parasupport, comptopo); diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_OverlapDEC.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_OverlapDEC.cxx index f6b14cf49..de962c3df 100644 --- a/src/ParaMEDMEMTest/ParaMEDMEMTest_OverlapDEC.cxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_OverlapDEC.cxx @@ -42,7 +42,7 @@ using namespace std; #include "MEDCouplingMemArray.hxx" #include "MEDCouplingRemapper.hxx" -using namespace ParaMEDMEM; +using namespace MEDCoupling; typedef MEDCouplingAutoRefCountObjectPtr MUMesh; typedef MEDCouplingAutoRefCountObjectPtr MFDouble; @@ -89,7 +89,7 @@ typedef MEDCouplingAutoRefCountObjectPtr DADouble; // //void ParaMEDMEMTest::testOverlapDEC_LMEC_para() //{ -// using namespace ParaMEDMEM; +// using namespace MEDCoupling; // // int size; // int rank; diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_StructuredCoincidentDEC.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_StructuredCoincidentDEC.cxx index 21959471c..b32f3b3b9 100644 --- a/src/ParaMEDMEMTest/ParaMEDMEMTest_StructuredCoincidentDEC.cxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_StructuredCoincidentDEC.cxx @@ -42,7 +42,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; /* * Check methods defined in StructuredCoincidentDEC.hxx @@ -66,15 +66,15 @@ void ParaMEDMEMTest::testStructuredCoincidentDEC() { return; } - ParaMEDMEM::CommInterface interface; + MEDCoupling::CommInterface interface; - ParaMEDMEM::MPIProcessorGroup self_group (interface,rank,rank); - ParaMEDMEM::MPIProcessorGroup target_group(interface,3,size-1); - ParaMEDMEM::MPIProcessorGroup source_group (interface,0,2); + MEDCoupling::MPIProcessorGroup self_group (interface,rank,rank); + MEDCoupling::MPIProcessorGroup target_group(interface,3,size-1); + MEDCoupling::MPIProcessorGroup source_group (interface,0,2); - ParaMEDMEM::MEDCouplingUMesh* mesh; - ParaMEDMEM::ParaMESH* paramesh; - ParaMEDMEM::ParaFIELD* parafield; + MEDCoupling::MEDCouplingUMesh* mesh; + MEDCoupling::ParaMESH* paramesh; + MEDCoupling::ParaFIELD* parafield; string filename_xml1 = INTERP_TEST::getResourceFile("square1_split"); string filename_2 = INTERP_TEST::getResourceFile("square1.med"); @@ -86,7 +86,7 @@ void ParaMEDMEMTest::testStructuredCoincidentDEC() { //loading the geometry for the source group - ParaMEDMEM::StructuredCoincidentDEC dec(source_group, target_group); + MEDCoupling::StructuredCoincidentDEC dec(source_group, target_group); MPI_Barrier(MPI_COMM_WORLD); if (source_group.containsMyRank()) { @@ -102,7 +102,7 @@ void ParaMEDMEMTest::testStructuredCoincidentDEC() { paramesh=new ParaMESH (mesh,source_group,"source mesh"); - ParaMEDMEM::ComponentTopology comptopo(6); + MEDCoupling::ComponentTopology comptopo(6); parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); int nb_local=mesh->getNumberOfCells(); @@ -128,7 +128,7 @@ void ParaMEDMEMTest::testStructuredCoincidentDEC() { mesh = MEDLoader::ReadUMeshFromFile(filename_2.c_str(),meshname2.c_str(),0); paramesh=new ParaMESH (mesh,self_group,"target mesh"); - ParaMEDMEM::ComponentTopology comptopo(6, &target_group); + MEDCoupling::ComponentTopology comptopo(6, &target_group); parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); diff --git a/src/ParaMEDMEMTest/test_AllToAllDEC.cxx b/src/ParaMEDMEMTest/test_AllToAllDEC.cxx index 7b0825607..a7b79fe04 100644 --- a/src/ParaMEDMEMTest/test_AllToAllDEC.cxx +++ b/src/ParaMEDMEMTest/test_AllToAllDEC.cxx @@ -34,7 +34,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessDECTest::test_AllToAllDECSynchronousPointToPoint() { test_AllToAllDEC( false ) ; @@ -43,7 +43,7 @@ void MPIAccessDECTest::test_AllToAllDECAsynchronousPointToPoint() { test_AllToAllDEC( true ) ; } -static void chksts( int sts , int myrank , ParaMEDMEM::MPIAccess mpi_access ) { +static void chksts( int sts , int myrank , MEDCoupling::MPIAccess mpi_access ) { char msgerr[MPI_MAX_ERROR_STRING] ; int lenerr ; if ( sts != MPI_SUCCESS ) { @@ -85,7 +85,7 @@ void MPIAccessDECTest::test_AllToAllDEC( bool Asynchronous ) { debugStream << "test_AllToAllDEC" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; std::set sourceprocs; std::set targetprocs; int i ; @@ -96,8 +96,8 @@ void MPIAccessDECTest::test_AllToAllDEC( bool Asynchronous ) { targetprocs.insert(i); } - ParaMEDMEM::MPIProcessorGroup* sourcegroup = new ParaMEDMEM::MPIProcessorGroup(interface,sourceprocs) ; - ParaMEDMEM::MPIProcessorGroup* targetgroup = new ParaMEDMEM::MPIProcessorGroup(interface,targetprocs) ; + MEDCoupling::MPIProcessorGroup* sourcegroup = new MEDCoupling::MPIProcessorGroup(interface,sourceprocs) ; + MEDCoupling::MPIProcessorGroup* targetgroup = new MEDCoupling::MPIProcessorGroup(interface,targetprocs) ; MPIAccessDEC * MyMPIAccessDEC = new MPIAccessDEC( *sourcegroup , *targetgroup , Asynchronous ) ; diff --git a/src/ParaMEDMEMTest/test_AllToAllTimeDEC.cxx b/src/ParaMEDMEMTest/test_AllToAllTimeDEC.cxx index 2f50e66a0..52d5c43ac 100644 --- a/src/ParaMEDMEMTest/test_AllToAllTimeDEC.cxx +++ b/src/ParaMEDMEMTest/test_AllToAllTimeDEC.cxx @@ -39,7 +39,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessDECTest::test_AllToAllTimeDECSynchronousPointToPoint() { test_AllToAllTimeDEC( false ) ; @@ -48,7 +48,7 @@ void MPIAccessDECTest::test_AllToAllTimeDECAsynchronousPointToPoint() { test_AllToAllTimeDEC( true ) ; } -static void chksts( int sts , int myrank , ParaMEDMEM::MPIAccess * mpi_access ) { +static void chksts( int sts , int myrank , MEDCoupling::MPIAccess * mpi_access ) { char msgerr[MPI_MAX_ERROR_STRING] ; int lenerr ; if ( sts != MPI_SUCCESS ) { @@ -92,7 +92,7 @@ void MPIAccessDECTest::test_AllToAllTimeDEC( bool Asynchronous ) { debugStream << "test_AllToAllTimeDEC" << myrank << " Asynchronous " << Asynchronous << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; std::set sourceprocs; std::set targetprocs; int i ; @@ -103,8 +103,8 @@ void MPIAccessDECTest::test_AllToAllTimeDEC( bool Asynchronous ) { targetprocs.insert(i); } - ParaMEDMEM::MPIProcessorGroup* sourcegroup = new ParaMEDMEM::MPIProcessorGroup(interface,sourceprocs) ; - ParaMEDMEM::MPIProcessorGroup* targetgroup = new ParaMEDMEM::MPIProcessorGroup(interface,targetprocs) ; + MEDCoupling::MPIProcessorGroup* sourcegroup = new MEDCoupling::MPIProcessorGroup(interface,sourceprocs) ; + MEDCoupling::MPIProcessorGroup* targetgroup = new MEDCoupling::MPIProcessorGroup(interface,targetprocs) ; // LinearTimeInterpolator * aLinearInterpDEC = new LinearTimeInterpolator( 0.5 ) ; MPIAccessDEC * MyMPIAccessDEC = new MPIAccessDEC( *sourcegroup , *targetgroup , diff --git a/src/ParaMEDMEMTest/test_AllToAllvDEC.cxx b/src/ParaMEDMEMTest/test_AllToAllvDEC.cxx index 490b40437..5a373865c 100644 --- a/src/ParaMEDMEMTest/test_AllToAllvDEC.cxx +++ b/src/ParaMEDMEMTest/test_AllToAllvDEC.cxx @@ -38,7 +38,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessDECTest::test_AllToAllvDECSynchronousPointToPoint() { test_AllToAllvDEC( false ) ; @@ -47,7 +47,7 @@ void MPIAccessDECTest::test_AllToAllvDECAsynchronousPointToPoint() { test_AllToAllvDEC( true ) ; } -static void chksts( int sts , int myrank , ParaMEDMEM::MPIAccess mpi_access ) { +static void chksts( int sts , int myrank , MEDCoupling::MPIAccess mpi_access ) { char msgerr[MPI_MAX_ERROR_STRING] ; int lenerr ; if ( sts != MPI_SUCCESS ) { @@ -91,7 +91,7 @@ void MPIAccessDECTest::test_AllToAllvDEC( bool Asynchronous ) { debugStream << "test_AllToAllvDEC" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; std::set sourceprocs; std::set targetprocs; int i ; @@ -102,8 +102,8 @@ void MPIAccessDECTest::test_AllToAllvDEC( bool Asynchronous ) { targetprocs.insert(i); } - ParaMEDMEM::MPIProcessorGroup* sourcegroup = new ParaMEDMEM::MPIProcessorGroup(interface,sourceprocs) ; - ParaMEDMEM::MPIProcessorGroup* targetgroup = new ParaMEDMEM::MPIProcessorGroup(interface,targetprocs) ; + MEDCoupling::MPIProcessorGroup* sourcegroup = new MEDCoupling::MPIProcessorGroup(interface,sourceprocs) ; + MEDCoupling::MPIProcessorGroup* targetgroup = new MEDCoupling::MPIProcessorGroup(interface,targetprocs) ; MPIAccessDEC * MyMPIAccessDEC = new MPIAccessDEC( *sourcegroup , *targetgroup , Asynchronous ) ; diff --git a/src/ParaMEDMEMTest/test_AllToAllvTimeDEC.cxx b/src/ParaMEDMEMTest/test_AllToAllvTimeDEC.cxx index bd6f4b541..ad10d27f0 100644 --- a/src/ParaMEDMEMTest/test_AllToAllvTimeDEC.cxx +++ b/src/ParaMEDMEMTest/test_AllToAllvTimeDEC.cxx @@ -40,7 +40,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessDECTest::test_AllToAllvTimeDECSynchronousNative() { test_AllToAllvTimeDEC( false , true ) ; @@ -52,7 +52,7 @@ void MPIAccessDECTest::test_AllToAllvTimeDECAsynchronousPointToPoint() { test_AllToAllvTimeDEC( true , false ) ; } -static void chksts( int sts , int myrank , ParaMEDMEM::MPIAccess * mpi_access ) { +static void chksts( int sts , int myrank , MEDCoupling::MPIAccess * mpi_access ) { char msgerr[MPI_MAX_ERROR_STRING] ; int lenerr ; if ( sts != MPI_SUCCESS ) { @@ -101,7 +101,7 @@ void MPIAccessDECTest::test_AllToAllvTimeDEC( bool Asynchronous , bool UseMPINat debugStream << "test_AllToAllvTimeDEC" << myrank << " Asynchronous " << Asynchronous << " UseMPI_Alltoallv " << UseMPI_Alltoallv << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; std::set sourceprocs; std::set targetprocs; int i ; @@ -112,8 +112,8 @@ void MPIAccessDECTest::test_AllToAllvTimeDEC( bool Asynchronous , bool UseMPINat targetprocs.insert(i); } - ParaMEDMEM::MPIProcessorGroup* sourcegroup = new ParaMEDMEM::MPIProcessorGroup(interface,sourceprocs) ; - ParaMEDMEM::MPIProcessorGroup* targetgroup = new ParaMEDMEM::MPIProcessorGroup(interface,targetprocs) ; + MEDCoupling::MPIProcessorGroup* sourcegroup = new MEDCoupling::MPIProcessorGroup(interface,sourceprocs) ; + MEDCoupling::MPIProcessorGroup* targetgroup = new MEDCoupling::MPIProcessorGroup(interface,targetprocs) ; // TimeInterpolator * aLinearInterpDEC = new LinearTimeInterpolator( 0.5 ) ; MPIAccessDEC * MyMPIAccessDEC = new MPIAccessDEC( *sourcegroup , *targetgroup , diff --git a/src/ParaMEDMEMTest/test_AllToAllvTimeDoubleDEC.cxx b/src/ParaMEDMEMTest/test_AllToAllvTimeDoubleDEC.cxx index 01b7bd685..c8e907820 100644 --- a/src/ParaMEDMEMTest/test_AllToAllvTimeDoubleDEC.cxx +++ b/src/ParaMEDMEMTest/test_AllToAllvTimeDoubleDEC.cxx @@ -41,7 +41,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessDECTest::test_AllToAllvTimeDoubleDECSynchronousPointToPoint() { test_AllToAllvTimeDoubleDEC( false ) ; @@ -50,7 +50,7 @@ void MPIAccessDECTest::test_AllToAllvTimeDoubleDECAsynchronousPointToPoint() { test_AllToAllvTimeDoubleDEC( true ) ; } -static void chksts( int sts , int myrank , ParaMEDMEM::MPIAccess * mpi_access ) { +static void chksts( int sts , int myrank , MEDCoupling::MPIAccess * mpi_access ) { char msgerr[MPI_MAX_ERROR_STRING] ; int lenerr ; if ( sts != MPI_SUCCESS ) { @@ -94,7 +94,7 @@ void MPIAccessDECTest::test_AllToAllvTimeDoubleDEC( bool Asynchronous ) { debugStream << "test_AllToAllvTimeDoubleDEC" << myrank << " Asynchronous " << Asynchronous << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; std::set sourceprocs; std::set targetprocs; int i ; @@ -105,8 +105,8 @@ void MPIAccessDECTest::test_AllToAllvTimeDoubleDEC( bool Asynchronous ) { targetprocs.insert(i); } - ParaMEDMEM::MPIProcessorGroup* sourcegroup = new ParaMEDMEM::MPIProcessorGroup(interface,sourceprocs) ; - ParaMEDMEM::MPIProcessorGroup* targetgroup = new ParaMEDMEM::MPIProcessorGroup(interface,targetprocs) ; + MEDCoupling::MPIProcessorGroup* sourcegroup = new MEDCoupling::MPIProcessorGroup(interface,sourceprocs) ; + MEDCoupling::MPIProcessorGroup* targetgroup = new MEDCoupling::MPIProcessorGroup(interface,targetprocs) ; // TimeInterpolator * aLinearInterpDEC = new LinearTimeInterpolator( 0 ) ; MPIAccessDEC * MyMPIAccessDEC = new MPIAccessDEC( *sourcegroup , *targetgroup , diff --git a/src/ParaMEDMEMTest/test_MPI_Access_Cancel.cxx b/src/ParaMEDMEMTest/test_MPI_Access_Cancel.cxx index 8b26823f6..12ca41e5b 100644 --- a/src/ParaMEDMEMTest/test_MPI_Access_Cancel.cxx +++ b/src/ParaMEDMEMTest/test_MPI_Access_Cancel.cxx @@ -43,7 +43,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessTest::test_MPI_Access_Cancel() { @@ -66,11 +66,11 @@ void MPIAccessTest::test_MPI_Access_Cancel() { debugStream << "test_MPI_Access_Cancel" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; - ParaMEDMEM::MPIProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface) ; + MEDCoupling::MPIProcessorGroup* group = new MEDCoupling::MPIProcessorGroup(interface) ; - ParaMEDMEM::MPIAccess mpi_access( group ) ; + MEDCoupling::MPIAccess mpi_access( group ) ; if ( myrank >= 2 ) { mpi_access.barrier() ; diff --git a/src/ParaMEDMEMTest/test_MPI_Access_Cyclic_ISend_IRecv.cxx b/src/ParaMEDMEMTest/test_MPI_Access_Cyclic_ISend_IRecv.cxx index 00ce3e69c..efa226e72 100644 --- a/src/ParaMEDMEMTest/test_MPI_Access_Cyclic_ISend_IRecv.cxx +++ b/src/ParaMEDMEMTest/test_MPI_Access_Cyclic_ISend_IRecv.cxx @@ -38,7 +38,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessTest::test_MPI_Access_Cyclic_ISend_IRecv() { @@ -59,11 +59,11 @@ void MPIAccessTest::test_MPI_Access_Cyclic_ISend_IRecv() { debugStream << "test_MPI_Access_Cyclic_ISend_IRecv" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; - ParaMEDMEM::MPIProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface) ; + MEDCoupling::MPIProcessorGroup* group = new MEDCoupling::MPIProcessorGroup(interface) ; - ParaMEDMEM::MPIAccess mpi_access( group ) ; + MEDCoupling::MPIAccess mpi_access( group ) ; #define maxsend 100 diff --git a/src/ParaMEDMEMTest/test_MPI_Access_Cyclic_Send_Recv.cxx b/src/ParaMEDMEMTest/test_MPI_Access_Cyclic_Send_Recv.cxx index 67c687f54..922153e0f 100644 --- a/src/ParaMEDMEMTest/test_MPI_Access_Cyclic_Send_Recv.cxx +++ b/src/ParaMEDMEMTest/test_MPI_Access_Cyclic_Send_Recv.cxx @@ -37,7 +37,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessTest::test_MPI_Access_Cyclic_Send_Recv() { @@ -58,11 +58,11 @@ void MPIAccessTest::test_MPI_Access_Cyclic_Send_Recv() { debugStream << "test_MPI_Access_Cyclic_Send_Recv" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; - ParaMEDMEM::MPIProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface) ; + MEDCoupling::MPIProcessorGroup* group = new MEDCoupling::MPIProcessorGroup(interface) ; - ParaMEDMEM::MPIAccess mpi_access( group ) ; + MEDCoupling::MPIAccess mpi_access( group ) ; if ( myrank >= 3 ) { mpi_access.barrier() ; diff --git a/src/ParaMEDMEMTest/test_MPI_Access_IProbe.cxx b/src/ParaMEDMEMTest/test_MPI_Access_IProbe.cxx index 5fd4c2d0c..00b89abf0 100644 --- a/src/ParaMEDMEMTest/test_MPI_Access_IProbe.cxx +++ b/src/ParaMEDMEMTest/test_MPI_Access_IProbe.cxx @@ -43,7 +43,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessTest::test_MPI_Access_IProbe() { @@ -66,11 +66,11 @@ void MPIAccessTest::test_MPI_Access_IProbe() { debugStream << "test_MPI_Access_IProbe" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; - ParaMEDMEM::MPIProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface) ; + MEDCoupling::MPIProcessorGroup* group = new MEDCoupling::MPIProcessorGroup(interface) ; - ParaMEDMEM::MPIAccess mpi_access( group ) ; + MEDCoupling::MPIAccess mpi_access( group ) ; if ( myrank >= 2 ) { mpi_access.barrier() ; diff --git a/src/ParaMEDMEMTest/test_MPI_Access_ISendRecv.cxx b/src/ParaMEDMEMTest/test_MPI_Access_ISendRecv.cxx index 126cc8eb7..0c9ae888f 100644 --- a/src/ParaMEDMEMTest/test_MPI_Access_ISendRecv.cxx +++ b/src/ParaMEDMEMTest/test_MPI_Access_ISendRecv.cxx @@ -38,7 +38,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessTest::test_MPI_Access_ISendRecv() { @@ -59,11 +59,11 @@ void MPIAccessTest::test_MPI_Access_ISendRecv() { debugStream << "test_MPI_Access_ISendRecv" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; - ParaMEDMEM::MPIProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface) ; + MEDCoupling::MPIProcessorGroup* group = new MEDCoupling::MPIProcessorGroup(interface) ; - ParaMEDMEM::MPIAccess mpi_access( group ) ; + MEDCoupling::MPIAccess mpi_access( group ) ; if ( myrank >= 2 ) { mpi_access.barrier() ; diff --git a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv.cxx b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv.cxx index baa3572c1..ce6b284e8 100644 --- a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv.cxx +++ b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv.cxx @@ -38,7 +38,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessTest::test_MPI_Access_ISend_IRecv() { @@ -59,11 +59,11 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv() { debugStream << "test_MPI_Access_ISend_IRecv" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; - ParaMEDMEM::MPIProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface) ; + MEDCoupling::MPIProcessorGroup* group = new MEDCoupling::MPIProcessorGroup(interface) ; - ParaMEDMEM::MPIAccess mpi_access( group ) ; + MEDCoupling::MPIAccess mpi_access( group ) ; #define maxreq 100 diff --git a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_BottleNeck.cxx b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_BottleNeck.cxx index 820340197..d6d9dc919 100644 --- a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_BottleNeck.cxx +++ b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_BottleNeck.cxx @@ -39,7 +39,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessTest::test_MPI_Access_ISend_IRecv_BottleNeck() { @@ -63,11 +63,11 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_BottleNeck() { debugStream << "test_MPI_Access_ISend_IRecv_BottleNeck" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; - ParaMEDMEM::MPIProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface) ; + MEDCoupling::MPIProcessorGroup* group = new MEDCoupling::MPIProcessorGroup(interface) ; - ParaMEDMEM::MPIAccess mpi_access( group ) ; + MEDCoupling::MPIAccess mpi_access( group ) ; #define maxreq 10000 diff --git a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length.cxx b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length.cxx index d1b556c3d..36dbb89fc 100644 --- a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length.cxx +++ b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length.cxx @@ -38,7 +38,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length() { @@ -61,11 +61,11 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length() { debugStream << "test_MPI_Access_ISend_IRecv_Length" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; - ParaMEDMEM::MPIProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface) ; + MEDCoupling::MPIProcessorGroup* group = new MEDCoupling::MPIProcessorGroup(interface) ; - ParaMEDMEM::MPIAccess mpi_access( group ) ; + MEDCoupling::MPIAccess mpi_access( group ) ; #define maxreq 10 diff --git a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length_1.cxx b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length_1.cxx index 966bfc457..c8587adb5 100644 --- a/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length_1.cxx +++ b/src/ParaMEDMEMTest/test_MPI_Access_ISend_IRecv_Length_1.cxx @@ -38,7 +38,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length_1() { @@ -59,11 +59,11 @@ void MPIAccessTest::test_MPI_Access_ISend_IRecv_Length_1() { debugStream << "test_MPI_Access_ISend_IRecv_Length_1" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; - ParaMEDMEM::MPIProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface) ; + MEDCoupling::MPIProcessorGroup* group = new MEDCoupling::MPIProcessorGroup(interface) ; - ParaMEDMEM::MPIAccess mpi_access( group ) ; + MEDCoupling::MPIAccess mpi_access( group ) ; #define maxreq 10 diff --git a/src/ParaMEDMEMTest/test_MPI_Access_Probe.cxx b/src/ParaMEDMEMTest/test_MPI_Access_Probe.cxx index 632c5d2b1..bd2784d9c 100644 --- a/src/ParaMEDMEMTest/test_MPI_Access_Probe.cxx +++ b/src/ParaMEDMEMTest/test_MPI_Access_Probe.cxx @@ -38,7 +38,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessTest::test_MPI_Access_Probe() { @@ -59,11 +59,11 @@ void MPIAccessTest::test_MPI_Access_Probe() { debugStream << "test_MPI_Access_Probe" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; - ParaMEDMEM::MPIProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface) ; + MEDCoupling::MPIProcessorGroup* group = new MEDCoupling::MPIProcessorGroup(interface) ; - ParaMEDMEM::MPIAccess mpi_access( group ) ; + MEDCoupling::MPIAccess mpi_access( group ) ; if ( myrank >= 2 ) { mpi_access.barrier() ; diff --git a/src/ParaMEDMEMTest/test_MPI_Access_SendRecv.cxx b/src/ParaMEDMEMTest/test_MPI_Access_SendRecv.cxx index c7cbf7d05..9fcb752da 100644 --- a/src/ParaMEDMEMTest/test_MPI_Access_SendRecv.cxx +++ b/src/ParaMEDMEMTest/test_MPI_Access_SendRecv.cxx @@ -38,7 +38,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessTest::test_MPI_Access_SendRecv() { @@ -59,11 +59,11 @@ void MPIAccessTest::test_MPI_Access_SendRecv() { debugStream << "MPIAccessTest::test_MPI_Access_SendRecv" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; - ParaMEDMEM::MPIProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface) ; + MEDCoupling::MPIProcessorGroup* group = new MEDCoupling::MPIProcessorGroup(interface) ; - ParaMEDMEM::MPIAccess mpi_access( group ) ; + MEDCoupling::MPIAccess mpi_access( group ) ; if ( myrank >= 2 ) { mpi_access.barrier() ; diff --git a/src/ParaMEDMEMTest/test_MPI_Access_Send_Recv.cxx b/src/ParaMEDMEMTest/test_MPI_Access_Send_Recv.cxx index cdaaabf30..45827ee3f 100644 --- a/src/ParaMEDMEMTest/test_MPI_Access_Send_Recv.cxx +++ b/src/ParaMEDMEMTest/test_MPI_Access_Send_Recv.cxx @@ -38,7 +38,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessTest::test_MPI_Access_Send_Recv() { @@ -57,11 +57,11 @@ void MPIAccessTest::test_MPI_Access_Send_Recv() { debugStream << "test_MPI_Access_Send_Recv" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; - ParaMEDMEM::MPIProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface) ; + MEDCoupling::MPIProcessorGroup* group = new MEDCoupling::MPIProcessorGroup(interface) ; - ParaMEDMEM::MPIAccess mpi_access( group ) ; + MEDCoupling::MPIAccess mpi_access( group ) ; if ( myrank >= 2 ) { mpi_access.barrier() ; diff --git a/src/ParaMEDMEMTest/test_MPI_Access_Send_Recv_Length.cxx b/src/ParaMEDMEMTest/test_MPI_Access_Send_Recv_Length.cxx index d3385cf15..f090c011c 100644 --- a/src/ParaMEDMEMTest/test_MPI_Access_Send_Recv_Length.cxx +++ b/src/ParaMEDMEMTest/test_MPI_Access_Send_Recv_Length.cxx @@ -38,7 +38,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessTest::test_MPI_Access_Send_Recv_Length() { @@ -61,11 +61,11 @@ void MPIAccessTest::test_MPI_Access_Send_Recv_Length() { debugStream << "test_MPI_Access_Send_Recv_Length" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; - ParaMEDMEM::MPIProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface) ; + MEDCoupling::MPIProcessorGroup* group = new MEDCoupling::MPIProcessorGroup(interface) ; - ParaMEDMEM::MPIAccess mpi_access( group ) ; + MEDCoupling::MPIAccess mpi_access( group ) ; if ( myrank >= 2 ) { mpi_access.barrier() ; diff --git a/src/ParaMEDMEMTest/test_MPI_Access_Time.cxx b/src/ParaMEDMEMTest/test_MPI_Access_Time.cxx index 166af2e74..2df728b6c 100644 --- a/src/ParaMEDMEMTest/test_MPI_Access_Time.cxx +++ b/src/ParaMEDMEMTest/test_MPI_Access_Time.cxx @@ -38,7 +38,7 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void MPIAccessTest::test_MPI_Access_Time() { @@ -61,11 +61,11 @@ void MPIAccessTest::test_MPI_Access_Time() { debugStream << "test_MPI_Access_Time" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; - ParaMEDMEM::MPIProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface) ; + MEDCoupling::MPIProcessorGroup* group = new MEDCoupling::MPIProcessorGroup(interface) ; - ParaMEDMEM::MPIAccess mpi_access( group ) ; + MEDCoupling::MPIAccess mpi_access( group ) ; #define maxreq 10 @@ -87,8 +87,8 @@ void MPIAccessTest::test_MPI_Access_Time() { int sendbuf[maxreq] ; int recvbuf[maxreq] ; int i = 0 ; - ParaMEDMEM::TimeMessage aSendTimeMsg[maxreq] ; - ParaMEDMEM::TimeMessage aRecvTimeMsg[maxreq] ; + MEDCoupling::TimeMessage aSendTimeMsg[maxreq] ; + MEDCoupling::TimeMessage aRecvTimeMsg[maxreq] ; double t ; double dt = 1. ; double maxt = 10. ; diff --git a/src/ParaMEDMEMTest/test_MPI_Access_Time_0.cxx b/src/ParaMEDMEMTest/test_MPI_Access_Time_0.cxx index 9000e57ea..a640580b6 100644 --- a/src/ParaMEDMEMTest/test_MPI_Access_Time_0.cxx +++ b/src/ParaMEDMEMTest/test_MPI_Access_Time_0.cxx @@ -38,9 +38,9 @@ #define ENABLE_FORCED_FAILURES using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; -void chksts( int sts , int myrank , ParaMEDMEM::MPIAccess * mpi_access ) { +void chksts( int sts , int myrank , MEDCoupling::MPIAccess * mpi_access ) { char msgerr[MPI_MAX_ERROR_STRING] ; int lenerr ; if ( sts != MPI_SUCCESS ) { @@ -88,11 +88,11 @@ void MPIAccessTest::test_MPI_Access_Time_0() { debugStream << "test_MPI_Access_Time_0 rank" << myrank << endl ; - ParaMEDMEM::CommInterface interface ; + MEDCoupling::CommInterface interface ; - ParaMEDMEM::MPIProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface) ; + MEDCoupling::MPIProcessorGroup* group = new MEDCoupling::MPIProcessorGroup(interface) ; - ParaMEDMEM::MPIAccess * mpi_access = new ParaMEDMEM::MPIAccess( group ) ; + MEDCoupling::MPIAccess * mpi_access = new MEDCoupling::MPIAccess( group ) ; if ( myrank >= 2 ) { debugStream << "test_MPI_Access_Time_0 rank" << myrank << " --> mpi_access->barrier" << endl ; @@ -115,10 +115,10 @@ void MPIAccessTest::test_MPI_Access_Time_0() { int sts ; int sendbuf[maxreq] ; int recvbuf[maxreq] ; - ParaMEDMEM::TimeMessage aSendTimeMsg[maxreq] ; + MEDCoupling::TimeMessage aSendTimeMsg[maxreq] ; int lasttime = -1 ; - ParaMEDMEM::TimeMessage RecvTimeMessages[maxreq+1] ; - ParaMEDMEM::TimeMessage *aRecvTimeMsg = &RecvTimeMessages[1] ; + MEDCoupling::TimeMessage RecvTimeMessages[maxreq+1] ; + MEDCoupling::TimeMessage *aRecvTimeMsg = &RecvTimeMessages[1] ; // mpi_access->Trace() ; int istep = 0 ; for ( t = 0 ; t < maxt ; t = t+dt[myrank] ) { diff --git a/src/ParaMEDMEMTest/test_perf.cxx b/src/ParaMEDMEMTest/test_perf.cxx index 2250280c0..66a78d005 100644 --- a/src/ParaMEDMEMTest/test_perf.cxx +++ b/src/ParaMEDMEMTest/test_perf.cxx @@ -51,7 +51,7 @@ #endif using namespace std; -using namespace ParaMEDMEM; +using namespace MEDCoupling; void testInterpKernelDEC_2D(const string& filename1, const string& meshname1, const string& filename2, const string& meshname2, @@ -132,23 +132,23 @@ void testInterpKernelDEC_2D(const string& filename_xml1, const string& meshname1 procs_target.insert(i); self_procs.insert(rank); - ParaMEDMEM::CommInterface interface; + MEDCoupling::CommInterface interface; - ParaMEDMEM::ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs); - ParaMEDMEM::ProcessorGroup* target_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_target); - ParaMEDMEM::ProcessorGroup* source_group = new ParaMEDMEM::MPIProcessorGroup(interface,procs_source); + MEDCoupling::ProcessorGroup* self_group = new MEDCoupling::MPIProcessorGroup(interface,self_procs); + MEDCoupling::ProcessorGroup* target_group = new MEDCoupling::MPIProcessorGroup(interface,procs_target); + MEDCoupling::ProcessorGroup* source_group = new MEDCoupling::MPIProcessorGroup(interface,procs_source); //loading the geometry for the source group - ParaMEDMEM::InterpKernelDEC dec (*source_group,*target_group); + MEDCoupling::InterpKernelDEC dec (*source_group,*target_group); if(tri) dec.setIntersectionType(INTERP_KERNEL::Triangulation); else dec.setIntersectionType(INTERP_KERNEL::Convex); - ParaMEDMEM::MEDCouplingUMesh* mesh; - ParaMEDMEM::ParaMESH* paramesh; - ParaMEDMEM::ParaFIELD* parafield; + MEDCoupling::MEDCouplingUMesh* mesh; + MEDCoupling::ParaMESH* paramesh; + MEDCoupling::ParaFIELD* parafield; ICoCo::MEDField* icocofield ; // To remove tmp files from disk @@ -179,7 +179,7 @@ void testInterpKernelDEC_2D(const string& filename_xml1, const string& meshname1 paramesh=new ParaMESH (mesh,*source_group,"source mesh"); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafield = new ParaFIELD(ON_CELLS, NO_TIME, paramesh, comptopo); int nb_local=mesh->getNumberOfCells(); @@ -212,7 +212,7 @@ void testInterpKernelDEC_2D(const string& filename_xml1, const string& meshname1 mesh->incrRef(); paramesh=new ParaMESH (mesh,*target_group,"target mesh"); - ParaMEDMEM::ComponentTopology comptopo; + MEDCoupling::ComponentTopology comptopo; parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); int nb_local=mesh->getNumberOfCells(); diff --git a/src/ParaMEDMEM_Swig/ParaMEDMEM.i b/src/ParaMEDMEM_Swig/ParaMEDMEM.i index 38f4c4751..bbadec28e 100644 --- a/src/ParaMEDMEM_Swig/ParaMEDMEM.i +++ b/src/ParaMEDMEM_Swig/ParaMEDMEM.i @@ -38,7 +38,7 @@ #include -using namespace ParaMEDMEM; +using namespace MEDCoupling; using namespace ICoCo; enum mpi_constants { mpi_comm_world, mpi_comm_self, mpi_double, mpi_int }; @@ -69,7 +69,7 @@ public: }; #endif -%extend ParaMEDMEM::ParaMESH +%extend MEDCoupling::ParaMESH { PyObject *getGlobalNumberingCell2() const {