]> SALOME platform Git repositories - modules/med.git/commitdiff
Salome HOME
1st step. agy/NamespaceModif
authorAnthony Geay <anthony.geay@edf.fr>
Wed, 20 Jan 2016 09:08:58 +0000 (10:08 +0100)
committerAnthony Geay <anthony.geay@edf.fr>
Wed, 20 Jan 2016 09:08:58 +0000 (10:08 +0100)
106 files changed:
src/MEDCalc/cmp/MEDCalculator_i.cxx
src/MEDCalc/cmp/MEDDataManager_i.cxx
src/MEDCalc/cmp/MEDDataManager_i.hxx
src/MEDCalc/cmp/MEDPresentation.cxx
src/MEDCalculator/MEDCalculatorBrowserField.cxx
src/MEDCalculator/MEDCalculatorBrowserField.hxx
src/MEDCalculator/MEDCalculatorBrowserLiteStruct.cxx
src/MEDCalculator/MEDCalculatorBrowserLiteStruct.hxx
src/MEDCalculator/MEDCalculatorBrowserMesh.cxx
src/MEDCalculator/MEDCalculatorBrowserMesh.hxx
src/MEDCalculator/MEDCalculatorBrowserStep.cxx
src/MEDCalculator/MEDCalculatorBrowserStep.hxx
src/MEDCalculator/MEDCalculatorDBField.cxx
src/MEDCalculator/MEDCalculatorDBField.hxx
src/MEDCalculator/MEDCalculatorDBRangeSelection.cxx
src/MEDCalculator/MEDCalculatorDBRangeSelection.hxx
src/MEDCalculator/MEDCalculatorDBSliceField.cxx
src/MEDCalculator/MEDCalculatorDBSliceField.hxx
src/MEDCalculator/Swig/MEDCalculator.i
src/MEDCalculator/Swig/MEDCalculatorTypemaps.i
src/MEDCalculator/Swig/SPythonInterpreter.cxx
src/MEDCalculator/Swig/SPythonInterpreter.hxx
src/MEDCalculator/Swig/SPythonParser.cxx
src/MEDCalculator/Swig/SPythonParser.hxx
src/MEDCalculator/Swig/spython.cxx
src/MEDCalculator/Test/MEDCalculatorBasicsTest.cxx
src/MEDCalculator/Test/MEDCalculatorBasicsTest.hxx
src/MEDCalculator/Test/TestMEDCalculator.cxx
src/MEDCouplingCorba/Client/DataArrayDoubleClient.cxx
src/MEDCouplingCorba/Client/DataArrayDoubleClient.hxx
src/MEDCouplingCorba/Client/DataArrayIntClient.cxx
src/MEDCouplingCorba/Client/DataArrayIntClient.hxx
src/MEDCouplingCorba/Client/MEDCoupling1DGTUMeshClient.cxx
src/MEDCouplingCorba/Client/MEDCoupling1DGTUMeshClient.hxx
src/MEDCouplingCorba/Client/MEDCoupling1SGTUMeshClient.cxx
src/MEDCouplingCorba/Client/MEDCoupling1SGTUMeshClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingCMeshClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingCMeshClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingCurveLinearMeshClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingCurveLinearMeshClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingExtrudedMeshClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingExtrudedMeshClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingFieldDoubleClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingFieldDoubleClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingFieldOverTimeClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingFieldOverTimeClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingFieldTemplateClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingFieldTemplateClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingIMeshClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingIMeshClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingMeshClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingMeshClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingMultiFieldsClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingMultiFieldsClient.hxx
src/MEDCouplingCorba/Client/MEDCouplingUMeshClient.cxx
src/MEDCouplingCorba/Client/MEDCouplingUMeshClient.hxx
src/MEDCouplingCorba/DataArrayDoubleServant.cxx
src/MEDCouplingCorba/DataArrayDoubleServant.hxx
src/MEDCouplingCorba/DataArrayIntServant.cxx
src/MEDCouplingCorba/DataArrayIntServant.hxx
src/MEDCouplingCorba/DataArrayServant.cxx
src/MEDCouplingCorba/DataArrayServant.hxx
src/MEDCouplingCorba/MEDCoupling1DGTUMeshServant.cxx
src/MEDCouplingCorba/MEDCoupling1DGTUMeshServant.hxx
src/MEDCouplingCorba/MEDCoupling1GTUMeshServant.cxx
src/MEDCouplingCorba/MEDCoupling1GTUMeshServant.hxx
src/MEDCouplingCorba/MEDCoupling1SGTUMeshServant.cxx
src/MEDCouplingCorba/MEDCoupling1SGTUMeshServant.hxx
src/MEDCouplingCorba/MEDCouplingCMeshServant.cxx
src/MEDCouplingCorba/MEDCouplingCMeshServant.hxx
src/MEDCouplingCorba/MEDCouplingCurveLinearMeshServant.cxx
src/MEDCouplingCorba/MEDCouplingCurveLinearMeshServant.hxx
src/MEDCouplingCorba/MEDCouplingExtrudedMeshServant.cxx
src/MEDCouplingCorba/MEDCouplingExtrudedMeshServant.hxx
src/MEDCouplingCorba/MEDCouplingFieldDoubleServant.cxx
src/MEDCouplingCorba/MEDCouplingFieldDoubleServant.hxx
src/MEDCouplingCorba/MEDCouplingFieldOverTimeServant.cxx
src/MEDCouplingCorba/MEDCouplingFieldOverTimeServant.hxx
src/MEDCouplingCorba/MEDCouplingFieldServant.cxx
src/MEDCouplingCorba/MEDCouplingFieldServant.hxx
src/MEDCouplingCorba/MEDCouplingFieldTemplateServant.cxx
src/MEDCouplingCorba/MEDCouplingFieldTemplateServant.hxx
src/MEDCouplingCorba/MEDCouplingIMeshServant.cxx
src/MEDCouplingCorba/MEDCouplingIMeshServant.hxx
src/MEDCouplingCorba/MEDCouplingMeshServant.cxx
src/MEDCouplingCorba/MEDCouplingMeshServant.hxx
src/MEDCouplingCorba/MEDCouplingMultiFieldsServant.cxx
src/MEDCouplingCorba/MEDCouplingMultiFieldsServant.hxx
src/MEDCouplingCorba/MEDCouplingPointSetServant.cxx
src/MEDCouplingCorba/MEDCouplingPointSetServant.hxx
src/MEDCouplingCorba/MEDCouplingRefCountServant.cxx
src/MEDCouplingCorba/MEDCouplingRefCountServant.hxx
src/MEDCouplingCorba/MEDCouplingStructuredMeshServant.cxx
src/MEDCouplingCorba/MEDCouplingStructuredMeshServant.hxx
src/MEDCouplingCorba/MEDCouplingUMeshServant.cxx
src/MEDCouplingCorba/MEDCouplingUMeshServant.hxx
src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponent.cxx
src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponent.hxx
src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponentClt.cxx
src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponentClt.hxx
src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponentServ.cxx
src/MEDCouplingCorba/Test/MEDCouplingMeshFieldFactoryComponentServ.hxx
src/MEDCouplingCorba/Test/TestMEDCouplingCorbaClt.cxx
src/MEDCouplingCorba/Test/TestMEDCouplingCorbaServ.cxx
src/MEDCouplingCorba_Swig/Client/MEDCouplingClient.i
src/MEDCouplingCorba_Swig/MEDCouplingCorba.i

index e0bafd7afb6f7e9201d27cc66414ad8dded2f0e4..d81d2a3e5d1eb051a9eb3412b3496d16b792b4a9 100644 (file)
@@ -25,7 +25,7 @@
 #include <string>
 
 #include "MEDCouplingFieldDouble.hxx"
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCalculator_i * MEDCalculator_i::_instance = NULL;
 
index 3f9f460551cbed7336478039747a8a623576b607..6f489dd01395722e27750993b24381c1509ed1bb 100644 (file)
@@ -25,7 +25,7 @@
 #include "Basics_Utils.hxx"
 
 #include "MEDLoader.hxx"
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 #include <string>
 #include <vector>
@@ -88,7 +88,7 @@ MEDCALC::DatasourceHandler * MEDDataManager_i::loadDatasource(const char *filepa
   }
 
   // Then we check that the file is readable by MEDLoader
-  MEDLoader::CheckFileForRead(filepath);
+  CheckFileForRead(filepath);
 
   // Initialise the datasource handler
   MEDCALC::DatasourceHandler * datasourceHandler = new MEDCALC::DatasourceHandler();
@@ -99,7 +99,7 @@ MEDCALC::DatasourceHandler * MEDDataManager_i::loadDatasource(const char *filepa
   _datasourceHandlerMap[datasourceHandler->id] = datasourceHandler;
 
   // We start by read the list of meshes (spatial supports of fields)
-  vector<string> meshNames = MEDLoader::GetMeshNames(filepath);
+  vector<string> meshNames = GetMeshNames(filepath);
   int nbOfMeshes = meshNames.size();
   for (int iMesh = 0; iMesh < nbOfMeshes; iMesh++) {
     const char * meshName = meshNames[iMesh].c_str();
@@ -115,7 +115,7 @@ MEDCALC::DatasourceHandler * MEDDataManager_i::loadDatasource(const char *filepa
     // For each mesh, we can read the list of the names of the
     // associated fields, i.e. fields whose spatial support is this
     // mesh.
-    vector<string> fieldNames = MEDLoader::GetAllFieldNamesOnMesh(filepath,
+    vector<string> fieldNames = GetAllFieldNamesOnMesh(filepath,
                   meshName);
     int nbOfFields = fieldNames.size();
     for (int iField = 0; iField < nbOfFields; iField++) {
@@ -136,7 +136,7 @@ MEDCALC::DatasourceHandler * MEDDataManager_i::loadDatasource(const char *filepa
       // to determine the types of spatial discretization defined for
       // this field and to chooose one.
 
-      vector<TypeOfField> listOfTypes = MEDLoader::GetTypesOfField(filepath,
+      vector<TypeOfField> listOfTypes = GetTypesOfField(filepath,
                    meshName,
                    fieldName);
       int nbOfTypes = listOfTypes.size();
@@ -146,7 +146,7 @@ MEDCALC::DatasourceHandler * MEDDataManager_i::loadDatasource(const char *filepa
   // Then, we can get the iterations associated to this field on
   // this type of spatial discretization:
   std::vector< std::pair<int,int> > fieldIterations =
-    MEDLoader::GetFieldIterations(listOfTypes[iType],
+    GetFieldIterations(listOfTypes[iType],
           filepath,
           meshName,
           fieldName);
@@ -391,14 +391,14 @@ void MEDDataManager_i::saveFields(const char * filepath,
 
   try {
     bool writeFromScratch = true;
-    MEDLoader::WriteField(filepath, fieldDouble, writeFromScratch);
+    WriteField(filepath, fieldDouble, writeFromScratch);
 
     writeFromScratch = false;
     for(CORBA::ULong i=1; i<fieldIdList.length(); i++) {
       fieldHandlerId = fieldIdList[i];
       fieldHandler = getFieldHandler(fieldHandlerId);
       fieldDouble = getFieldDouble(fieldHandler);
-      MEDLoader::WriteField(filepath, fieldDouble, writeFromScratch);
+      WriteField(filepath, fieldDouble, writeFromScratch);
     }
   }
   catch (INTERP_KERNEL::Exception &ex) {
@@ -537,7 +537,7 @@ MEDCouplingUMesh * MEDDataManager_i::getUMesh(long meshHandlerId) {
     std::string filepath(source_to_file((_datasourceHandlerMap[sourceid])->uri));
     const char * meshName = _meshHandlerMap[meshHandlerId]->name;
     int meshDimRelToMax = 0;
-    myMesh = MEDLoader::ReadUMeshFromFile(filepath,meshName,meshDimRelToMax);
+    myMesh = ReadUMeshFromFile(filepath,meshName,meshDimRelToMax);
     _meshMap[meshHandlerId] = myMesh;
   }
   return myMesh;
@@ -613,7 +613,7 @@ MEDCouplingFieldDouble * MEDDataManager_i::getFieldDouble(const MEDCALC::FieldHa
   LOG("getFieldDouble: field "<<fieldHandler->fieldname<<" loaded from file "<<filepath);
   TypeOfField type = (TypeOfField)fieldHandler->type;
   int meshDimRelToMax = 0;
-  MEDCouplingFieldDouble * myField = MEDLoader::ReadField(type,
+  MEDCouplingFieldDouble * myField = ReadField(type,
                 filepath,
                 meshName,
                 meshDimRelToMax,
@@ -775,7 +775,7 @@ INTERP_KERNEL::IntersectionType MEDDataManager_i::_getIntersectionType(const cha
   throw KERNEL::createSalomeException(message.c_str());
 }
 
-ParaMEDMEM::NatureOfField MEDDataManager_i::_getNatureOfField(const char* fieldNature) {
+MEDCoupling::NatureOfField MEDDataManager_i::_getNatureOfField(const char* fieldNature) {
   std::string nature(fieldNature);
   if (nature == "NoNature") {
     return NoNature;
@@ -810,7 +810,7 @@ MEDCALC::FieldHandler* MEDDataManager_i::interpolateField(CORBA::Long fieldHandl
   std::string method(params.method);
   double defaultValue = params.defaultValue;
   bool reverse = params.reverse;
-  ParaMEDMEM::NatureOfField nature = this->_getNatureOfField(params.nature);
+  MEDCoupling::NatureOfField nature = this->_getNatureOfField(params.nature);
 
   // 1. Build remapper between sourceMesh and targetMesh (compute interpolation matrix)
   MEDCouplingRemapper remapper;
index 3105b4fc9b09f45f71425eed2cc95f37b3226fa5..589f1be427b39f854d6d13d2ab401ade87acec91 100644 (file)
@@ -29,7 +29,7 @@
 #include "MEDCouplingRemapper.hxx"
 #include "MEDCouplingUMesh.hxx"
 #include "MEDCouplingFieldDouble.hxx"
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 /*! This map is used for lifecycle management of fields used in this operator */
 #include <map>
@@ -161,7 +161,7 @@ private:
   long getUMeshId(const MEDCouplingMesh * mesh);
 
   INTERP_KERNEL::IntersectionType _getIntersectionType(const char* intersType);
-  ParaMEDMEM::NatureOfField _getNatureOfField(const char* fieldNature);
+  MEDCoupling::NatureOfField _getNatureOfField(const char* fieldNature);
 
 };
 
index 46ec07145585a4620d58a1214a1dba77ed0e7164..9498c737e1eb3c34ee310da2546581dfeef40174 100644 (file)
@@ -77,12 +77,12 @@ PyObject * MEDPresentation::getPythonObjectFromMain(const char * python_var)
 
 std::string MEDPresentation::getFieldTypeString()
 {
-  ParaMEDMEM::TypeOfField typ = (ParaMEDMEM::TypeOfField)_fieldHandler->type;
+  MEDCoupling::TypeOfField typ = (MEDCoupling::TypeOfField)_fieldHandler->type;
   switch(typ)
   {
-    case ParaMEDMEM::ON_CELLS:
+    case MEDCoupling::ON_CELLS:
       return "CELLS";
-    case ParaMEDMEM::ON_NODES:
+    case MEDCoupling::ON_NODES:
       return "NODES";
     default:
       std::cerr << "MEDPresentation::getFieldTypeString() -- Not implemented ! Gauss points?";
index aeee4f46185a8b1d86252e7023587423f7643c48..9e8b3aec2931d3ebc8b1277bc4f9ee8536a7ab60 100644 (file)
@@ -29,7 +29,7 @@
 #include <algorithm>
 #include <functional>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 //  Default constructor
 //  Set field name to nm and selection to flase
@@ -50,25 +50,25 @@ MEDCalculatorBrowserField::~MEDCalculatorBrowserField()
 //  Then, read the Med structur to fill time steps, components and meshes
 MEDCalculatorBrowserField::MEDCalculatorBrowserField(const char *fname, const char *fieldName) : _name(fieldName), _file_name(fname), _selection(false)
 {
-  std::vector< std::string > meshNames=MEDLoader::GetMeshNamesOnField(fname,fieldName);
-  std::vector< std::pair< std::pair<int,int>, double > > dtits=MEDLoader::GetAllFieldIterations(fname, fieldName);
+  std::vector< std::string > meshNames=GetMeshNamesOnField(fname,fieldName);
+  std::vector< std::pair< std::pair<int,int>, double > > dtits=GetAllFieldIterations(fname, fieldName);
   for(std::vector<std::pair< std::pair<int,int>, double > >::const_iterator iter=dtits.begin();iter!=dtits.end();iter++)
     {
       _steps.push_back(MEDCalculatorBrowserStep((*iter).first.first,(*iter).first.second,(*iter).second,meshNames[0]));
     }
-  std::vector<TypeOfField> types=MEDLoader::GetTypesOfField(fname,meshNames[0].c_str(),fieldName);
+  std::vector<TypeOfField> types=GetTypesOfField(fname,meshNames[0].c_str(),fieldName);
   if(types.empty())
     throw INTERP_KERNEL::Exception("MEDCalculatorBrowserField::MEDCalculatorBrowserField : the file is not loadable using MED File 3 API ! Problably presence of field on edges faces...");
   _type=types[0];//To improve
   MEDCouplingFieldDouble *tmpf=0;
   try
     {
-      tmpf=MEDLoader::ReadField(_type,fname,meshNames[0].c_str(),0,fieldName,dtits[0].first.first,dtits[0].first.second);
+      tmpf=ReadField(_type,fname,meshNames[0].c_str(),0,fieldName,dtits[0].first.first,dtits[0].first.second);
     }
   catch(INTERP_KERNEL::Exception& e)
     {
       if(_type==ON_CELLS)
-        tmpf=MEDLoader::ReadField(_type,fname,meshNames[0].c_str(),-1,fieldName,dtits[0].first.first,dtits[0].first.second);
+        tmpf=ReadField(_type,fname,meshNames[0].c_str(),-1,fieldName,dtits[0].first.first,dtits[0].first.second);
       else
         throw e;
     }
@@ -81,7 +81,7 @@ MEDCalculatorBrowserField::MEDCalculatorBrowserField(const char *fname, const ch
       _components.push_back(c);
     }
   tmpf->decrRef();
-  _corresponding_meshes=MEDLoader::GetMeshNamesOnField(fname,fieldName);
+  _corresponding_meshes=GetMeshNamesOnField(fname,fieldName);
 }
 
 //  Equal to string operator,
index 4d32bc7dd15bf31571bcaec232f033329d01b9a1..4bd9b234b83bce6fe465393b370ec1ca100a824c 100644 (file)
@@ -33,7 +33,7 @@
 //  This class correspond to a MED field of a file
 //  It contains the field name, the components, the time steps and selection methods
 //  It's used to select a field, it's components and time steps
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCalculatorBrowserStep;//  top prevent cross include
   class MEDCALCULATOR_EXPORT MEDCalculatorBrowserField
index a968a9594c8af152c7aaed39d095fbbf30c70707..49f5debc1f431730fdd854d3cac0ef9bcaadce38 100644 (file)
@@ -28,7 +28,7 @@
 #include <deque>
 #include <string>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 //  Default constructor
 MEDCalculatorBrowserLiteStruct::MEDCalculatorBrowserLiteStruct() : _any_selection(false)
@@ -50,10 +50,10 @@ MEDCalculatorBrowserLiteStruct::~MEDCalculatorBrowserLiteStruct()
 MEDCalculatorBrowserLiteStruct::MEDCalculatorBrowserLiteStruct(const char *f) : _file(f), _any_selection(false)
 {
   computeBaseName();
-  std::vector<std::string> meshNames=MEDLoader::GetMeshNames(_file.c_str());
+  std::vector<std::string> meshNames=GetMeshNames(_file.c_str());
   for(std::vector<std::string>::const_iterator iter=meshNames.begin();iter!=meshNames.end();iter++)
     _meshes.push_back(MEDCalculatorBrowserMesh((*iter).c_str()));
-  std::vector<std::string> fieldNames=MEDLoader::GetAllFieldNames(_file.c_str());
+  std::vector<std::string> fieldNames=GetAllFieldNames(_file.c_str());
   for(std::vector<std::string>::const_iterator iter=fieldNames.begin();iter!=fieldNames.end();iter++)
     _fields.push_back(MEDCalculatorBrowserField(_file.c_str(),(*iter).c_str()));
 }
index a3f6e7d01ad84ded7e4e58c5fd4e87ffcb283e58..fec559d4a76eef41b816683aec5340611646ab68 100644 (file)
@@ -31,7 +31,7 @@
 //  This class correspond to a MED File
 //  It contains fields and meshes from a file
 //  It also has methods for selecting/unselecting meshes, field and components from fields
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCALCULATOR_EXPORT MEDCalculatorBrowserLiteStruct
   {
index 1ba975ccc999726982284accbe5a2aefe6e38d41..868d0dd6a7d407fb6f16a5830266b424de43ef3e 100644 (file)
@@ -21,7 +21,7 @@
 
 #include <sstream>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 //  Default constructor
 MEDCalculatorBrowserMesh::MEDCalculatorBrowserMesh() : _selection(false)
index 18bb8e2dc9029171e5f76037d77281506682f7cd..0a53941a1437b7a992810443b7246a38745b0763 100644 (file)
@@ -27,7 +27,7 @@
 //  This class corresponds to a MED mesh of a file
 //  It contains the mesh name and a flag to know if it's selected or not
 //  It's used only for selecting mesh, out of all fields.
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCALCULATOR_EXPORT MEDCalculatorBrowserMesh
   {
index 32ed703fc0dfbc5de5b5087efd074ce54d7dcedb..99e4e654e313998282fa149cf3d94f3c9ddcea38 100644 (file)
@@ -22,7 +22,7 @@
 
 #include <sstream>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCalculatorBrowserStep::~MEDCalculatorBrowserStep()
 {
index 65d59a3329c321dd248365e776c117e82948a70c..3bae4d38cc0056d1af6fe9a49d2165207941499f 100644 (file)
@@ -28,7 +28,7 @@
 //  This class corresponds to a time step (dt,it) of a field
 //  It contains the time step (dt) and the corresponding time value
 //  It also contains methods for selecting or unselecting this time step and it hold the name of the supporting mesh.
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCALCULATOR_EXPORT MEDCalculatorBrowserStep
   {
index 8037eb9864910503e4968fa20d7d4e194fc7dc1f..6ceda64b4347786b0c12f2f23a8002a30d451734 100644 (file)
@@ -34,7 +34,7 @@
 
 #include <cmath>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCalculatorDBFieldReal *MEDCalculatorDBField::New(const MEDCalculatorBrowserField& ls)
 {
@@ -125,20 +125,20 @@ void MEDCalculatorDBFieldReal::write(const char *fName, bool writeFromScratch) c
   int status=MEDLoaderBase::getStatusOfFile(fName);
   if(!writeFromScratch && status==MEDLoaderBase::EXIST_RW)
     {
-      std::vector<std::string> ms=MEDLoader::GetMeshNames(fName);
+      std::vector<std::string> ms=GetMeshNames(fName);
       if(std::find(ms.begin(),ms.end(),mesh->getName())!=ms.end())
         {
           std::ostringstream oss; oss << "In file \"" << fName << "\" the mesh with name \"" << mesh->getName() << "\" already exists !"; 
           throw INTERP_KERNEL::Exception(oss.str().c_str());
         }
-      std::vector<std::string> fs=MEDLoader::GetAllFieldNames(fName);
+      std::vector<std::string> fs=GetAllFieldNames(fName);
       if(std::find(fs.begin(),fs.end(),field->getName())!=fs.end())
         {
           std::ostringstream oss; oss << "In file \"" << fName << "\" the field with name \"" << field->getName() << "\" already exists !"; 
           throw INTERP_KERNEL::Exception(oss.str().c_str());
         }
     }
-  MEDLoader::WriteUMesh(fName,mesh,writeFromScratch);
+  WriteUMesh(fName,mesh,writeFromScratch);
   for(std::vector<int>::const_iterator iter=ids.begin();iter!=ids.end();iter++)
     _time_steps[*iter]->write(fName,_name,_description);
 }
@@ -724,7 +724,7 @@ void MEDCalculatorDBFieldReal::fetchData() const throw(INTERP_KERNEL::Exception)
           idsInGlobalToFetch.push_back(ids[i]);
         }
     }
-  std::vector<MEDCouplingFieldDouble *> fs=MEDLoader::ReadFieldsOnSameMesh(_type,_file_name.c_str(),_mesh_name.c_str(),0,_field_name.c_str(),idstoFetch);
+  std::vector<MEDCouplingFieldDouble *> fs=ReadFieldsOnSameMesh(_type,_file_name.c_str(),_mesh_name.c_str(),0,_field_name.c_str(),idstoFetch);
   sz=fs.size();
   for(int i=0;i<sz;i++)
     {
index ed254c881fa59b462390ffb9f71ddecffa92f36d..d61089fef3f44434ae312638065e74f96b114d25 100644 (file)
@@ -33,7 +33,7 @@
 #include <string>
 #include <vector>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCalculatorBrowserField;
   class MEDCalculatorDBFieldReal;
index 21f17add81c11a6772cc7ed60e6fb6ad2df054c3..ce11276ba938baa8d1e4af455d6d56908201d7bf 100644 (file)
@@ -24,7 +24,7 @@
 #include <limits>
 #include <sstream>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 const char MEDCalculatorDBRangeSelection::ALL_ELTS[]=":";
 
index 7904a97f7a2d56603531bc637f4ccef5ac8a9eae..85f9d86af0f950fb2637c7555479dc8a7660a240 100644 (file)
@@ -26,7 +26,7 @@
 
 #include <vector>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCALCULATOR_EXPORT MEDCalculatorDBRangeSelection
   {
index 645cfb3c956cd0b3e756ed1a63e4830066ac7391..def8c9725ea0dc5f876b621064e6fa657560380d 100644 (file)
@@ -26,7 +26,7 @@
 #include "MEDCouplingFieldDouble.hxx"
 #include "MEDCouplingAutoRefCountObjectPtr.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCalculatorDBSliceField::MEDCalculatorDBSliceField(int iter, int order):_iteration(iter),_order(order),_field(0),_work(0)
 {
@@ -73,7 +73,7 @@ void MEDCalculatorDBSliceField::write(const char *fName, const std::string& n, c
   MEDCouplingFieldDouble *myF=const_cast<MEDCouplingFieldDouble *>(_field);
   myF->setName(n.c_str());
   myF->setDescription(d.c_str());
-  MEDLoader::WriteFieldUsingAlreadyWrittenMesh(fName,_field);
+  WriteFieldUsingAlreadyWrittenMesh(fName,_field);
   myF->setName(kn.c_str());
   myF->setDescription(kd.c_str());
 }
@@ -95,7 +95,7 @@ MEDCalculatorDBSliceField::~MEDCalculatorDBSliceField()
 MEDCouplingFieldDouble *MEDCalculatorDBSliceField::getField(TypeOfField type, const std::string& fname, const std::string& mname, const std::string& fieldName) const
 {
   if(!_field)
-    _field=MEDLoader::ReadField(type,fname.c_str(),mname.c_str(),0,fieldName.c_str(),_iteration,_order);
+    _field=ReadField(type,fname.c_str(),mname.c_str(),0,fieldName.c_str(),_iteration,_order);
   return _field;
 }
 
index e2efb0b99be31a54022bd3e6d88b703cacc7242a..6d3d2ce1b5e2e4af22111a0fb5bac40d3af92297 100644 (file)
@@ -28,7 +28,7 @@
 
 #include <string>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingFieldDouble;
   class MEDCouplingMesh;
index d9468fdb65e2d2d2755455890950aa093d4b90eb..5dcdaa1fa17ae546e8697a4f344836f2d06fe95e 100644 (file)
 #include "MEDCalculatorDBField.hxx"
 #include "MEDCalculatorTypemaps.i"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 using namespace INTERP_KERNEL;
 %}
 
-%typemap(out) ParaMEDMEM::MEDCalculatorDBField*
+%typemap(out) MEDCoupling::MEDCalculatorDBField*
 {
   $result=convertMEDCalculatorDBField($1,$owner);
 }
 
-%newobject ParaMEDMEM::MEDCalculatorDBField::operator+;
-%newobject ParaMEDMEM::MEDCalculatorDBField::operator-;
-%newobject ParaMEDMEM::MEDCalculatorDBField::operator*;
-%newobject ParaMEDMEM::MEDCalculatorDBField::operator/;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::__radd__;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::__rsub__;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::__rmul__;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::__rdiv__;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::__getitem__;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::__setitem__;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::operator();
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::buildCstFieldFromThis;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::dot;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::operator^;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::crossProduct;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::doublyContractedProduct;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::determinant;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::eigenValues;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::eigenVectors;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::inverse;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::trace;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::deviator;
-%newobject ParaMEDMEM::MEDCalculatorDBFieldReal::magnitude;
+%newobject MEDCoupling::MEDCalculatorDBField::operator+;
+%newobject MEDCoupling::MEDCalculatorDBField::operator-;
+%newobject MEDCoupling::MEDCalculatorDBField::operator*;
+%newobject MEDCoupling::MEDCalculatorDBField::operator/;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::__radd__;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::__rsub__;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::__rmul__;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::__rdiv__;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::__getitem__;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::__setitem__;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::operator();
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::buildCstFieldFromThis;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::dot;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::operator^;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::crossProduct;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::doublyContractedProduct;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::determinant;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::eigenValues;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::eigenVectors;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::inverse;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::trace;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::deviator;
+%newobject MEDCoupling::MEDCalculatorDBFieldReal::magnitude;
 
 %feature("unref") MEDCalculatorDBField "$this->decrRef();"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCalculatorBrowserLiteStruct
   {
@@ -95,7 +95,7 @@ namespace ParaMEDMEM
     MEDCalculatorDBFieldReal(const MEDCalculatorBrowserField& ls);
     ~MEDCalculatorDBFieldReal();
     MEDCalculatorDBFieldReal *buildCstFieldFromThis(double val) const;
-    ParaMEDMEM::TypeOfField getType() const;
+    MEDCoupling::TypeOfField getType() const;
     void fetchData() const throw(INTERP_KERNEL::Exception);
     int getNumberOfSteps() const;
     int getNumberOfFetchedSteps() const;
@@ -202,12 +202,12 @@ namespace ParaMEDMEM
                return ret;
              }
            void *argp;
-           int status=SWIG_ConvertPtr(val,&argp,SWIGTYPE_p_ParaMEDMEM__MEDCalculatorDBFieldReal,0|0);
+           int status=SWIG_ConvertPtr(val,&argp,SWIGTYPE_p_MEDCoupling__MEDCalculatorDBFieldReal,0|0);
            if(!SWIG_IsOK(status))
              {
                throw INTERP_KERNEL::Exception("For setting only float, int or DBFieldReal supported !");
              }
-          const ParaMEDMEM::MEDCalculatorDBFieldReal *arg=reinterpret_cast< const ParaMEDMEM::MEDCalculatorDBFieldReal * >(argp);
+          const MEDCoupling::MEDCalculatorDBFieldReal *arg=reinterpret_cast< const MEDCoupling::MEDCalculatorDBFieldReal * >(argp);
           (*ret)=*arg;
           ret->incrRef();
           return ret;
@@ -268,7 +268,7 @@ namespace ParaMEDMEM
            for(unsigned int i=0;i<r.size();i++)
              {
                MEDCouplingFieldDouble *tmp=r[i];
-               PyList_SetItem(ret,i,SWIG_NewPointerObj(SWIG_as_voidptr(tmp),SWIGTYPE_p_ParaMEDMEM__MEDCouplingFieldDouble, SWIG_POINTER_OWN | 0 ));
+               PyList_SetItem(ret,i,SWIG_NewPointerObj(SWIG_as_voidptr(tmp),SWIGTYPE_p_MEDCoupling__MEDCouplingFieldDouble, SWIG_POINTER_OWN | 0 ));
              }
            return ret;
          }
@@ -315,88 +315,88 @@ namespace ParaMEDMEM
 }
 
 %pythoncode %{
-def ParaMEDMEMDataArrayDoublenew(cls,*args):
+def MEDCouplingDataArrayDoublenew(cls,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayDouble____new___(cls,args)
-def ParaMEDMEMDataArrayDoubleIadd(self,*args):
+def MEDCouplingDataArrayDoubleIadd(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayDouble____iadd___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleIsub(self,*args):
+def MEDCouplingDataArrayDoubleIsub(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayDouble____isub___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleImul(self,*args):
+def MEDCouplingDataArrayDoubleImul(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayDouble____imul___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleIdiv(self,*args):
+def MEDCouplingDataArrayDoubleIdiv(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayDouble____idiv___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleIpow(self,*args):
+def MEDCouplingDataArrayDoubleIpow(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayDouble____ipow___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleTupleIadd(self,*args):
+def MEDCouplingDataArrayDoubleTupleIadd(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayDoubleTuple____iadd___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleTupleIsub(self,*args):
+def MEDCouplingDataArrayDoubleTupleIsub(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayDoubleTuple____isub___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleTupleImul(self,*args):
+def MEDCouplingDataArrayDoubleTupleImul(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayDoubleTuple____imul___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleTupleIdiv(self,*args):
+def MEDCouplingDataArrayDoubleTupleIdiv(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayDoubleTuple____idiv___(self, self, *args)
-def ParaMEDMEMMEDCouplingFieldDoublenew(cls,*args):
+def MEDCouplingFieldDoublenew(cls,*args):
     import _MEDCalculator
     return _MEDCalculator.MEDCouplingFieldDouble____new___(cls,args)
-def ParaMEDMEMMEDCouplingFieldDoubleIadd(self,*args):
+def MEDCouplingFieldDoubleIadd(self,*args):
     import _MEDCalculator
     return _MEDCalculator.MEDCouplingFieldDouble____iadd___(self, self, *args)
-def ParaMEDMEMMEDCouplingFieldDoubleIsub(self,*args):
+def MEDCouplingFieldDoubleIsub(self,*args):
     import _MEDCalculator
     return _MEDCalculator.MEDCouplingFieldDouble____isub___(self, self, *args)
-def ParaMEDMEMMEDCouplingFieldDoubleImul(self,*args):
+def MEDCouplingFieldDoubleImul(self,*args):
     import _MEDCalculator
     return _MEDCalculator.MEDCouplingFieldDouble____imul___(self, self, *args)
-def ParaMEDMEMMEDCouplingFieldDoubleIdiv(self,*args):
+def MEDCouplingFieldDoubleIdiv(self,*args):
     import _MEDCalculator
     return _MEDCalculator.MEDCouplingFieldDouble____idiv___(self, self, *args)
-def ParaMEDMEMMEDCouplingFieldDoubleIpow(self,*args):
+def MEDCouplingFieldDoubleIpow(self,*args):
     import _MEDCalculator
     return _MEDCalculator.MEDCouplingFieldDouble____ipow___(self, self, *args)
-def ParaMEDMEMDataArrayIntnew(cls,*args):
+def MEDCouplingDataArrayIntnew(cls,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayInt____new___(cls,args)
-def ParaMEDMEMDataArrayIntIadd(self,*args):
+def MEDCouplingDataArrayIntIadd(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayInt____iadd___(self, self, *args)
-def ParaMEDMEMDataArrayIntIsub(self,*args):
+def MEDCouplingDataArrayIntIsub(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayInt____isub___(self, self, *args)
-def ParaMEDMEMDataArrayIntImul(self,*args):
+def MEDCouplingDataArrayIntImul(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayInt____imul___(self, self, *args)
-def ParaMEDMEMDataArrayIntIdiv(self,*args):
+def MEDCouplingDataArrayIntIdiv(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayInt____idiv___(self, self, *args)
-def ParaMEDMEMDataArrayIntImod(self,*args):
+def MEDCouplingDataArrayIntImod(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayInt____imod___(self, self, *args)
-def ParaMEDMEMDataArrayIntIpow(self,*args):
+def MEDCouplingDataArrayIntIpow(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayInt____ipow___(self, self, *args)
-def ParaMEDMEMDataArrayIntTupleIadd(self,*args):
+def MEDCouplingDataArrayIntTupleIadd(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayIntTuple____iadd___(self, self, *args)
-def ParaMEDMEMDataArrayIntTupleIsub(self,*args):
+def MEDCouplingDataArrayIntTupleIsub(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayIntTuple____isub___(self, self, *args)
-def ParaMEDMEMDataArrayIntTupleImul(self,*args):
+def MEDCouplingDataArrayIntTupleImul(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayIntTuple____imul___(self, self, *args)
-def ParaMEDMEMDataArrayIntTupleIdiv(self,*args):
+def MEDCouplingDataArrayIntTupleIdiv(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayIntTuple____idiv___(self, self, *args)
-def ParaMEDMEMDataArrayIntTupleImod(self,*args):
+def MEDCouplingDataArrayIntTupleImod(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DataArrayIntTuple____imod___(self, self, *args)
 def ParaMEDMEMDenseMatrixIadd(self,*args):
@@ -405,25 +405,25 @@ def ParaMEDMEMDenseMatrixIadd(self,*args):
 def ParaMEDMEMDenseMatrixIsub(self,*args):
     import _MEDCalculator
     return _MEDCalculator.DenseMatrix____isub___(self, self, *args)
-def ParaMEDMEMMEDCouplingUMeshnew(cls,*args):
+def MEDCouplingUMeshnew(cls,*args):
     import _MEDCalculator
     return _MEDCalculator.MEDCouplingUMesh____new___(cls,args)
-def ParaMEDMEMMEDCoupling1DGTUMeshnew(cls,*args):
+def MEDCoupling1DGTUMeshnew(cls,*args):
     import _MEDCalculator
     return _MEDCalculator.MEDCoupling1DGTUMesh____new___(cls,args)
-def ParaMEDMEMMEDCoupling1SGTUMeshnew(cls,*args):
+def MEDCoupling1SGTUMeshnew(cls,*args):
     import _MEDCalculator
     return _MEDCalculator.MEDCoupling1SGTUMesh____new___(cls,args)
-def ParaMEDMEMMEDCouplingCurveLinearMeshnew(cls,*args):
+def MEDCouplingCurveLinearMeshnew(cls,*args):
     import _MEDCalculator
     return _MEDCalculator.MEDCouplingCurveLinearMesh____new___(cls,args)
-def ParaMEDMEMMEDCouplingCMeshnew(cls,*args):
+def MEDCouplingCMeshnew(cls,*args):
     import _MEDCalculator
     return _MEDCalculator.MEDCouplingCMesh____new___(cls,args)
-def ParaMEDMEMMEDCouplingIMeshnew(cls,*args):
+def MEDCouplingIMeshnew(cls,*args):
     import _MEDCalculator
     return _MEDCalculator.MEDCouplingIMesh____new___(cls,args)
-def ParaMEDMEMMEDCouplingExtrudedMeshnew(cls,*args):
+def MEDCouplingExtrudedMeshnew(cls,*args):
     import _MEDCalculator
     return _MEDCalculator.MEDCouplingExtrudedMesh____new___(cls,args)
 %}
index 3b8458eed0459ba4d60721eec0954f23e93001f2..fe851e650986f4838179ccbfcb586a91a6412d83 100644 (file)
 
 #include <limits>
 
-static PyObject* convertMEDCalculatorDBField(ParaMEDMEM::MEDCalculatorDBField *f, int owner)
+static PyObject* convertMEDCalculatorDBField(MEDCoupling::MEDCalculatorDBField *f, int owner)
 {
   PyObject *ret=0;
-  if(dynamic_cast<ParaMEDMEM::MEDCalculatorDBFieldReal *>(f))
-    ret=SWIG_NewPointerObj((void*)f,SWIGTYPE_p_ParaMEDMEM__MEDCalculatorDBFieldReal,owner);
-  if(dynamic_cast<ParaMEDMEM::MEDCalculatorDBFieldCst *>(f))
-    ret=SWIG_NewPointerObj((void*)f,SWIGTYPE_p_ParaMEDMEM__MEDCalculatorDBFieldCst,owner);
+  if(dynamic_cast<MEDCoupling::MEDCalculatorDBFieldReal *>(f))
+    ret=SWIG_NewPointerObj((void*)f,SWIGTYPE_p_MEDCoupling__MEDCalculatorDBFieldReal,owner);
+  if(dynamic_cast<MEDCoupling::MEDCalculatorDBFieldCst *>(f))
+    ret=SWIG_NewPointerObj((void*)f,SWIGTYPE_p_MEDCoupling__MEDCalculatorDBFieldCst,owner);
   return ret;
 }
 
-void convertPyObjToRS(PyObject *o, ParaMEDMEM::MEDCalculatorDBRangeSelection& rs)
+void convertPyObjToRS(PyObject *o, MEDCoupling::MEDCalculatorDBRangeSelection& rs)
 {
   if(PyInt_Check(o))
     {
@@ -47,7 +47,7 @@ void convertPyObjToRS(PyObject *o, ParaMEDMEM::MEDCalculatorDBRangeSelection& rs
   PyErr_SetString(PyExc_TypeError,"Range selection must be an integer or a string !");
 }
 
-void convertPyObjToRS2(PyObject *o, ParaMEDMEM::MEDCalculatorDBRangeSelection& rs, const char *msg)
+void convertPyObjToRS2(PyObject *o, MEDCoupling::MEDCalculatorDBRangeSelection& rs, const char *msg)
 {
   if(PyInt_Check(o))
     {
index fe036e3538a7d6b1688625fd152a77c2709c6c6b..1b0a7f82795c972766f2eab8660e8ec9ced98524 100644 (file)
@@ -25,7 +25,7 @@
 #include <sstream>
 #include <algorithm>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 const char *SPythonInterpreter::INDENT_TOKEN[]={"def","class","for","if","while","try","except"};
 
index d2704472405c7db98f127b86deabea9fcb27efab..3e7851b9ce5f58fdcd86a32f2010e795e53cfc33 100644 (file)
@@ -38,7 +38,7 @@
 #include <vector>
 #include <set>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCALCULATORSPYTHON_EXPORT SPythonInterpreter
   {
index 0f31ad5dc52b57a59418aed03c7305f2cba472a8..d0eca64f3c4e89407aa0b8e84c13f256b0a53bd0 100644 (file)
@@ -25,7 +25,7 @@
 #include <algorithm>
 #include <sstream>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 const char SPythonPredParser::FIELD_TYPE_STR[]="MEDCalculatorDBField";
 
index 4bce8e7393a320987193a0a4d1b19707c012a0b3..f84fdb8044af941369c6f36ddf2357eea215bf8c 100644 (file)
@@ -37,7 +37,7 @@
 #include <string>
 #include <vector>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   typedef enum
     {
index f8551715017ee6ec43aeeb287a91e85186630788..d0759f9efb82fcf87ca08f63f79b70afc69eb04d 100644 (file)
@@ -34,7 +34,7 @@ void runInFileAndQuit(PyObject *glob, PyObject *loc, const char *fileName)
   std::ifstream ifs(fileName);
   ifs.exceptions( std::ifstream::badbit );
   char *line=new char[MAX_LINE+1];
-  ParaMEDMEM::SPythonInterpreter interp(glob,loc);
+  MEDCoupling::SPythonInterpreter interp(glob,loc);
   bool isspython;
   while(!ifs.eof())
     {
@@ -49,7 +49,7 @@ void runInInteractiveMode(PyObject *glob, PyObject *loc)
 {
   std::string s;
   char *line=new char[MAX_LINE+1];
-  ParaMEDMEM::SPythonInterpreter interp(glob,loc);
+  MEDCoupling::SPythonInterpreter interp(glob,loc);
   bool isInterp=true;
   while(true)
     {
index 6b4fa7f9272469b003ea3ecafb699a39414163f7..4e2699c401ad93ff9d16004b54bad6b70c7dccff 100644 (file)
@@ -34,7 +34,7 @@
 
 #include <iostream>
 
-void ParaMEDMEM::MEDCalculatorBasicsTest::testLightStruct1()
+void MEDCoupling::MEDCalculatorBasicsTest::testLightStruct1()
 {
   const char fname[]="/export/home/geay/MEDStdAlone/Salome5/V5_1_main/MED/MED_INSTALL_DEBUG/share/salome/resources/med/TimeStamps_import22.med";
   MEDCalculatorBrowserLiteStruct lt(fname);
@@ -42,7 +42,7 @@ void ParaMEDMEM::MEDCalculatorBasicsTest::testLightStruct1()
   //std::cout << lt.str() << std::endl;
 }
 
-void ParaMEDMEM::MEDCalculatorBasicsTest::testRangeSelection1()
+void MEDCoupling::MEDCalculatorBasicsTest::testRangeSelection1()
 {
   MEDCalculatorDBRangeSelection sel1(":");
   std::vector<int> v=sel1.getIds(6);
@@ -81,7 +81,7 @@ void ParaMEDMEM::MEDCalculatorBasicsTest::testRangeSelection1()
   CPPUNIT_ASSERT(exc); exc=false;
 }
 
-void ParaMEDMEM::MEDCalculatorBasicsTest::testDBField1()
+void MEDCoupling::MEDCalculatorBasicsTest::testDBField1()
 {
   const char fName[]="hfile1.med";
   generateAFile1(fName);
@@ -108,7 +108,7 @@ void ParaMEDMEM::MEDCalculatorBasicsTest::testDBField1()
   Power->decrRef();
 }
 
-void ParaMEDMEM::MEDCalculatorBasicsTest::generateAFile1(const char *fName)
+void MEDCoupling::MEDCalculatorBasicsTest::generateAFile1(const char *fName)
 {
   double targetCoords[18]={-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2, 0.7,0.2, -0.3,0.7, 0.2,0.7, 0.7,0.7 };
   int targetConn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
@@ -130,7 +130,7 @@ void ParaMEDMEM::MEDCalculatorBasicsTest::generateAFile1(const char *fName)
   m->setCoords(myCoords);
   myCoords->decrRef();
   //
-  MEDLoader::WriteUMesh(fName,m,true);
+  WriteUMesh(fName,m,true);
   static const int nbOfTimeSteps=10;
   static const int nbOfComponents=7;
   MEDCouplingFieldDouble *f=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME);
@@ -150,83 +150,83 @@ void ParaMEDMEM::MEDCalculatorBasicsTest::generateAFile1(const char *fName)
         for(int k=0;k<nbOfComponents;k++,pt++)
           *pt=(i+1)*100.+(j+1)*10.+k+1;
       f->setTime(i*0.1,i,-i);
-      MEDLoader::WriteFieldUsingAlreadyWrittenMesh(fName,f);
+      WriteFieldUsingAlreadyWrittenMesh(fName,f);
     }
   da->decrRef();
   f->decrRef();
   m->decrRef();
 }
 
-void ParaMEDMEM::MEDCalculatorBasicsTest::testSPython1()
+void MEDCoupling::MEDCalculatorBasicsTest::testSPython1()
 {
   std::string s1,s2;
   bool b;
   s1="12:3";
-  CPPUNIT_ASSERT(ParaMEDMEM::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
+  CPPUNIT_ASSERT(MEDCoupling::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
   CPPUNIT_ASSERT(!b);
   CPPUNIT_ASSERT_EQUAL(s2,s1);
   s1="12:";
-  CPPUNIT_ASSERT(ParaMEDMEM::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
+  CPPUNIT_ASSERT(MEDCoupling::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
   CPPUNIT_ASSERT(!b);
   CPPUNIT_ASSERT_EQUAL(s2,s1);
   s1="12";
-  CPPUNIT_ASSERT(ParaMEDMEM::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
+  CPPUNIT_ASSERT(MEDCoupling::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
   CPPUNIT_ASSERT(b);
   CPPUNIT_ASSERT_EQUAL(s2,s1);
   s1="";
-  CPPUNIT_ASSERT(!ParaMEDMEM::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
+  CPPUNIT_ASSERT(!MEDCoupling::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
   s1="          ";
-  CPPUNIT_ASSERT(!ParaMEDMEM::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
+  CPPUNIT_ASSERT(!MEDCoupling::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
   s1=":";
-  CPPUNIT_ASSERT(ParaMEDMEM::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
+  CPPUNIT_ASSERT(MEDCoupling::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
   CPPUNIT_ASSERT(!b);
   CPPUNIT_ASSERT_EQUAL(s2,s1);
   s1=":12";
-  CPPUNIT_ASSERT(ParaMEDMEM::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
+  CPPUNIT_ASSERT(MEDCoupling::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
   CPPUNIT_ASSERT(!b);
   CPPUNIT_ASSERT_EQUAL(s2,s1);
   s1=":12:";
-  CPPUNIT_ASSERT(!ParaMEDMEM::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
+  CPPUNIT_ASSERT(!MEDCoupling::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
   s1=":12   23";
-  CPPUNIT_ASSERT(!ParaMEDMEM::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
+  CPPUNIT_ASSERT(!MEDCoupling::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
   // some ' ' char
   s1="  12  : 3  ";
-  CPPUNIT_ASSERT(ParaMEDMEM::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
+  CPPUNIT_ASSERT(MEDCoupling::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
   CPPUNIT_ASSERT(!b);
   CPPUNIT_ASSERT_EQUAL(s2,std::string("12:3"));
   s1="  12  : 3";
-  CPPUNIT_ASSERT(ParaMEDMEM::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
+  CPPUNIT_ASSERT(MEDCoupling::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
   CPPUNIT_ASSERT(!b);
   CPPUNIT_ASSERT_EQUAL(s2,std::string("12:3"));
   s1="  12  :3  ";
-  CPPUNIT_ASSERT(ParaMEDMEM::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
+  CPPUNIT_ASSERT(MEDCoupling::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
   CPPUNIT_ASSERT(!b);
   CPPUNIT_ASSERT_EQUAL(s2,std::string("12:3"));
   s1="  12: 3  ";
-  CPPUNIT_ASSERT(ParaMEDMEM::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
+  CPPUNIT_ASSERT(MEDCoupling::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
   CPPUNIT_ASSERT(!b);
   CPPUNIT_ASSERT_EQUAL(s2,std::string("12:3"));
   s1="12  : 3  ";
-  CPPUNIT_ASSERT(ParaMEDMEM::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
+  CPPUNIT_ASSERT(MEDCoupling::SPythonParser::isElementInParenthesisMatching(s1,s2,b));
   CPPUNIT_ASSERT(!b);
   CPPUNIT_ASSERT_EQUAL(s2,std::string("12:3"));
 }
 
-void ParaMEDMEM::MEDCalculatorBasicsTest::testSPython2()
+void MEDCoupling::MEDCalculatorBasicsTest::testSPython2()
 {
   std::string s1,s2;
   s1="  12:3  , : ,4  ";
-  CPPUNIT_ASSERT(ParaMEDMEM::SPythonParser::isParenthesisMatching(s1,s2));
+  CPPUNIT_ASSERT(MEDCoupling::SPythonParser::isParenthesisMatching(s1,s2));
   CPPUNIT_ASSERT_EQUAL(s2,std::string("\"12:3\",\":\",4"));
 }
 
-void ParaMEDMEM::MEDCalculatorBasicsTest::testSPython3()
+void MEDCoupling::MEDCalculatorBasicsTest::testSPython3()
 {
   std::string s1,s2;
   s1="(  12:3  , : ,4  )";
-  s2=ParaMEDMEM::SPythonInterpreter::strip(s1);
+  s2=MEDCoupling::SPythonInterpreter::strip(s1);
   CPPUNIT_ASSERT_EQUAL(s2,std::string("(12:3,:,4)"));
   s1=" (  12:3  , : ,4  )  ";
-  s2=ParaMEDMEM::SPythonInterpreter::strip(s1);
+  s2=MEDCoupling::SPythonInterpreter::strip(s1);
   CPPUNIT_ASSERT_EQUAL(s2,std::string("(12:3,:,4)"));
 }
index a2ff055ca319017b625eb3f624a412b5f3aa289c..71369571e2a992baf3f34371c29e75093f9e8d5f 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCalculatorBasicsTest : public CppUnit::TestFixture
   {
index 5502d4382b3eefdc3cfb6462daab8c6b77ab56ab..3f7f68fd89896c399770fc4c200af4fc88403f18 100644 (file)
@@ -21,6 +21,6 @@
 #include "CppUnitTest.hxx"
 #include "MEDCalculatorBasicsTest.hxx"
 
-CPPUNIT_TEST_SUITE_REGISTRATION( ParaMEDMEM::MEDCalculatorBasicsTest );
+CPPUNIT_TEST_SUITE_REGISTRATION( MEDCoupling::MEDCalculatorBasicsTest );
 
 #include "BasicMainTest.hxx"
index fbdfd54e02020b8ba4fd2d3dc9b56acc87fa8a60..0e38edd66acc19d4af99fca27cc9f08250dcd8e6 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <vector>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 DataArrayDouble *DataArrayDoubleClient::New(SALOME_MED::DataArrayDoubleCorbaInterface_ptr dadPtr)
 {
index ca9f8989ee400a7fec33cb8c2f199bf00dc48255..cd9270a3797876619f77bd73b35561432c97e9a0 100644 (file)
@@ -28,7 +28,7 @@
 #include CORBA_SERVER_HEADER(MEDCouplingCorbaServant)
 #include "MEDCouplingClient.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class DataArrayDouble;
 
index af81a6c0ddcd2e6f9eb6817178e994dbffad8a5a..c7967554c164560fe415331d1c805bd776897098 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <vector>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 DataArrayInt *DataArrayIntClient::New(SALOME_MED::DataArrayIntCorbaInterface_ptr dadPtr)
 {
index ac5883e1a4c9857d2ce31c08fde4d1f46726f22d..41b019f2cba7592db3a734fa43f694d0b856fa66 100644 (file)
@@ -28,7 +28,7 @@
 #include CORBA_SERVER_HEADER(MEDCouplingCorbaServant)
 #include "MEDCouplingClient.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class DataArrayInt;
 
index 7db41084e3cfa5c39e52ff108d08315080ea8a66..6c17d4df0521bacc673ce3f91ef274bb287afc06 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <vector>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCoupling1DGTUMesh *MEDCoupling1DGTUMeshClient::New(SALOME_MED::MEDCoupling1DGTUMeshCorbaInterface_ptr meshPtr)
 {
index 61f85e26741c3bc83167a3a235db218c268bbdde..32c1f36984c42419acea713ad083e8a273c7385d 100644 (file)
@@ -28,7 +28,7 @@
 #include CORBA_SERVER_HEADER(MEDCouplingCorbaServant)
 #include "MEDCouplingClient.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCoupling1DGTUMesh;
 
index 3fb4b7f6c246fa9dd7049d0cc60c02740556130e..02581565bdf4648ba8622c7b245e296a579e57e2 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <vector>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCoupling1SGTUMesh *MEDCoupling1SGTUMeshClient::New(SALOME_MED::MEDCoupling1SGTUMeshCorbaInterface_ptr meshPtr)
 {
index 31200cdf8960f26cb53848a72a84813d3647abda..13057fb098a1090358730253b2c18e4b53117831 100644 (file)
@@ -28,7 +28,7 @@
 #include CORBA_SERVER_HEADER(MEDCouplingCorbaServant)
 #include "MEDCouplingClient.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCoupling1SGTUMesh;
 
index 56597d9c2a3b4133930b14b31238f85ec48ee306..e2fc9adf07e3cd8aaee993d9b1040cbd72cb8e95 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <vector>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingCMesh *MEDCouplingCMeshClient::New(SALOME_MED::MEDCouplingCMeshCorbaInterface_ptr meshPtr)
 {
index 361bc3b4f2e464cbd04ccbca76143148cdd40981..1d5b98a82ffd86ffa2745f88b57108a202f9103e 100644 (file)
@@ -28,7 +28,7 @@
 #include CORBA_SERVER_HEADER(MEDCouplingCorbaServant)
 #include "MEDCouplingClient.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingCMesh;
 
index 0110c2960ebd874b59abb68831905de2922d1c38..9694a4981669d712fc5d682d6652a84683fc9e51 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <vector>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingCurveLinearMesh *MEDCouplingCurveLinearMeshClient::New(SALOME_MED::MEDCouplingCurveLinearMeshCorbaInterface_ptr meshPtr)
 {
index 2313df6625fa1c62062c6edfe9cbc2e3cad3d127..d57c0178f37973f6ed29d7e466228527b48de996 100644 (file)
@@ -28,7 +28,7 @@
 #include CORBA_SERVER_HEADER(MEDCouplingCorbaServant)
 #include "MEDCouplingClient.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingCurveLinearMesh;
 
index 817b436d827e8fa84e1fb9002eacdd8aeac0703b..9e5ea4c028319cfd8af064873d1172a413b41836 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <vector>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingExtrudedMesh *MEDCouplingExtrudedMeshClient::New(SALOME_MED::MEDCouplingExtrudedMeshCorbaInterface_ptr meshPtr)
 {
index 2d4407bc75c1abecdec3436dca264d6498868f3c..1e8c3fbb86fade6b1402504bda5dced4d9eec13b 100644 (file)
@@ -28,7 +28,7 @@
 #include CORBA_SERVER_HEADER(MEDCouplingCorbaServant)
 #include "MEDCouplingClient.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingExtrudedMesh;
 
index 938f3907d62626b823519f3959649a90b31fbab3..7fc086247af6538dc3fbd5adc2bfc82bc1c6fce9 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <vector>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingFieldDouble *MEDCouplingFieldDoubleClient::New(SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr fieldPtr)
 {
index 71fcd23727f8f7cb3aa3fa576ad9a146ca7e95d1..8966f78e88943f4b7aa55f536a39d4be8b4cebc0 100644 (file)
@@ -29,7 +29,7 @@
 #include "MEDCouplingClient.hxx"
 #include "MEDCouplingFieldDouble.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingFieldDoubleClient : public MEDCouplingFieldDouble
   {
index 40ba20007457fd5601ba20ec6b410118c9ff2364..532bbd606b5ea3c0823cdad30677d12d9a75509a 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <vector>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingFieldOverTimeClient::MEDCouplingFieldOverTimeClient(SALOME_MED::MEDCouplingFieldOverTimeCorbaInterface_ptr field):_df(0)
 {
index 515c2cd1a011e72618e026593ba2ef45052852fe..b0f066c07c58fe408863d03fe29828637dbe3138 100644 (file)
@@ -29,7 +29,7 @@
 #include "MEDCouplingClient.hxx"
 #include "MEDCouplingFieldOverTime.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingDefinitionTime;
 
index b02b7629ca11dca30ceea1a9e08b3f846593c5b4..e201d0828e5b1bc5cbfe52385460bb6702d2d5d9 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <vector>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingFieldTemplate *MEDCouplingFieldTemplateClient::New(SALOME_MED::MEDCouplingFieldTemplateCorbaInterface_ptr fieldPtr)
 {
index 143771e145036ef1da07a5b8d81f76a1f758a340..2986f85b50cbaff4aadfeaaca9d8dcf032e6f48e 100644 (file)
@@ -29,7 +29,7 @@
 #include "MEDCouplingClient.hxx"
 #include "MEDCouplingFieldTemplate.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingFieldTemplateClient : public MEDCouplingFieldTemplate
   {
index bb66f4537af978105025a7ade22ecef447f84ef8..91c58a3ae4e032eeef564fd38d4aa771ed8afea8 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <vector>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingIMesh *MEDCouplingIMeshClient::New(SALOME_MED::MEDCouplingIMeshCorbaInterface_ptr meshPtr)
 {
index 9d63f03c45da8bcad4492aefd1e007ae42f2b84b..f7d1a37dff453e2a7babf9e3d2d11c3e7cae0c5a 100644 (file)
@@ -28,7 +28,7 @@
 #include CORBA_SERVER_HEADER(MEDCouplingCorbaServant)
 #include "MEDCouplingClient.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingIMesh;
 
index 63c348ef81401dcd4161575809c7c67477889e2c..f50932a597fa525bda962f945571ad3fde6203f2 100644 (file)
@@ -35,7 +35,7 @@
 
 #include <vector>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingMesh *MEDCouplingMeshClient::New(SALOME_MED::MEDCouplingMeshCorbaInterface_ptr meshPtr)
 {
index 1c82ed4db589b4b49fb02541c2aa94db8e89f9e0..0c04648eb85650c8193ca4dac5331cc86f2b1344 100644 (file)
@@ -28,7 +28,7 @@
 #include CORBA_SERVER_HEADER(MEDCouplingCorbaServant)
 #include "MEDCouplingClient.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingMesh;
 
index 07296971c59042c18ee7954cb31295f0c406714a..a97f91b8562f881c69686327bc1ad63dff5da43d 100644 (file)
@@ -27,7 +27,7 @@
 
 #include <vector>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingMultiFields *MEDCouplingMultiFieldsClient::New(SALOME_MED::MEDCouplingMultiFieldsCorbaInterface_ptr fieldPtr)
 {
index f30e8492b2ec4db561f37fd79ff94864e7c77cc9..9784d918583c24ed2bd26b27a44788cf8617d3fe 100644 (file)
@@ -29,7 +29,7 @@
 #include "MEDCouplingClient.hxx"
 #include "MEDCouplingMultiFields.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingMultiFieldsClient : public MEDCouplingMultiFields
   {
index d755fae5a4e93e49c3547e253dfbfff64ab719bd..c138e4b2536ffc76c12e2b0aa78b7b1a59cdd625 100644 (file)
@@ -24,7 +24,7 @@
 
 #include <vector>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingUMesh *MEDCouplingUMeshClient::New(SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr meshPtr)
 {
index 2ef386d2f6d91fb96510144828100e5e74ba7307..938e600b67f78b7f35b324fc65159e698d380a0f 100644 (file)
@@ -28,7 +28,7 @@
 #include CORBA_SERVER_HEADER(MEDCouplingCorbaServant)
 #include "MEDCouplingClient.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingUMesh;
 
index 2d53754da58d10759d6597c8454d2896e64b7a52..3a794a9364cf8d0a211d67b7ccfc9d438ebb42f6 100644 (file)
@@ -21,7 +21,7 @@
 #include "DataArrayDoubleServant.hxx"
 #include "MEDCouplingMemArray.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 DataArrayDoubleServant::DataArrayDoubleServant(const DataArrayDouble *cppPointer):DataArrayServant(cppPointer)
 {
index 2daefbe3c250497eb8790a32885fb350163f6d28..10c07bca5a47708f5c2597a769bbbefbeadbfc1d 100644 (file)
@@ -29,7 +29,7 @@
 #include "MEDCouplingCorba.hxx"
 #include "DataArrayServant.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class DataArrayDouble;
 
index f48f3abf46f2b9e5a78ce77f79c38e3d8ae2aabb..0541156326dd680acacabfbe210365163d17e23a 100644 (file)
@@ -21,7 +21,7 @@
 #include "DataArrayIntServant.hxx"
 #include "MEDCouplingMemArray.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 DataArrayIntServant::DataArrayIntServant(const DataArrayInt *cppPointer):DataArrayServant(cppPointer)
 {
index d5b320982ff9ebc954cdf93f042a263dbd197275..88965a54b5a8fb809a81f03bdf592f94fe073d7d 100644 (file)
@@ -29,7 +29,7 @@
 #include "MEDCouplingCorba.hxx"
 #include "DataArrayServant.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class DataArrayInt;
 
index 1ecf5821a642374a739c070b87f8b3a9eb60e0ff..0222403c5bf74a3da97f20b5ab3af8af874dd42e 100644 (file)
@@ -21,7 +21,7 @@
 #include "DataArrayServant.hxx"
 #include "MEDCouplingMemArray.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 DataArrayServant::DataArrayServant(const DataArray *cppPointer):MEDCouplingRefCountServant(cppPointer,cppPointer)
 {
index 1348fbefb65541f22213ab22c19011b0c90d4472..46e19fcf602b9d8ad6f1868c2d4623a9865a82bf 100644 (file)
@@ -29,7 +29,7 @@
 #include "MEDCouplingCorba.hxx"
 #include "MEDCouplingRefCountServant.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class DataArray;
 
index 6c879148d8e1c722801aa68bf97ed162a64908b9..ec1f964c859034476eb84a5cdffd2d35bb0e3193 100644 (file)
@@ -21,7 +21,7 @@
 #include "MEDCoupling1DGTUMeshServant.hxx"
 #include "MEDCoupling1GTUMesh.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCoupling1DGTUMeshServant::MEDCoupling1DGTUMeshServant(const MEDCoupling1DGTUMesh *cppPointerOfMesh):MEDCoupling1GTUMeshServant(cppPointerOfMesh)
 {
index 79ea26a7c16709f3860ca331d239fe1550dc5f1c..6d15b1bd74404c2695361981b1f80971b475ae7c 100644 (file)
@@ -29,7 +29,7 @@
 #include "MEDCoupling1GTUMeshServant.hxx"
 #include "MEDCouplingCorba.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCoupling1DGTUMesh;
 
index 469c88903d478453c27c4b313e400750b0d254be..02580ff4e42bf4e6ebe7cb7ce82a819c42f93024 100644 (file)
@@ -21,7 +21,7 @@
 #include "MEDCoupling1GTUMeshServant.hxx"
 #include "MEDCoupling1GTUMesh.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCoupling1GTUMeshServant::MEDCoupling1GTUMeshServant(const MEDCoupling1GTUMesh *cppPointerOfMesh):MEDCouplingPointSetServant(cppPointerOfMesh)
 {
index 430d9dd759138b8d84992009e33beb13c9f5555f..6f16a1b16bbb368833a3a083bd1a7db1eeed5435 100644 (file)
@@ -29,7 +29,7 @@
 #include "MEDCouplingPointSetServant.hxx"
 #include "MEDCouplingCorba.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCoupling1GTUMesh;
 
index eb9095a01fc184fc3e012f5518fdf5719c6fdafe..6ed2ce5391713c605ccc71c4bf1c1c65b779298c 100644 (file)
@@ -21,7 +21,7 @@
 #include "MEDCoupling1SGTUMeshServant.hxx"
 #include "MEDCoupling1GTUMesh.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCoupling1SGTUMeshServant::MEDCoupling1SGTUMeshServant(const MEDCoupling1SGTUMesh *cppPointerOfMesh):MEDCoupling1GTUMeshServant(cppPointerOfMesh)
 {
index d2a430f488afc7c8721c88130024b351204fc29d..6e3bbd1ea0f57a15a7be436df51d245ce6ad982a 100644 (file)
@@ -29,7 +29,7 @@
 #include "MEDCoupling1GTUMeshServant.hxx"
 #include "MEDCouplingCorba.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCoupling1SGTUMesh;
 
index d85a591da67a5bba44c8fb18136e160fc0851bf5..f2058da8ed40e2a1cd561e7310fb823f72f790be 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "MEDCouplingCMesh.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingCMeshServant::MEDCouplingCMeshServant(const MEDCouplingCMesh *cppPointerOfMesh):MEDCouplingStructuredMeshServant(cppPointerOfMesh)
 {
index c7874bb2cc8a6611a467d5edb79a0303c8e59dff..2f6ac08ea204b8cba00ec55e3d9db2cb3593e206 100644 (file)
@@ -27,7 +27,7 @@
 #include "MEDCouplingStructuredMeshServant.hxx"
 #include "MEDCouplingCorba.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingCMesh;
 
index 9171a980f99735838cf5f077da7491a381bd74bd..8457a073930584aa568a8bcc2794ef13ac2c63d8 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "MEDCouplingCurveLinearMesh.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingCurveLinearMeshServant::MEDCouplingCurveLinearMeshServant(const MEDCouplingCurveLinearMesh *cppPointerOfMesh):MEDCouplingStructuredMeshServant(cppPointerOfMesh)
 {
index cbdff81bf4a9353415b239e5768f2889783dc998..f54daaea05a580815c9ce0a7e8969a0817673509 100644 (file)
@@ -27,7 +27,7 @@
 #include "MEDCouplingStructuredMeshServant.hxx"
 #include "MEDCouplingCorba.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingCurveLinearMesh;
 
index c61603db12001f1f5460dbdcaa5ab03e8d54f3e2..30065937e5bf63db839169a7a1a2140c5ec87c87 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "MEDCouplingExtrudedMesh.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingExtrudedMeshServant::MEDCouplingExtrudedMeshServant(const MEDCouplingExtrudedMesh *cppPointerOfMesh):MEDCouplingMeshServant(cppPointerOfMesh)
 {
index 99b15457c1b0822634b1769aa366e93c9fa1c295..1439c49735068ebb374f948a372da86057794a96 100644 (file)
@@ -27,7 +27,7 @@
 #include "MEDCouplingMeshServant.hxx"
 #include "MEDCouplingCorba.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingExtrudedMesh;
 
index 3465033ff892bf027fbef280a65578054dbc7ccb..6002cf4de898d166342084ef4735e52d08fa5744 100644 (file)
@@ -21,7 +21,7 @@
 #include "MEDCouplingFieldDoubleServant.hxx"
 #include "MEDCouplingFieldDouble.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingFieldDoubleServant::MEDCouplingFieldDoubleServant(const MEDCouplingFieldDouble *cppPointerOfMesh):MEDCouplingFieldServant(cppPointerOfMesh)
 {
index e758f32a3ce0346dd60a66353794574bf2ce20aa..ed4950a0c3bd28e9255dfa7b13bdf35858242a5d 100644 (file)
@@ -32,7 +32,7 @@
 
 #include <vector>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class RefCountObject;
   class MEDCouplingFieldDouble;
index 1965286ca915bb463d09a6ed84311ee7cc600d37..020e3f16e668d1574bdae7c8e5b95b20cd047224 100644 (file)
@@ -25,7 +25,7 @@
 #include "MEDCouplingFieldTemplate.hxx"
 #include "MEDCouplingMemArray.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingFieldOverTimeServant::MEDCouplingFieldOverTimeServant(const MEDCouplingFieldOverTime *cppPointer):MEDCouplingMultiFieldsServant(cppPointer)
 {
index 23d4068a886d5f9795764ba1340d20e7b4f98d45..a4eaa93bab4392dc1d180bdcf5a6cbc424aa5b34 100644 (file)
@@ -30,7 +30,7 @@
 #include "MEDCouplingMultiFieldsServant.hxx"
 #include "MEDCouplingFieldOverTime.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCOUPLINGCORBA_EXPORT MEDCouplingFieldOverTimeServant : public MEDCouplingMultiFieldsServant,
                                                                   public virtual POA_SALOME_MED::MEDCouplingFieldOverTimeCorbaInterface
index 02ae338ea44b1471eac236cbc49e836c1df56c72..ed834924d47410bb0f5901c57f9792bb58445139 100644 (file)
@@ -35,7 +35,7 @@
 #include "MEDCouplingExtrudedMesh.hxx"
 #include "MEDCoupling1GTUMesh.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingFieldServant::MEDCouplingFieldServant(const MEDCouplingField *cppPointerOfMesh):MEDCouplingRefCountServant(cppPointerOfMesh,cppPointerOfMesh)
 {
index b2f948affdaaf79fa8d509b828bb8c70e9f0770e..9fc758a244b987eb04f3a7982345bd47127c0130 100644 (file)
@@ -29,7 +29,7 @@
 #include "MEDCouplingCorba.hxx"
 #include "MEDCouplingRefCountServant.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingMesh;
   class MEDCouplingField;
index 534dc50e8f314a37e730ac5ede8f59ca114ba3d5..f95424c9b6ac7f7ca6dbf53d98291c4dd41307c2 100644 (file)
@@ -23,7 +23,7 @@
 
 #include "MEDCouplingMemArray.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingFieldTemplateServant::MEDCouplingFieldTemplateServant(const MEDCouplingFieldTemplate *cppPointerOfMesh):MEDCouplingFieldServant(cppPointerOfMesh)
 {
index ffe1fd1d358ebc339aa6794fd81aa5a3332a1ab0..bfcdb24eedc53e931f4be2b2b2899b0ebcdededd 100644 (file)
@@ -32,7 +32,7 @@
 
 #include <vector>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class RefCountObject;
   class MEDCouplingFieldTemplate;
index da7826fe1318af52d83e8eaf5a6618f6f0974adb..398dea97fab7235cef55b19e80d025382210eced 100644 (file)
@@ -22,7 +22,7 @@
 
 #include "MEDCouplingIMesh.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingIMeshServant::MEDCouplingIMeshServant(const MEDCouplingIMesh *cppPointerOfMesh):MEDCouplingStructuredMeshServant(cppPointerOfMesh)
 {
index 1a00bcd4090ad8aa7afa59ecb4b226f07436fd17..fcf0b83b19fa4ebf2ea0fe1413579ebd73d047a2 100644 (file)
@@ -27,7 +27,7 @@
 #include "MEDCouplingStructuredMeshServant.hxx"
 #include "MEDCouplingCorba.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingIMesh;
 
index 99aa03611cabdf3b264eae09e883f889a6bf5b8a..046bdb1139fe123ddb6dda3921b172480dfd89d3 100644 (file)
@@ -23,7 +23,7 @@
 #include "MEDCouplingMesh.hxx"
 #include "MEDCouplingMemArray.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingMeshServant::MEDCouplingMeshServant(const MEDCouplingMesh *cppPointerOfMesh):MEDCouplingRefCountServant(cppPointerOfMesh,cppPointerOfMesh)
 {
index 000aeab73461d4e2391c24cab568aea10e310371..5394c0cf8422aa109997753f7bb547c380a5f935 100644 (file)
@@ -29,7 +29,7 @@
 #include "MEDCouplingRefCountServant.hxx"
 #include "MEDCouplingCorba.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingMesh;
 
index 5330f16329e943b01d632fee7bcb379e30607002..f521bc69aa5d3beeabb37bd35bdf558af415140d 100644 (file)
@@ -26,7 +26,7 @@
 #include "MEDCouplingFieldTemplate.hxx"
 #include "MEDCouplingMemArray.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingMultiFieldsServant::MEDCouplingMultiFieldsServant(const MEDCouplingMultiFields *cppPointer):MEDCouplingRefCountServant(cppPointer,cppPointer)
 {
index 5215ee02a79b1082a19eeea28f1bfc9986962f91..3339ba72f6abfc3bd7a5dc51a34db6172b376637 100644 (file)
@@ -32,7 +32,7 @@
 
 #include <vector>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class RefCountObject;
   class MEDCouplingMultiFields;
index 3cfb9fea99f906f00942731b069675384a123997..cc33be89502d4239b34379f10edeb16ac074f727 100644 (file)
@@ -22,7 +22,7 @@
 #include "MEDCouplingPointSet.hxx"
 #include "DataArrayDoubleServant.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingPointSetServant::MEDCouplingPointSetServant(const MEDCouplingPointSet *cppPointerOfMesh):MEDCouplingMeshServant(cppPointerOfMesh)
 {
index 20a0f79416f2680109d3939b4a98846b582b10bb..7aae859e4cadc1aba99d088a456b610cffebe8d8 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <vector>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingPointSet;
   class DataArrayInt;
index 376a0f89221c8d6eb8bc1322c9800ce51a40c538..b8a4f3870d58d80144019b7bca82c79bca3d872c 100644 (file)
@@ -25,7 +25,7 @@
 
 #include <iostream>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingRefCountServant::MEDCouplingRefCountServant(const RefCountObject *pointer, const TimeLabel *pointer2):_ref_counter(1),
                                                                                                                  _cpp_pointer(pointer),
index 05ea0394f2b5b38fab811de0deb0b1d99905032c..faa702c352afdaa7d03aee89ac526923153b8a75 100644 (file)
@@ -26,7 +26,7 @@
 #include CORBA_SERVER_HEADER(MEDCouplingCorbaServant)
 #include "MEDCouplingCorba.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class TimeLabel;
   class RefCountObject;
index cb0a01283e1cf3e4f3fcfd3232404825e83fc1f4..e72e525a97b28cc70ebc5db97af67bb8b7bd7a27 100644 (file)
@@ -21,7 +21,7 @@
 #include "MEDCouplingStructuredMeshServant.hxx"
 #include "MEDCouplingStructuredMesh.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingStructuredMeshServant::MEDCouplingStructuredMeshServant(const MEDCouplingStructuredMesh *cppPointerOfMesh):MEDCouplingMeshServant(cppPointerOfMesh)
 {
index b4dcaf271345ddcb43c6e065f8c6abe1e0ccb0ac..31e8ba977dd8ca9d2737aeef5549979b4d58674c 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <vector>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingStructuredMesh;
   class DataArrayInt;
index a272e86057023c84e7c846d9b21e1aed33f8e5d1..01580bc0e8fc85e0910805e2e12190d5c471625c 100644 (file)
@@ -21,7 +21,7 @@
 #include "MEDCouplingUMeshServant.hxx"
 #include "MEDCouplingUMesh.hxx"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 MEDCouplingUMeshServant::MEDCouplingUMeshServant(const MEDCouplingUMesh *cppPointerOfMesh):MEDCouplingPointSetServant(cppPointerOfMesh)
 {
index 4266bef0b4ba73fb9be9fa43858216d598ff6d0d..431c64561f9e4b92d5a8c053141110199adf1178 100644 (file)
@@ -29,7 +29,7 @@
 #include "MEDCouplingPointSetServant.hxx"
 #include "MEDCouplingCorba.hxx"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingUMesh;
 
index 986dbb4a9d03389e68946fc15c24b92aeb9f1e77..21acc1b960ac7125df9f2c06503096c1784f4bac 100644 (file)
 
 namespace SALOME_TEST
 {
-  ParaMEDMEM::MEDCouplingUMesh *MEDCouplingCorbaServBasicsTest::build1DMesh()
+  MEDCoupling::MEDCouplingUMesh *MEDCouplingCorbaServBasicsTest::build1DMesh()
   {
     double coords[4]={ 0.0, 0.3, 0.75, 1.0 };
     int conn[2*3]={ 0,1, 1,2, 2,3 };
-    ParaMEDMEM::MEDCouplingUMesh *mesh=ParaMEDMEM::MEDCouplingUMesh::New("1DMeshForCorba",1);
+    MEDCoupling::MEDCouplingUMesh *mesh=MEDCoupling::MEDCouplingUMesh::New("1DMeshForCorba",1);
     mesh->setDescription("build1DMesh");
     mesh->allocateCells(3);
     mesh->setTime(5.6,7,8);
@@ -49,7 +49,7 @@ namespace SALOME_TEST
     mesh->insertNextCell(INTERP_KERNEL::NORM_SEG2,2,conn+2);
     mesh->insertNextCell(INTERP_KERNEL::NORM_SEG2,2,conn+4);
     mesh->finishInsertingCells();
-    ParaMEDMEM::DataArrayDouble *myCoords=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *myCoords=MEDCoupling::DataArrayDouble::New();
     myCoords->alloc(4,1);
     std::copy(coords,coords+4,myCoords->getPointer());
     mesh->setCoords(myCoords);
@@ -65,11 +65,11 @@ namespace SALOME_TEST
     return mesh;
   }
 
-  ParaMEDMEM::MEDCouplingUMesh *MEDCouplingCorbaServBasicsTest::build2DMesh()
+  MEDCoupling::MEDCouplingUMesh *MEDCouplingCorbaServBasicsTest::build2DMesh()
   {
     double targetCoords[18]={-0.3,-0.3, 0.2,-0.3, 0.7,-0.3, -0.3,0.2, 0.2,0.2, 0.7,0.2, -0.3,0.7, 0.2,0.7, 0.7,0.7 };
     int targetConn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
-    ParaMEDMEM::MEDCouplingUMesh *targetMesh=ParaMEDMEM::MEDCouplingUMesh::New();
+    MEDCoupling::MEDCouplingUMesh *targetMesh=MEDCoupling::MEDCouplingUMesh::New();
     targetMesh->setMeshDimension(2);
     targetMesh->setName("MyMesh2D");
     targetMesh->setDescription("build2DMesh");
@@ -80,7 +80,7 @@ namespace SALOME_TEST
     targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+10);
     targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+14);
     targetMesh->finishInsertingCells();
-    ParaMEDMEM::DataArrayDouble *myCoords=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *myCoords=MEDCoupling::DataArrayDouble::New();
     myCoords->alloc(9,2);
     std::copy(targetCoords,targetCoords+18,myCoords->getPointer());
     targetMesh->setCoords(myCoords);
@@ -88,14 +88,14 @@ namespace SALOME_TEST
     return targetMesh;
   }
 
-  ParaMEDMEM::MEDCouplingUMesh *MEDCouplingCorbaServBasicsTest::build3DMesh()
+  MEDCoupling::MEDCouplingUMesh *MEDCouplingCorbaServBasicsTest::build3DMesh()
   {
     double targetCoords[81]={ 0., 0., 0., 50., 0., 0. , 200., 0., 0.  , 0., 50., 0., 50., 50., 0. , 200., 50., 0.,   0., 200., 0., 50., 200., 0. , 200., 200., 0. ,
                               0., 0., 50., 50., 0., 50. , 200., 0., 50.  , 0., 50., 50., 50., 50., 50. , 200., 50., 50.,   0., 200., 50., 50., 200., 50. , 200., 200., 50. ,
                               0., 0., 200., 50., 0., 200. , 200., 0., 200.  , 0., 50., 200., 50., 50., 200. , 200., 50., 200.,   0., 200., 200., 50., 200., 200. , 200., 200., 200. };
     int targetConn[64]={0,1,4,3,9,10,13,12, 1,2,5,4,10,11,14,13, 3,4,7,6,12,13,16,15, 4,5,8,7,13,14,17,16,
                         9,10,13,12,18,19,22,21, 10,11,14,13,19,20,23,22, 12,13,16,15,21,22,25,24, 13,14,17,16,22,23,26,25};
-    ParaMEDMEM::MEDCouplingUMesh *targetMesh=ParaMEDMEM::MEDCouplingUMesh::New();
+    MEDCoupling::MEDCouplingUMesh *targetMesh=MEDCoupling::MEDCouplingUMesh::New();
     targetMesh->setMeshDimension(3);
     targetMesh->setName("MyMesh3D");
     targetMesh->setDescription("build3DMesh");
@@ -103,7 +103,7 @@ namespace SALOME_TEST
     for(int i=0;i<8;i++)
       targetMesh->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,targetConn+8*i);
     targetMesh->finishInsertingCells();
-    ParaMEDMEM::DataArrayDouble *myCoords=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *myCoords=MEDCoupling::DataArrayDouble::New();
     myCoords->alloc(27,3);
     std::copy(targetCoords,targetCoords+81,myCoords->getPointer());
     targetMesh->setCoords(myCoords);
@@ -112,11 +112,11 @@ namespace SALOME_TEST
     return targetMesh;
   }
 
-  ParaMEDMEM::MEDCouplingUMesh *MEDCouplingCorbaServBasicsTest::build3DSurfMesh()
+  MEDCoupling::MEDCouplingUMesh *MEDCouplingCorbaServBasicsTest::build3DSurfMesh()
   {
     double targetCoords[27]={-0.3,-0.3,0.5, 0.2,-0.3,1., 0.7,-0.3,1.5, -0.3,0.2,0.5, 0.2,0.2,1., 0.7,0.2,1.5, -0.3,0.7,0.5, 0.2,0.7,1., 0.7,0.7,1.5};
     int targetConn[18]={0,3,4,1, 1,4,2, 4,5,2, 6,7,4,3, 7,8,5,4};
-    ParaMEDMEM::MEDCouplingUMesh *targetMesh=ParaMEDMEM::MEDCouplingUMesh::New();
+    MEDCoupling::MEDCouplingUMesh *targetMesh=MEDCoupling::MEDCouplingUMesh::New();
     targetMesh->setMeshDimension(2);
     targetMesh->setName("MyMesh3DSurf");
     targetMesh->setDescription("build3DSurfMesh");
@@ -127,7 +127,7 @@ namespace SALOME_TEST
     targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+10);
     targetMesh->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,targetConn+14);
     targetMesh->finishInsertingCells();
-    ParaMEDMEM::DataArrayDouble *myCoords=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *myCoords=MEDCoupling::DataArrayDouble::New();
     myCoords->alloc(9,3);
     std::copy(targetCoords,targetCoords+27,myCoords->getPointer());
     targetMesh->setCoords(myCoords);
@@ -138,11 +138,11 @@ namespace SALOME_TEST
     return targetMesh;
   }
 
-  ParaMEDMEM::MEDCouplingUMesh *MEDCouplingCorbaServBasicsTest::build0DMesh()
+  MEDCoupling::MEDCouplingUMesh *MEDCouplingCorbaServBasicsTest::build0DMesh()
   {
     double targetCoords[27]={-0.3,-0.3,0.5, 0.2,-0.3,1., 0.7,-0.3,1.5, -0.3,0.2,0.5, 0.2,0.2,1., 0.7,0.2,1.5, -0.3,0.7,0.5, 0.2,0.7,1., 0.7,0.7,1.5};
     const int targetConn[]={0,1,2,3,4,5,7,6};
-    ParaMEDMEM::MEDCouplingUMesh *targetMesh=ParaMEDMEM::MEDCouplingUMesh::New();
+    MEDCoupling::MEDCouplingUMesh *targetMesh=MEDCoupling::MEDCouplingUMesh::New();
     targetMesh->setMeshDimension(0);
     targetMesh->allocateCells(8);
     targetMesh->setName("Wonderfull 0D mesh");
@@ -156,7 +156,7 @@ namespace SALOME_TEST
     targetMesh->insertNextCell(INTERP_KERNEL::NORM_POINT1,1,targetConn+6);
     targetMesh->insertNextCell(INTERP_KERNEL::NORM_POINT1,1,targetConn+7);
     targetMesh->finishInsertingCells();
-    ParaMEDMEM::DataArrayDouble *myCoords=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *myCoords=MEDCoupling::DataArrayDouble::New();
     myCoords->alloc(9,3);
     std::copy(targetCoords,targetCoords+27,myCoords->getPointer());
     targetMesh->setCoords(myCoords);
@@ -169,41 +169,41 @@ namespace SALOME_TEST
     return targetMesh;
   }
 
-  ParaMEDMEM::MEDCouplingUMesh *MEDCouplingCorbaServBasicsTest::buildM1DMesh()
+  MEDCoupling::MEDCouplingUMesh *MEDCouplingCorbaServBasicsTest::buildM1DMesh()
   {
-    ParaMEDMEM::MEDCouplingUMesh *meshM1D=ParaMEDMEM::MEDCouplingUMesh::New("wonderfull -1 D mesh",-1);
+    MEDCoupling::MEDCouplingUMesh *meshM1D=MEDCoupling::MEDCouplingUMesh::New("wonderfull -1 D mesh",-1);
     meshM1D->setDescription("buildM1DMesh");
     meshM1D->checkCoherency();
     return meshM1D;
   }
 
-  ParaMEDMEM::MEDCouplingExtrudedMesh *MEDCouplingCorbaServBasicsTest::buildExtrudedMesh(ParaMEDMEM::MEDCouplingUMesh *&m2D)
+  MEDCoupling::MEDCouplingExtrudedMesh *MEDCouplingCorbaServBasicsTest::buildExtrudedMesh(MEDCoupling::MEDCouplingUMesh *&m2D)
   {
     m2D=build2DMesh();
     m2D->changeSpaceDimension(3);
-    ParaMEDMEM::MEDCouplingUMesh *m1D=build1DMesh();
-    ParaMEDMEM::MEDCouplingUMesh *retu=m2D->buildExtrudedMesh(m1D,0);
+    MEDCoupling::MEDCouplingUMesh *m1D=build1DMesh();
+    MEDCoupling::MEDCouplingUMesh *retu=m2D->buildExtrudedMesh(m1D,0);
     m1D->decrRef();
-    ParaMEDMEM::MEDCouplingExtrudedMesh *ret=ParaMEDMEM::MEDCouplingExtrudedMesh::New(retu,m2D,2);
+    MEDCoupling::MEDCouplingExtrudedMesh *ret=MEDCoupling::MEDCouplingExtrudedMesh::New(retu,m2D,2);
     ret->setName("ExtrudedTestForCorbaTest");
     ret->setDescription("buildExtrudedMesh");
     retu->decrRef();
     return ret;
   }
 
-  ParaMEDMEM::MEDCouplingCMesh *MEDCouplingCorbaServBasicsTest::buildCMesh()
+  MEDCoupling::MEDCouplingCMesh *MEDCouplingCorbaServBasicsTest::buildCMesh()
   {
-    ParaMEDMEM::MEDCouplingCMesh *targetMesh=ParaMEDMEM::MEDCouplingCMesh::New();
+    MEDCoupling::MEDCouplingCMesh *targetMesh=MEDCoupling::MEDCouplingCMesh::New();
     targetMesh->setTime(2.3,4,5);
     targetMesh->setTimeUnit("us");
     targetMesh->setName("Example of CMesh");
     targetMesh->setDescription("buildCMesh");
-    ParaMEDMEM::DataArrayDouble *a1=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *a1=MEDCoupling::DataArrayDouble::New();
     a1->alloc(5,1);
     a1->setInfoOnComponent(0,"SmthX");
     const double a1Data[5]={3.,4.,5.,6.,7.};
     std::copy(a1Data,a1Data+5,a1->getPointer());
-    ParaMEDMEM::DataArrayDouble *a2=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *a2=MEDCoupling::DataArrayDouble::New();
     a2->alloc(6,1);
     a2->setInfoOnComponent(0,"SmthZ");
     const double a2Data[6]={2.78,3.,4.,5.,6.,7.};
@@ -221,9 +221,9 @@ namespace SALOME_TEST
   }
     
 
-  ParaMEDMEM::MEDCouplingIMesh *MEDCouplingCorbaServBasicsTest::buildIMesh()
+  MEDCoupling::MEDCouplingIMesh *MEDCouplingCorbaServBasicsTest::buildIMesh()
   {
-    ParaMEDMEM::MEDCouplingIMesh *targetMesh(ParaMEDMEM::MEDCouplingIMesh::New());
+    MEDCoupling::MEDCouplingIMesh *targetMesh(MEDCoupling::MEDCouplingIMesh::New());
     targetMesh->setTime(2.3,4,5);
     targetMesh->setTimeUnit("us");
     targetMesh->setName("Example of IMesh");
@@ -239,14 +239,14 @@ namespace SALOME_TEST
     return targetMesh;
   }
 
-  ParaMEDMEM::MEDCouplingCurveLinearMesh *MEDCouplingCorbaServBasicsTest::buildCLMesh()
+  MEDCoupling::MEDCouplingCurveLinearMesh *MEDCouplingCorbaServBasicsTest::buildCLMesh()
   {
-    ParaMEDMEM::MEDCouplingCurveLinearMesh *targetMesh=ParaMEDMEM::MEDCouplingCurveLinearMesh::New();
+    MEDCoupling::MEDCouplingCurveLinearMesh *targetMesh=MEDCoupling::MEDCouplingCurveLinearMesh::New();
     targetMesh->setTime(2.3,4,5);
     targetMesh->setTimeUnit("us");
     targetMesh->setName("Example of Cuve linear mesh");
     targetMesh->setDescription("buildCLMesh");
-    ParaMEDMEM::DataArrayDouble *a1=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *a1=MEDCoupling::DataArrayDouble::New();
     a1->alloc(3*20,1);
     a1->iota(7.);
     a1->rearrange(3);
@@ -260,17 +260,17 @@ namespace SALOME_TEST
     return targetMesh;
   }
 
-  ParaMEDMEM::MEDCoupling1SGTUMesh *MEDCouplingCorbaServBasicsTest::build1SGTUMesh()
+  MEDCoupling::MEDCoupling1SGTUMesh *MEDCouplingCorbaServBasicsTest::build1SGTUMesh()
   {
-    ParaMEDMEM::MEDCoupling1SGTUMesh *targetMesh=ParaMEDMEM::MEDCoupling1SGTUMesh::New("Mesh1SGT",INTERP_KERNEL::NORM_QUAD4);
+    MEDCoupling::MEDCoupling1SGTUMesh *targetMesh=MEDCoupling::MEDCoupling1SGTUMesh::New("Mesh1SGT",INTERP_KERNEL::NORM_QUAD4);
     targetMesh->setTime(2.3,44,-55);
     targetMesh->setTimeUnit("us");
     targetMesh->setDescription("My Description of 1SGTU");
-    ParaMEDMEM::DataArrayDouble *a1=ParaMEDMEM::DataArrayDouble::New(); a1->alloc(10,3); a1->setInfoOnComponent(0,"X1 [m]");  a1->setInfoOnComponent(1,"YY2 [km]"); a1->setInfoOnComponent(2,"ZZZ3 [km]");
+    MEDCoupling::DataArrayDouble *a1=MEDCoupling::DataArrayDouble::New(); a1->alloc(10,3); a1->setInfoOnComponent(0,"X1 [m]");  a1->setInfoOnComponent(1,"YY2 [km]"); a1->setInfoOnComponent(2,"ZZZ3 [km]");
     const double coords[30]={1.,1.,0.,2.,1.,0.,3.,1.,0.,1.,0.,0.,2.,0.,0.,0.,0.,0.,0.,1.,0.,3.,0.,0.,4.,0.,0.,4.,1.,0.};
     const int conn[16]={6,0,3,5,3,0,1,4,1,2,7,4,8,7,2,9};
     std::copy(coords,coords+30,a1->getPointer()); targetMesh->setCoords(a1); a1->decrRef();
-    ParaMEDMEM::DataArrayInt *a2(ParaMEDMEM::DataArrayInt::New()); a2->alloc(4*4,1);
+    MEDCoupling::DataArrayInt *a2(MEDCoupling::DataArrayInt::New()); a2->alloc(4*4,1);
     std::copy(conn,conn+16,a2->getPointer());
     targetMesh->setNodalConnectivity(a2); a2->decrRef();
     //
@@ -279,20 +279,20 @@ namespace SALOME_TEST
     return targetMesh;
   }
   
-  ParaMEDMEM::MEDCoupling1DGTUMesh *MEDCouplingCorbaServBasicsTest::build1DGTUMesh()
+  MEDCoupling::MEDCoupling1DGTUMesh *MEDCouplingCorbaServBasicsTest::build1DGTUMesh()
   {
-    ParaMEDMEM::MEDCoupling1DGTUMesh *targetMesh=ParaMEDMEM::MEDCoupling1DGTUMesh::New("Mesh1DGT",INTERP_KERNEL::NORM_POLYGON);
+    MEDCoupling::MEDCoupling1DGTUMesh *targetMesh=MEDCoupling::MEDCoupling1DGTUMesh::New("Mesh1DGT",INTERP_KERNEL::NORM_POLYGON);
     targetMesh->setTime(2.3,55,-66);
     targetMesh->setTimeUnit("us");
     targetMesh->setDescription("My Description of 1DGTU");
-    ParaMEDMEM::DataArrayDouble *a1=ParaMEDMEM::DataArrayDouble::New(); a1->alloc(10,3); a1->setInfoOnComponent(0,"X1 [m]");  a1->setInfoOnComponent(1,"YY2 [km]"); a1->setInfoOnComponent(2,"ZZZ3 [km]");
+    MEDCoupling::DataArrayDouble *a1=MEDCoupling::DataArrayDouble::New(); a1->alloc(10,3); a1->setInfoOnComponent(0,"X1 [m]");  a1->setInfoOnComponent(1,"YY2 [km]"); a1->setInfoOnComponent(2,"ZZZ3 [km]");
     const double coords[30]={1.,1.,0.,2.,1.,0.,3.,1.,0.,1.,0.,0.,2.,0.,0.,0.,0.,0.,0.,1.,0.,3.,0.,0.,4.,0.,0.,4.,1.,0.};
     const int conn[15]={6,0,3,5,3,0,1,4,1,2,7,4,8,7,2};
     const int conni[5]={0,4,8,12,15};
     std::copy(coords,coords+30,a1->getPointer()); targetMesh->setCoords(a1); a1->decrRef();
-    ParaMEDMEM::DataArrayInt *a2(ParaMEDMEM::DataArrayInt::New()); a2->alloc(15,1);
+    MEDCoupling::DataArrayInt *a2(MEDCoupling::DataArrayInt::New()); a2->alloc(15,1);
     std::copy(conn,conn+15,a2->getPointer());
-    ParaMEDMEM::DataArrayInt *a3(ParaMEDMEM::DataArrayInt::New()); a3->alloc(5,1);
+    MEDCoupling::DataArrayInt *a3(MEDCoupling::DataArrayInt::New()); a3->alloc(5,1);
     std::copy(conni,conni+5,a3->getPointer());
     targetMesh->setNodalConnectivity(a2,a3); a2->decrRef(); a3->decrRef();
     //
@@ -301,14 +301,14 @@ namespace SALOME_TEST
     return targetMesh;
   }
 
-  ParaMEDMEM::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldScalarOn2DNT()
+  MEDCoupling::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldScalarOn2DNT()
   {
-    ParaMEDMEM::MEDCouplingUMesh *mesh=build2DMesh();
-    ParaMEDMEM::MEDCouplingFieldDouble *fieldOnCells=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_CELLS,ParaMEDMEM::NO_TIME);
+    MEDCoupling::MEDCouplingUMesh *mesh=build2DMesh();
+    MEDCoupling::MEDCouplingFieldDouble *fieldOnCells=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_CELLS,MEDCoupling::NO_TIME);
     fieldOnCells->setTimeUnit("ms");
     fieldOnCells->setName("toto");
     fieldOnCells->setMesh(mesh);
-    ParaMEDMEM::DataArrayDouble *array=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *array=MEDCoupling::DataArrayDouble::New();
     array->alloc(mesh->getNumberOfCells(),6);
     fieldOnCells->setArray(array);
     double *tmp=array->getPointer();
@@ -319,15 +319,15 @@ namespace SALOME_TEST
     return fieldOnCells;
   }
 
-  ParaMEDMEM::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldNodeScalarOn2DNT()
+  MEDCoupling::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldNodeScalarOn2DNT()
   {
-    ParaMEDMEM::MEDCouplingUMesh *mesh=build2DMesh();
-    ParaMEDMEM::MEDCouplingFieldDouble *fieldOnNodes=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_NODES,ParaMEDMEM::NO_TIME);
+    MEDCoupling::MEDCouplingUMesh *mesh=build2DMesh();
+    MEDCoupling::MEDCouplingFieldDouble *fieldOnNodes=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_NODES,MEDCoupling::NO_TIME);
     fieldOnNodes->setName("toto2");
     fieldOnNodes->setTimeUnit("s");
     fieldOnNodes->setDescription("my wonderful field toto2");
     fieldOnNodes->setMesh(mesh);
-    ParaMEDMEM::DataArrayDouble *array=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *array=MEDCoupling::DataArrayDouble::New();
     array->alloc(mesh->getNumberOfNodes(),5);
     fieldOnNodes->setArray(array);
     double *tmp=array->getPointer();
@@ -338,15 +338,15 @@ namespace SALOME_TEST
     return fieldOnNodes;
   }
 
-  ParaMEDMEM::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DNT()
+  MEDCoupling::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DNT()
   {
-    ParaMEDMEM::MEDCouplingUMesh *mesh=build3DMesh();
-    ParaMEDMEM::MEDCouplingFieldDouble *fieldOnCells=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_CELLS,ParaMEDMEM::NO_TIME);
-    fieldOnCells->setNature(ParaMEDMEM::ConservativeVolumic);
+    MEDCoupling::MEDCouplingUMesh *mesh=build3DMesh();
+    MEDCoupling::MEDCouplingFieldDouble *fieldOnCells=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_CELLS,MEDCoupling::NO_TIME);
+    fieldOnCells->setNature(MEDCoupling::ConservativeVolumic);
     fieldOnCells->setName("toto");
     fieldOnCells->setDescription("my wonderful 3D field toto2");
     fieldOnCells->setMesh(mesh);
-    ParaMEDMEM::DataArrayDouble *array=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *array=MEDCoupling::DataArrayDouble::New();
     array->alloc(mesh->getNumberOfCells(),6);
     fieldOnCells->setArray(array);
     double *tmp=array->getPointer();
@@ -357,15 +357,15 @@ namespace SALOME_TEST
     return fieldOnCells;
   }
 
-  ParaMEDMEM::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DSurfWT()
+  MEDCoupling::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DSurfWT()
   {
-    ParaMEDMEM::MEDCouplingUMesh *mesh=build3DSurfMesh();
-    ParaMEDMEM::MEDCouplingFieldDouble *fieldOnCells=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_CELLS,ParaMEDMEM::ONE_TIME);
+    MEDCoupling::MEDCouplingUMesh *mesh=build3DSurfMesh();
+    MEDCoupling::MEDCouplingFieldDouble *fieldOnCells=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_CELLS,MEDCoupling::ONE_TIME);
     fieldOnCells->setName("toto25");
     fieldOnCells->setDescription("my wonderful 3D surf field toto25");
     fieldOnCells->setTimeUnit("us");
     fieldOnCells->setMesh(mesh);
-    ParaMEDMEM::DataArrayDouble *array=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *array=MEDCoupling::DataArrayDouble::New();
     array->alloc(mesh->getNumberOfCells(),3);
     array->setInfoOnComponent(0,"aaa"); array->setInfoOnComponent(1,"bbbb"); array->setInfoOnComponent(2,"ccccc");
     fieldOnCells->setArray(array);
@@ -378,15 +378,15 @@ namespace SALOME_TEST
     return fieldOnCells;
   }
 
-  ParaMEDMEM::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DSurfCOTI()
+  MEDCoupling::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DSurfCOTI()
   {
-    ParaMEDMEM::MEDCouplingUMesh *mesh=build3DSurfMesh();
-    ParaMEDMEM::MEDCouplingFieldDouble *fieldOnCells=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_CELLS,ParaMEDMEM::CONST_ON_TIME_INTERVAL);
+    MEDCoupling::MEDCouplingUMesh *mesh=build3DSurfMesh();
+    MEDCoupling::MEDCouplingFieldDouble *fieldOnCells=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_CELLS,MEDCoupling::CONST_ON_TIME_INTERVAL);
     fieldOnCells->setName("toto26");
     fieldOnCells->setDescription("my wonderful 3D surf field toto26");
     fieldOnCells->setTimeUnit("us");
     fieldOnCells->setMesh(mesh);
-    ParaMEDMEM::DataArrayDouble *array=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *array=MEDCoupling::DataArrayDouble::New();
     array->alloc(mesh->getNumberOfCells(),3);
     fieldOnCells->setArray(array);
     double *tmp=array->getPointer();
@@ -399,22 +399,22 @@ namespace SALOME_TEST
     return fieldOnCells;
   }
 
-  ParaMEDMEM::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldScalarOn2DLT()
+  MEDCoupling::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldScalarOn2DLT()
   {
-    ParaMEDMEM::MEDCouplingUMesh *mesh=build2DMesh();
-    ParaMEDMEM::MEDCouplingFieldDouble *fieldOnCells=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_CELLS,ParaMEDMEM::LINEAR_TIME);
+    MEDCoupling::MEDCouplingUMesh *mesh=build2DMesh();
+    MEDCoupling::MEDCouplingFieldDouble *fieldOnCells=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_CELLS,MEDCoupling::LINEAR_TIME);
     fieldOnCells->setName("toto27");
     fieldOnCells->setDescription("my wonderful 2D field toto27");
     fieldOnCells->setTimeUnit("ms");
     fieldOnCells->setMesh(mesh);
-    ParaMEDMEM::DataArrayDouble *array1=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *array1=MEDCoupling::DataArrayDouble::New();
     array1->alloc(mesh->getNumberOfCells(),4);
     fieldOnCells->setArray(array1);
     double *tmp=array1->getPointer();
     array1->decrRef();
     const double arr1[20]={1.2,1.02,1.002,1.0002, 3.4,3.04,3.004,3.0004, 5.6,5.06,5.006,5.0006, 7.8,7.08,7.008,7.0008, 9.1,9.01,9.001,9.0001};
     std::copy(arr1,arr1+20,tmp);
-    ParaMEDMEM::DataArrayDouble *array2=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *array2=MEDCoupling::DataArrayDouble::New();
     array2->alloc(mesh->getNumberOfCells(),4);
     fieldOnCells->setEndArray(array2);
     tmp=array2->getPointer();
@@ -428,7 +428,7 @@ namespace SALOME_TEST
     return fieldOnCells;
   }
 
-  ParaMEDMEM::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldGaussPt2DWT()
+  MEDCoupling::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldGaussPt2DWT()
   {
     const double _a=0.446948490915965;
     const double _b=0.091576213509771;
@@ -441,8 +441,8 @@ namespace SALOME_TEST
     std::vector<double> _refCoo1(refCoo1,refCoo1+6);
     std::vector<double> _gsCoo1(gsCoo1,gsCoo1+12);
     std::vector<double> _wg1(wg1,wg1+6);
-    ParaMEDMEM::MEDCouplingUMesh *m=build2DMesh();
-    ParaMEDMEM::MEDCouplingFieldDouble *f=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_GAUSS_PT,ParaMEDMEM::ONE_TIME);
+    MEDCoupling::MEDCouplingUMesh *m=build2DMesh();
+    MEDCoupling::MEDCouplingFieldDouble *f=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_GAUSS_PT,MEDCoupling::ONE_TIME);
     f->setTime(6.7,1,4);
     f->setMesh(m);
     m->decrRef();
@@ -451,7 +451,7 @@ namespace SALOME_TEST
     std::vector<double> _refCoo2(refCoo2,refCoo2+8);
     _gsCoo1.resize(4); _wg1.resize(2);
     f->setGaussLocalizationOnType(INTERP_KERNEL::NORM_QUAD4,_refCoo2,_gsCoo1,_wg1);
-    ParaMEDMEM::DataArrayDouble *array=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *array=MEDCoupling::DataArrayDouble::New();
     array->alloc(18,2);
     array->setInfoOnComponent(0,"Power [MW]");
     array->setInfoOnComponent(1,"Density [kg/m^3]");
@@ -467,16 +467,16 @@ namespace SALOME_TEST
     return f;
   }
 
-  ParaMEDMEM::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldGaussPtNE2DWT()
+  MEDCoupling::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldGaussPtNE2DWT()
   {
-    ParaMEDMEM::MEDCouplingUMesh *m=build2DMesh();
-    ParaMEDMEM::MEDCouplingFieldDouble *f=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_GAUSS_NE,ParaMEDMEM::ONE_TIME);
+    MEDCoupling::MEDCouplingUMesh *m=build2DMesh();
+    MEDCoupling::MEDCouplingFieldDouble *f=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_GAUSS_NE,MEDCoupling::ONE_TIME);
     f->setTime(6.8,11,8);
     f->setMesh(m);
     f->setTimeUnit("ms");
     f->setName("MyFirstFieldOnNE");
     f->setDescription("MyDescriptionNE");
-    ParaMEDMEM::DataArrayDouble *array=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *array=MEDCoupling::DataArrayDouble::New();
     array->alloc(18,2);
     array->setInfoOnComponent(0,"Power [MW]");
     array->setInfoOnComponent(1,"Density [kg/m^3]");
@@ -491,17 +491,17 @@ namespace SALOME_TEST
     return f;
   }
 
-  ParaMEDMEM::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldVectorOnExtrudedWT()
+  MEDCoupling::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldVectorOnExtrudedWT()
   {
-    ParaMEDMEM::MEDCouplingUMesh *m2D=0;
-    ParaMEDMEM::MEDCouplingExtrudedMesh *ext=buildExtrudedMesh(m2D);
+    MEDCoupling::MEDCouplingUMesh *m2D=0;
+    MEDCoupling::MEDCouplingExtrudedMesh *ext=buildExtrudedMesh(m2D);
     //
-    ParaMEDMEM::MEDCouplingFieldDouble *f=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_CELLS,ParaMEDMEM::ONE_TIME);
+    MEDCoupling::MEDCouplingFieldDouble *f=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_CELLS,MEDCoupling::ONE_TIME);
     f->setTime(6.8,11,8);
     f->setMesh(ext);
     f->setName("MyFieldOnExtruM");
     f->setDescription("desc of MyFiOnExtruM");
-    ParaMEDMEM::DataArrayDouble *array=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *array=MEDCoupling::DataArrayDouble::New();
     int nbOfCells=ext->getNumberOfCells();
     array->alloc(nbOfCells,2);
     array->setInfoOnComponent(0,"Power [MW]");
@@ -519,16 +519,16 @@ namespace SALOME_TEST
     return f;
   }
 
-  ParaMEDMEM::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldVectorOnCMeshWT()
+  MEDCoupling::MEDCouplingFieldDouble *MEDCouplingCorbaServBasicsTest::buildFieldVectorOnCMeshWT()
   {
-    ParaMEDMEM::MEDCouplingCMesh *m=buildCMesh();
-    ParaMEDMEM::MEDCouplingFieldDouble *f=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_CELLS,ParaMEDMEM::ONE_TIME);
+    MEDCoupling::MEDCouplingCMesh *m=buildCMesh();
+    MEDCoupling::MEDCouplingFieldDouble *f=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_CELLS,MEDCoupling::ONE_TIME);
     f->setTime(6.8,11,8);
     f->setMesh(m);
     m->decrRef();
     f->setName("MyFieldOnCMesh");
     f->setDescription("desc of MyFiOnCMesh");
-    ParaMEDMEM::DataArrayDouble *array=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *array=MEDCoupling::DataArrayDouble::New();
     int nbOfCells=m->getNumberOfCells();
     array->alloc(nbOfCells,2);
     array->setInfoOnComponent(0,"Power [GW]");
@@ -544,47 +544,47 @@ namespace SALOME_TEST
     return f;
   }
 
-  ParaMEDMEM::MEDCouplingFieldTemplate *MEDCouplingCorbaServBasicsTest::buildFieldTemplateCellOn2D()
+  MEDCoupling::MEDCouplingFieldTemplate *MEDCouplingCorbaServBasicsTest::buildFieldTemplateCellOn2D()
   {
-    ParaMEDMEM::MEDCouplingFieldDouble *f1=buildFieldScalarOn2DNT();
-    ParaMEDMEM::MEDCouplingFieldTemplate *f2=ParaMEDMEM::MEDCouplingFieldTemplate::New(*f1);
-    f2->setNature(ParaMEDMEM::NoNature);
+    MEDCoupling::MEDCouplingFieldDouble *f1=buildFieldScalarOn2DNT();
+    MEDCoupling::MEDCouplingFieldTemplate *f2=MEDCoupling::MEDCouplingFieldTemplate::New(*f1);
+    f2->setNature(MEDCoupling::NoNature);
     f1->decrRef();
     return f2;
   }
 
-  ParaMEDMEM::MEDCouplingFieldTemplate *MEDCouplingCorbaServBasicsTest::buildFieldTemplateNodeOn2D()
+  MEDCoupling::MEDCouplingFieldTemplate *MEDCouplingCorbaServBasicsTest::buildFieldTemplateNodeOn2D()
   {
-    ParaMEDMEM::MEDCouplingFieldDouble *f1=buildFieldNodeScalarOn2DNT();
-    ParaMEDMEM::MEDCouplingFieldTemplate *f2=ParaMEDMEM::MEDCouplingFieldTemplate::New(*f1);
-    f2->setNature(ParaMEDMEM::ConservativeVolumic);
+    MEDCoupling::MEDCouplingFieldDouble *f1=buildFieldNodeScalarOn2DNT();
+    MEDCoupling::MEDCouplingFieldTemplate *f2=MEDCoupling::MEDCouplingFieldTemplate::New(*f1);
+    f2->setNature(MEDCoupling::ConservativeVolumic);
     f1->decrRef();
     return f2;
   }
 
-  ParaMEDMEM::MEDCouplingFieldTemplate *MEDCouplingCorbaServBasicsTest::buildFieldTemplateGaussPtOn2D()
+  MEDCoupling::MEDCouplingFieldTemplate *MEDCouplingCorbaServBasicsTest::buildFieldTemplateGaussPtOn2D()
   {
-    ParaMEDMEM::MEDCouplingFieldDouble *f1=buildFieldGaussPt2DWT();
-    ParaMEDMEM::MEDCouplingFieldTemplate *f2=ParaMEDMEM::MEDCouplingFieldTemplate::New(*f1);
-    f2->setNature(ParaMEDMEM::Integral);
+    MEDCoupling::MEDCouplingFieldDouble *f1=buildFieldGaussPt2DWT();
+    MEDCoupling::MEDCouplingFieldTemplate *f2=MEDCoupling::MEDCouplingFieldTemplate::New(*f1);
+    f2->setNature(MEDCoupling::Integral);
     f1->decrRef();
     return f2;
   }
 
-  ParaMEDMEM::MEDCouplingFieldTemplate *MEDCouplingCorbaServBasicsTest::buildFieldTemplateGaussNEOn2D()
+  MEDCoupling::MEDCouplingFieldTemplate *MEDCouplingCorbaServBasicsTest::buildFieldTemplateGaussNEOn2D()
   {
-    ParaMEDMEM::MEDCouplingFieldDouble *f1=buildFieldGaussPtNE2DWT();
-    ParaMEDMEM::MEDCouplingFieldTemplate *f2=ParaMEDMEM::MEDCouplingFieldTemplate::New(*f1);
-    f2->setNature(ParaMEDMEM::IntegralGlobConstraint);
+    MEDCoupling::MEDCouplingFieldDouble *f1=buildFieldGaussPtNE2DWT();
+    MEDCoupling::MEDCouplingFieldTemplate *f2=MEDCoupling::MEDCouplingFieldTemplate::New(*f1);
+    f2->setNature(MEDCoupling::IntegralGlobConstraint);
     f1->decrRef();
     return f2;
   }
 
-  ParaMEDMEM::MEDCouplingMultiFields *MEDCouplingCorbaServBasicsTest::buildMultiFields1()
+  MEDCoupling::MEDCouplingMultiFields *MEDCouplingCorbaServBasicsTest::buildMultiFields1()
   {
-    ParaMEDMEM::MEDCouplingUMesh *m1=build2DMesh();
+    MEDCoupling::MEDCouplingUMesh *m1=build2DMesh();
     m1->setName("m1");
-    ParaMEDMEM::MEDCouplingUMesh *m2=build2DMesh();
+    MEDCoupling::MEDCouplingUMesh *m2=build2DMesh();
     m2->setName("m2");
     const double vals0[]={-0.7,-1.,-2.,-3.,-4.};
     const double vals1[]={0.,1.,2.,3.,4.,0.1,0.2,0.3,0.4};
@@ -592,11 +592,11 @@ namespace SALOME_TEST
     const double vals2[]={5.,6.,7.,8.,9.};
     const double vals4[]={15.,16.,17.,18.,19.};
     //
-    ParaMEDMEM::DataArrayDouble *d0=ParaMEDMEM::DataArrayDouble::New(); d0->alloc(5,1); std::copy(vals0,vals0+5,d0->getPointer());
-    ParaMEDMEM::DataArrayDouble *d1=ParaMEDMEM::DataArrayDouble::New(); d1->alloc(9,1); std::copy(vals1,vals1+9,d1->getPointer());
-    ParaMEDMEM::DataArrayDouble *d1_1=ParaMEDMEM::DataArrayDouble::New(); d1_1->alloc(9,1); std::copy(vals1_1,vals1_1+9,d1_1->getPointer());
-    ParaMEDMEM::DataArrayDouble *d2=ParaMEDMEM::DataArrayDouble::New(); d2->alloc(5,1); std::copy(vals2,vals2+5,d2->getPointer());
-    ParaMEDMEM::DataArrayDouble *d4=ParaMEDMEM::DataArrayDouble::New(); d4->alloc(5,1); std::copy(vals4,vals4+5,d4->getPointer());
+    MEDCoupling::DataArrayDouble *d0=MEDCoupling::DataArrayDouble::New(); d0->alloc(5,1); std::copy(vals0,vals0+5,d0->getPointer());
+    MEDCoupling::DataArrayDouble *d1=MEDCoupling::DataArrayDouble::New(); d1->alloc(9,1); std::copy(vals1,vals1+9,d1->getPointer());
+    MEDCoupling::DataArrayDouble *d1_1=MEDCoupling::DataArrayDouble::New(); d1_1->alloc(9,1); std::copy(vals1_1,vals1_1+9,d1_1->getPointer());
+    MEDCoupling::DataArrayDouble *d2=MEDCoupling::DataArrayDouble::New(); d2->alloc(5,1); std::copy(vals2,vals2+5,d2->getPointer());
+    MEDCoupling::DataArrayDouble *d4=MEDCoupling::DataArrayDouble::New(); d4->alloc(5,1); std::copy(vals4,vals4+5,d4->getPointer());
     //
     d0->setName("d0"); d1->setName("d1"); d1_1->setName("d1_1"); d2->setName("d2"); d4->setName("d4");
     d0->setInfoOnComponent(0,"c1");
@@ -605,37 +605,37 @@ namespace SALOME_TEST
     d2->setInfoOnComponent(0,"c5");
     d4->setInfoOnComponent(0,"c7");
     //
-    ParaMEDMEM::MEDCouplingFieldDouble *f0=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_CELLS,ParaMEDMEM::ONE_TIME);
+    MEDCoupling::MEDCouplingFieldDouble *f0=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_CELLS,MEDCoupling::ONE_TIME);
     f0->setMesh(m1);
     f0->setArray(d0);
     f0->setTime(0.2,5,6);
     f0->setName("f0");
-    ParaMEDMEM::MEDCouplingFieldDouble *f1=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_NODES,ParaMEDMEM::LINEAR_TIME);
+    MEDCoupling::MEDCouplingFieldDouble *f1=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_NODES,MEDCoupling::LINEAR_TIME);
     f1->setMesh(m1);
-    std::vector<ParaMEDMEM::DataArrayDouble *> d1s(2); d1s[0]=d1; d1s[1]=d1_1;
+    std::vector<MEDCoupling::DataArrayDouble *> d1s(2); d1s[0]=d1; d1s[1]=d1_1;
     f1->setArrays(d1s);
     f1->setStartTime(0.7,7,8);
     f1->setEndTime(1.2,9,10);
     f1->setName("f1");
-    ParaMEDMEM::MEDCouplingFieldDouble *f2=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_CELLS,ParaMEDMEM::CONST_ON_TIME_INTERVAL);
+    MEDCoupling::MEDCouplingFieldDouble *f2=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_CELLS,MEDCoupling::CONST_ON_TIME_INTERVAL);
     f2->setMesh(m2);
     f2->setArray(d2);
     f2->setTime(1.2,11,12);
     f2->setEndTime(1.5,13,14);
     f2->setName("f2");
-    ParaMEDMEM::MEDCouplingFieldDouble *f3=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_CELLS,ParaMEDMEM::ONE_TIME);
+    MEDCoupling::MEDCouplingFieldDouble *f3=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_CELLS,MEDCoupling::ONE_TIME);
     f3->setMesh(m1);
     f3->setArray(d2);
     f3->setTime(1.7,15,16);
     f3->setName("f3");
-    ParaMEDMEM::MEDCouplingFieldDouble *f4=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_CELLS,ParaMEDMEM::NO_TIME);
+    MEDCoupling::MEDCouplingFieldDouble *f4=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_CELLS,MEDCoupling::NO_TIME);
     f4->setMesh(m2);
     f4->setArray(d4);
     f4->setName("f4");
     //
-    std::vector<ParaMEDMEM::MEDCouplingFieldDouble *> fs(5);
+    std::vector<MEDCoupling::MEDCouplingFieldDouble *> fs(5);
     fs[0]=f0; fs[1]=f1; fs[2]=f2; fs[3]=f3; fs[4]=f4;
-    ParaMEDMEM::MEDCouplingMultiFields *ret=ParaMEDMEM::MEDCouplingMultiFields::New(fs);
+    MEDCoupling::MEDCouplingMultiFields *ret=MEDCoupling::MEDCouplingMultiFields::New(fs);
     //
     m1->decrRef();
     m2->decrRef();
@@ -653,9 +653,9 @@ namespace SALOME_TEST
     return ret;
   }
 
-  ParaMEDMEM::DataArrayDouble *MEDCouplingCorbaServBasicsTest::buildArrayDouble1()
+  MEDCoupling::DataArrayDouble *MEDCouplingCorbaServBasicsTest::buildArrayDouble1()
   {
-    ParaMEDMEM::DataArrayDouble *ret=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *ret=MEDCoupling::DataArrayDouble::New();
     ret->alloc(4,3);
     const double vals[12]={2.4,3.2,5.6,9.6,47.6,20.4,24.6,278.1,2.01,3.3,2.4,9.4};
     std::copy(vals,vals+12,ret->getPointer());
@@ -666,16 +666,16 @@ namespace SALOME_TEST
     return ret;
   }
 
-  ParaMEDMEM::DataArrayDouble *MEDCouplingCorbaServBasicsTest::buildArrayDouble2()
+  MEDCoupling::DataArrayDouble *MEDCouplingCorbaServBasicsTest::buildArrayDouble2()
   {
-    ParaMEDMEM::DataArrayDouble *ret=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *ret=MEDCoupling::DataArrayDouble::New();
     ret->setName("titi");
     return ret;
   }
 
-  ParaMEDMEM::DataArrayDouble *MEDCouplingCorbaServBasicsTest::buildArrayDouble3()
+  MEDCoupling::DataArrayDouble *MEDCouplingCorbaServBasicsTest::buildArrayDouble3()
   {
-    ParaMEDMEM::DataArrayDouble *ret=ParaMEDMEM::DataArrayDouble::New();
+    MEDCoupling::DataArrayDouble *ret=MEDCoupling::DataArrayDouble::New();
     ret->setName("titi");
     ret->alloc(0,3);
     ret->setInfoOnComponent(0,"sss");
@@ -684,9 +684,9 @@ namespace SALOME_TEST
     return ret;
   }
 
-  ParaMEDMEM::DataArrayInt *MEDCouplingCorbaServBasicsTest::buildArrayInt1()
+  MEDCoupling::DataArrayInt *MEDCouplingCorbaServBasicsTest::buildArrayInt1()
   {
-    ParaMEDMEM::DataArrayInt *ret=ParaMEDMEM::DataArrayInt::New();
+    MEDCoupling::DataArrayInt *ret=MEDCoupling::DataArrayInt::New();
     ret->alloc(4,3);
     const int vals[12]={2,3,5,9,47,20,24,278,2,3,2,9};
     std::copy(vals,vals+12,ret->getPointer());
@@ -697,16 +697,16 @@ namespace SALOME_TEST
     return ret;
   }
 
-  ParaMEDMEM::DataArrayInt *MEDCouplingCorbaServBasicsTest::buildArrayInt2()
+  MEDCoupling::DataArrayInt *MEDCouplingCorbaServBasicsTest::buildArrayInt2()
   {
-    ParaMEDMEM::DataArrayInt *ret=ParaMEDMEM::DataArrayInt::New();
+    MEDCoupling::DataArrayInt *ret=MEDCoupling::DataArrayInt::New();
     ret->setName("titi");
     return ret;
   }
 
-  ParaMEDMEM::DataArrayInt *MEDCouplingCorbaServBasicsTest::buildArrayInt3()
+  MEDCoupling::DataArrayInt *MEDCouplingCorbaServBasicsTest::buildArrayInt3()
   {
-    ParaMEDMEM::DataArrayInt *ret=ParaMEDMEM::DataArrayInt::New();
+    MEDCoupling::DataArrayInt *ret=MEDCoupling::DataArrayInt::New();
     ret->setName("titi");
     ret->alloc(0,3);
     ret->setInfoOnComponent(0,"sss");
@@ -715,11 +715,11 @@ namespace SALOME_TEST
     return ret;
   }
 
-  ParaMEDMEM::MEDCouplingFieldOverTime *MEDCouplingCorbaServBasicsTest::buildMultiFields2()
+  MEDCoupling::MEDCouplingFieldOverTime *MEDCouplingCorbaServBasicsTest::buildMultiFields2()
   {
-    ParaMEDMEM::MEDCouplingUMesh *m1=build2DMesh();
+    MEDCoupling::MEDCouplingUMesh *m1=build2DMesh();
     m1->setName("m1");
-    ParaMEDMEM::MEDCouplingUMesh *m2=build2DMesh();
+    MEDCoupling::MEDCouplingUMesh *m2=build2DMesh();
     m2->setName("m2");
     const double vals0[]={-0.7,-1.,-2.,-3.,-4.};
     const double vals1[]={0.,1.,2.,3.,4.};
@@ -727,11 +727,11 @@ namespace SALOME_TEST
     const double vals2[]={5.,6.,7.,8.,9.};
     const double vals4[]={15.,16.,17.,18.,19.};
     //
-    ParaMEDMEM::DataArrayDouble *d0=ParaMEDMEM::DataArrayDouble::New(); d0->alloc(5,1); std::copy(vals0,vals0+5,d0->getPointer());
-    ParaMEDMEM::DataArrayDouble *d1=ParaMEDMEM::DataArrayDouble::New(); d1->alloc(5,1); std::copy(vals1,vals1+5,d1->getPointer());
-    ParaMEDMEM::DataArrayDouble *d1_1=ParaMEDMEM::DataArrayDouble::New(); d1_1->alloc(5,1); std::copy(vals1_1,vals1_1+5,d1_1->getPointer());
-    ParaMEDMEM::DataArrayDouble *d2=ParaMEDMEM::DataArrayDouble::New(); d2->alloc(5,1); std::copy(vals2,vals2+5,d2->getPointer());
-    ParaMEDMEM::DataArrayDouble *d4=ParaMEDMEM::DataArrayDouble::New(); d4->alloc(5,1); std::copy(vals4,vals4+5,d4->getPointer());
+    MEDCoupling::DataArrayDouble *d0=MEDCoupling::DataArrayDouble::New(); d0->alloc(5,1); std::copy(vals0,vals0+5,d0->getPointer());
+    MEDCoupling::DataArrayDouble *d1=MEDCoupling::DataArrayDouble::New(); d1->alloc(5,1); std::copy(vals1,vals1+5,d1->getPointer());
+    MEDCoupling::DataArrayDouble *d1_1=MEDCoupling::DataArrayDouble::New(); d1_1->alloc(5,1); std::copy(vals1_1,vals1_1+5,d1_1->getPointer());
+    MEDCoupling::DataArrayDouble *d2=MEDCoupling::DataArrayDouble::New(); d2->alloc(5,1); std::copy(vals2,vals2+5,d2->getPointer());
+    MEDCoupling::DataArrayDouble *d4=MEDCoupling::DataArrayDouble::New(); d4->alloc(5,1); std::copy(vals4,vals4+5,d4->getPointer());
     //
     d0->setName("d0"); d1->setName("d1"); d1_1->setName("d1_1"); d2->setName("d2"); d4->setName("d4");
     d0->setInfoOnComponent(0,"c1");
@@ -740,38 +740,38 @@ namespace SALOME_TEST
     d2->setInfoOnComponent(0,"c5");
     d4->setInfoOnComponent(0,"c7");
     //
-    ParaMEDMEM::MEDCouplingFieldDouble *f0=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_CELLS,ParaMEDMEM::ONE_TIME);
+    MEDCoupling::MEDCouplingFieldDouble *f0=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_CELLS,MEDCoupling::ONE_TIME);
     f0->setMesh(m1);
     f0->setArray(d0);
     f0->setTime(0.2,5,6);
     f0->setName("f0");
-    ParaMEDMEM::MEDCouplingFieldDouble *f1=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_CELLS,ParaMEDMEM::LINEAR_TIME);
+    MEDCoupling::MEDCouplingFieldDouble *f1=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_CELLS,MEDCoupling::LINEAR_TIME);
     f1->setMesh(m1);
-    std::vector<ParaMEDMEM::DataArrayDouble *> d1s(2); d1s[0]=d1; d1s[1]=d1_1;
+    std::vector<MEDCoupling::DataArrayDouble *> d1s(2); d1s[0]=d1; d1s[1]=d1_1;
     f1->setArrays(d1s);
     f1->setStartTime(0.7,7,8);
     f1->setEndTime(1.2,9,10);
     f1->setName("f1");
-    ParaMEDMEM::MEDCouplingFieldDouble *f2=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_CELLS,ParaMEDMEM::CONST_ON_TIME_INTERVAL);
+    MEDCoupling::MEDCouplingFieldDouble *f2=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_CELLS,MEDCoupling::CONST_ON_TIME_INTERVAL);
     f2->setMesh(m2);
     f2->setArray(d2);
     f2->setTime(1.2,11,12);
     f2->setEndTime(1.5,13,14);
     f2->setName("f2");
-    ParaMEDMEM::MEDCouplingFieldDouble *f3=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_CELLS,ParaMEDMEM::ONE_TIME);
+    MEDCoupling::MEDCouplingFieldDouble *f3=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_CELLS,MEDCoupling::ONE_TIME);
     f3->setMesh(m1);
     f3->setArray(d2);
     f3->setTime(1.7,15,16);
     f3->setName("f3");
-    ParaMEDMEM::MEDCouplingFieldDouble *f4=ParaMEDMEM::MEDCouplingFieldDouble::New(ParaMEDMEM::ON_CELLS,ParaMEDMEM::ONE_TIME);
+    MEDCoupling::MEDCouplingFieldDouble *f4=MEDCoupling::MEDCouplingFieldDouble::New(MEDCoupling::ON_CELLS,MEDCoupling::ONE_TIME);
     f4->setMesh(m2);
     f4->setArray(d4);
     f4->setName("f4");
     f4->setTime(2.7,25,26);
     //
-    std::vector<ParaMEDMEM::MEDCouplingFieldDouble *> fs(5);
+    std::vector<MEDCoupling::MEDCouplingFieldDouble *> fs(5);
     fs[0]=f0; fs[1]=f1; fs[2]=f2; fs[3]=f3; fs[4]=f4;
-    ParaMEDMEM::MEDCouplingFieldOverTime *ret=ParaMEDMEM::MEDCouplingFieldOverTime::New(fs);
+    MEDCoupling::MEDCouplingFieldOverTime *ret=MEDCoupling::MEDCouplingFieldOverTime::New(fs);
     ret->checkCoherency();
     //
     m1->decrRef();
index 560354c544fb518f5a1ce4a3ccfe70f102658e44..94e1dbc49a766d139afbf8c583a41ca64a0d3e22 100644 (file)
@@ -23,7 +23,7 @@
 
 #include <string>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingUMesh;
   class MEDCouplingFieldDouble;
@@ -45,40 +45,40 @@ namespace SALOME_TEST
   class MEDCouplingCorbaServBasicsTest
   {
   public:
-    static ParaMEDMEM::MEDCouplingUMesh *build1DMesh();
-    static ParaMEDMEM::MEDCouplingUMesh *build2DMesh();
-    static ParaMEDMEM::MEDCouplingUMesh *build3DMesh();
-    static ParaMEDMEM::MEDCouplingUMesh *build3DSurfMesh();
-    static ParaMEDMEM::MEDCouplingUMesh *build0DMesh();
-    static ParaMEDMEM::MEDCouplingUMesh *buildM1DMesh();
-    static ParaMEDMEM::MEDCouplingExtrudedMesh *buildExtrudedMesh(ParaMEDMEM::MEDCouplingUMesh *&m2D);
-    static ParaMEDMEM::MEDCouplingCMesh *buildCMesh();
-    static ParaMEDMEM::MEDCouplingIMesh *buildIMesh();
-    static ParaMEDMEM::MEDCouplingCurveLinearMesh *buildCLMesh();
-    static ParaMEDMEM::MEDCoupling1SGTUMesh *build1SGTUMesh();
-    static ParaMEDMEM::MEDCoupling1DGTUMesh *build1DGTUMesh();
-    static ParaMEDMEM::MEDCouplingFieldDouble *buildFieldScalarOn2DNT();
-    static ParaMEDMEM::MEDCouplingFieldDouble *buildFieldNodeScalarOn2DNT();
-    static ParaMEDMEM::MEDCouplingFieldDouble *buildFieldScalarOn3DNT();
-    static ParaMEDMEM::MEDCouplingFieldDouble *buildFieldScalarOn3DSurfWT();
-    static ParaMEDMEM::MEDCouplingFieldDouble *buildFieldScalarOn3DSurfCOTI();
-    static ParaMEDMEM::MEDCouplingFieldDouble *buildFieldScalarOn2DLT();
-    static ParaMEDMEM::MEDCouplingFieldDouble *buildFieldGaussPt2DWT();
-    static ParaMEDMEM::MEDCouplingFieldDouble *buildFieldGaussPtNE2DWT();
-    static ParaMEDMEM::MEDCouplingFieldDouble *buildFieldVectorOnExtrudedWT();
-    static ParaMEDMEM::MEDCouplingFieldDouble *buildFieldVectorOnCMeshWT();
-    static ParaMEDMEM::MEDCouplingFieldTemplate *buildFieldTemplateCellOn2D();
-    static ParaMEDMEM::MEDCouplingFieldTemplate *buildFieldTemplateNodeOn2D();
-    static ParaMEDMEM::MEDCouplingFieldTemplate *buildFieldTemplateGaussPtOn2D();
-    static ParaMEDMEM::MEDCouplingFieldTemplate *buildFieldTemplateGaussNEOn2D();
-    static ParaMEDMEM::MEDCouplingMultiFields *buildMultiFields1();
-    static ParaMEDMEM::DataArrayDouble *buildArrayDouble1();
-    static ParaMEDMEM::DataArrayDouble *buildArrayDouble2();
-    static ParaMEDMEM::DataArrayDouble *buildArrayDouble3();
-    static ParaMEDMEM::DataArrayInt *buildArrayInt1();
-    static ParaMEDMEM::DataArrayInt *buildArrayInt2();
-    static ParaMEDMEM::DataArrayInt *buildArrayInt3();
-    static ParaMEDMEM::MEDCouplingFieldOverTime *buildMultiFields2();
+    static MEDCoupling::MEDCouplingUMesh *build1DMesh();
+    static MEDCoupling::MEDCouplingUMesh *build2DMesh();
+    static MEDCoupling::MEDCouplingUMesh *build3DMesh();
+    static MEDCoupling::MEDCouplingUMesh *build3DSurfMesh();
+    static MEDCoupling::MEDCouplingUMesh *build0DMesh();
+    static MEDCoupling::MEDCouplingUMesh *buildM1DMesh();
+    static MEDCoupling::MEDCouplingExtrudedMesh *buildExtrudedMesh(MEDCoupling::MEDCouplingUMesh *&m2D);
+    static MEDCoupling::MEDCouplingCMesh *buildCMesh();
+    static MEDCoupling::MEDCouplingIMesh *buildIMesh();
+    static MEDCoupling::MEDCouplingCurveLinearMesh *buildCLMesh();
+    static MEDCoupling::MEDCoupling1SGTUMesh *build1SGTUMesh();
+    static MEDCoupling::MEDCoupling1DGTUMesh *build1DGTUMesh();
+    static MEDCoupling::MEDCouplingFieldDouble *buildFieldScalarOn2DNT();
+    static MEDCoupling::MEDCouplingFieldDouble *buildFieldNodeScalarOn2DNT();
+    static MEDCoupling::MEDCouplingFieldDouble *buildFieldScalarOn3DNT();
+    static MEDCoupling::MEDCouplingFieldDouble *buildFieldScalarOn3DSurfWT();
+    static MEDCoupling::MEDCouplingFieldDouble *buildFieldScalarOn3DSurfCOTI();
+    static MEDCoupling::MEDCouplingFieldDouble *buildFieldScalarOn2DLT();
+    static MEDCoupling::MEDCouplingFieldDouble *buildFieldGaussPt2DWT();
+    static MEDCoupling::MEDCouplingFieldDouble *buildFieldGaussPtNE2DWT();
+    static MEDCoupling::MEDCouplingFieldDouble *buildFieldVectorOnExtrudedWT();
+    static MEDCoupling::MEDCouplingFieldDouble *buildFieldVectorOnCMeshWT();
+    static MEDCoupling::MEDCouplingFieldTemplate *buildFieldTemplateCellOn2D();
+    static MEDCoupling::MEDCouplingFieldTemplate *buildFieldTemplateNodeOn2D();
+    static MEDCoupling::MEDCouplingFieldTemplate *buildFieldTemplateGaussPtOn2D();
+    static MEDCoupling::MEDCouplingFieldTemplate *buildFieldTemplateGaussNEOn2D();
+    static MEDCoupling::MEDCouplingMultiFields *buildMultiFields1();
+    static MEDCoupling::DataArrayDouble *buildArrayDouble1();
+    static MEDCoupling::DataArrayDouble *buildArrayDouble2();
+    static MEDCoupling::DataArrayDouble *buildArrayDouble3();
+    static MEDCoupling::DataArrayInt *buildArrayInt1();
+    static MEDCoupling::DataArrayInt *buildArrayInt2();
+    static MEDCoupling::DataArrayInt *buildArrayInt3();
+    static MEDCoupling::MEDCouplingFieldOverTime *buildMultiFields2();
     static std::string buildFileNameForIOR();
   };
 }
index d32b04c1e13b46874905b4445b7679b2f446c87a..9a280e8a111f0e6221bd049fe453e1235c61b48e 100644 (file)
@@ -48,7 +48,7 @@
 
 SALOME_TEST::MEDCouplingMeshFieldFactory_ptr SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::_objC;
 
-ParaMEDMEM::MEDCouplingUMesh *SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::_mesh_from_distant=0;
+MEDCoupling::MEDCouplingUMesh *SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::_mesh_from_distant=0;
 
 int SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::_argc=0;
 
@@ -72,7 +72,7 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkBaseCorbaFetching()
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkContentOfFetched1DMesh()
 {
   SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr meshPtr=_objC->get1DMesh();
-  _mesh_from_distant=ParaMEDMEM::MEDCouplingUMeshClient::New(meshPtr);
+  _mesh_from_distant=MEDCoupling::MEDCouplingUMeshClient::New(meshPtr);
   char *meshName=meshPtr->getName();
   std::string meshNameCpp(meshName);
   CPPUNIT_ASSERT(meshNameCpp=="1DMeshForCorba");
@@ -81,7 +81,7 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkContentOfFetched1DMesh
   CORBA::release(meshPtr);
   CPPUNIT_ASSERT_EQUAL(3,_mesh_from_distant->getSpaceDimension());
   CPPUNIT_ASSERT_EQUAL(1,_mesh_from_distant->getMeshDimension());
-  ParaMEDMEM::MEDCouplingUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build1DMesh();
+  MEDCoupling::MEDCouplingUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build1DMesh();
   CPPUNIT_ASSERT(_mesh_from_distant->isEqual(meshRef,1e-12));
   meshRef->decrRef();
   _mesh_from_distant->decrRef();
@@ -90,7 +90,7 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkContentOfFetched1DMesh
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetching2D()
 {
   SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr meshPtr=_objC->get2DMesh();
-  _mesh_from_distant=ParaMEDMEM::MEDCouplingUMeshClient::New(meshPtr);
+  _mesh_from_distant=MEDCoupling::MEDCouplingUMeshClient::New(meshPtr);
   meshPtr->UnRegister();
   CORBA::release(meshPtr);
   CPPUNIT_ASSERT_EQUAL(2,_mesh_from_distant->getSpaceDimension());
@@ -99,7 +99,7 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetching2D()
 
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkContentOfFetched2DMesh()
 {
-  ParaMEDMEM::MEDCouplingUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build2DMesh();
+  MEDCoupling::MEDCouplingUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build2DMesh();
   CPPUNIT_ASSERT(_mesh_from_distant->isEqual(meshRef,1e-12));
   meshRef->decrRef();
   _mesh_from_distant->decrRef();
@@ -110,10 +110,10 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkMultiFetchingToTestMem
   for(int i=0;i<1000;i++)
     {
       SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr meshPtr=_objC->get2DMesh();
-      _mesh_from_distant=ParaMEDMEM::MEDCouplingUMeshClient::New(meshPtr);
+      _mesh_from_distant=MEDCoupling::MEDCouplingUMeshClient::New(meshPtr);
       meshPtr->UnRegister();
       CORBA::release(meshPtr);
-      ParaMEDMEM::MEDCouplingUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build2DMesh();
+      MEDCoupling::MEDCouplingUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build2DMesh();
       CPPUNIT_ASSERT(_mesh_from_distant->isEqual(meshRef,1e-12));
       meshRef->decrRef();
       _mesh_from_distant->decrRef();
@@ -123,7 +123,7 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkMultiFetchingToTestMem
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetching3D()
 {
   SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr meshPtr=_objC->get3DMesh();
-  _mesh_from_distant=ParaMEDMEM::MEDCouplingUMeshClient::New(meshPtr);
+  _mesh_from_distant=MEDCoupling::MEDCouplingUMeshClient::New(meshPtr);
   meshPtr->UnRegister();
   CORBA::release(meshPtr);
   CPPUNIT_ASSERT_EQUAL(3,_mesh_from_distant->getSpaceDimension());
@@ -132,7 +132,7 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetching3D()
 
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkContentOfFetched3DMesh()
 {
-  ParaMEDMEM::MEDCouplingUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build3DMesh();
+  MEDCoupling::MEDCouplingUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build3DMesh();
   CPPUNIT_ASSERT(_mesh_from_distant->isEqual(meshRef,1e-12));
   meshRef->decrRef();
   _mesh_from_distant->decrRef();
@@ -141,7 +141,7 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkContentOfFetched3DMesh
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetching3DSurf()
 {
   SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr meshPtr=_objC->get3DSurfMesh();
-  _mesh_from_distant=ParaMEDMEM::MEDCouplingUMeshClient::New(meshPtr);
+  _mesh_from_distant=MEDCoupling::MEDCouplingUMeshClient::New(meshPtr);
   meshPtr->UnRegister();
   CORBA::release(meshPtr);
   CPPUNIT_ASSERT_EQUAL(3,_mesh_from_distant->getSpaceDimension());
@@ -150,7 +150,7 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetching3DSurf()
 
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkContentOfFetched3DSurfMesh()
 {
-  ParaMEDMEM::MEDCouplingUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build3DSurfMesh();
+  MEDCoupling::MEDCouplingUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build3DSurfMesh();
   CPPUNIT_ASSERT(_mesh_from_distant->isEqual(meshRef,1e-12));
   meshRef->decrRef();
   _mesh_from_distant->decrRef();
@@ -159,10 +159,10 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkContentOfFetched3DSurf
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetching0D()
 {
   SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr meshPtr=_objC->get0DMesh();
-  _mesh_from_distant=ParaMEDMEM::MEDCouplingUMeshClient::New(meshPtr);
+  _mesh_from_distant=MEDCoupling::MEDCouplingUMeshClient::New(meshPtr);
   meshPtr->UnRegister();
   CORBA::release(meshPtr);
-  ParaMEDMEM::MEDCouplingUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build0DMesh();
+  MEDCoupling::MEDCouplingUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build0DMesh();
   CPPUNIT_ASSERT_EQUAL(3,_mesh_from_distant->getSpaceDimension());
   CPPUNIT_ASSERT_EQUAL(0,_mesh_from_distant->getMeshDimension());
   CPPUNIT_ASSERT(_mesh_from_distant->isEqual(meshRef,1e-12));
@@ -173,10 +173,10 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetching0D()
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetchingM1D()
 {
   SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr meshPtr=_objC->getM1DMesh();
-  _mesh_from_distant=ParaMEDMEM::MEDCouplingUMeshClient::New(meshPtr);
+  _mesh_from_distant=MEDCoupling::MEDCouplingUMeshClient::New(meshPtr);
   meshPtr->UnRegister();
   CORBA::release(meshPtr);
-  ParaMEDMEM::MEDCouplingUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildM1DMesh();
+  MEDCoupling::MEDCouplingUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildM1DMesh();
   CPPUNIT_ASSERT_EQUAL(-1,_mesh_from_distant->getMeshDimension());
   CPPUNIT_ASSERT(_mesh_from_distant->isEqual(meshRef,1e-12));
   meshRef->decrRef();
@@ -186,11 +186,11 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetchingM1D()
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetchingExtruded()
 {
   SALOME_MED::MEDCouplingExtrudedMeshCorbaInterface_ptr meshPtr=_objC->getExtrudedMesh();
-  ParaMEDMEM::MEDCouplingExtrudedMesh *meshFromDistant=ParaMEDMEM::MEDCouplingExtrudedMeshClient::New(meshPtr);
+  MEDCoupling::MEDCouplingExtrudedMesh *meshFromDistant=MEDCoupling::MEDCouplingExtrudedMeshClient::New(meshPtr);
   meshPtr->UnRegister();
   CORBA::release(meshPtr);
-  ParaMEDMEM::MEDCouplingUMesh *meshRef2;
-  ParaMEDMEM::MEDCouplingExtrudedMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildExtrudedMesh(meshRef2);
+  MEDCoupling::MEDCouplingUMesh *meshRef2;
+  MEDCoupling::MEDCouplingExtrudedMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildExtrudedMesh(meshRef2);
   CPPUNIT_ASSERT(meshFromDistant->isEqual(meshRef,1e-12));
   CPPUNIT_ASSERT(meshFromDistant->getMesh2D()->isEqual(meshRef2,1e-12));
   meshRef2->decrRef();
@@ -201,10 +201,10 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetchingExtruded(
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetchingCMesh()
 {
   SALOME_MED::MEDCouplingCMeshCorbaInterface_ptr meshPtr=_objC->getCMesh();
-  ParaMEDMEM::MEDCouplingCMesh *meshFromDistant=ParaMEDMEM::MEDCouplingCMeshClient::New(meshPtr);
+  MEDCoupling::MEDCouplingCMesh *meshFromDistant=MEDCoupling::MEDCouplingCMeshClient::New(meshPtr);
   meshPtr->UnRegister();
   CORBA::release(meshPtr);
-  ParaMEDMEM::MEDCouplingCMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildCMesh();
+  MEDCoupling::MEDCouplingCMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildCMesh();
   CPPUNIT_ASSERT(meshFromDistant->isEqual(meshRef,1e-12));
   meshRef->decrRef();
   meshFromDistant->decrRef();
@@ -213,10 +213,10 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetchingCMesh()
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetchingIMesh()
 {
   SALOME_MED::MEDCouplingIMeshCorbaInterface_ptr meshPtr=_objC->getIMesh();
-  ParaMEDMEM::MEDCouplingIMesh *meshFromDistant=ParaMEDMEM::MEDCouplingIMeshClient::New(meshPtr);
+  MEDCoupling::MEDCouplingIMesh *meshFromDistant=MEDCoupling::MEDCouplingIMeshClient::New(meshPtr);
   meshPtr->UnRegister();
   CORBA::release(meshPtr);
-  ParaMEDMEM::MEDCouplingIMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildIMesh();
+  MEDCoupling::MEDCouplingIMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildIMesh();
   CPPUNIT_ASSERT(meshFromDistant->isEqual(meshRef,1e-12));
   meshRef->decrRef();
   meshFromDistant->decrRef();
@@ -225,10 +225,10 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetchingIMesh()
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetchingCurveLinearMesh()
 {
   SALOME_MED::MEDCouplingCurveLinearMeshCorbaInterface_ptr meshPtr=_objC->getCLMesh();
-  ParaMEDMEM::MEDCouplingCurveLinearMesh *meshFromDistant=ParaMEDMEM::MEDCouplingCurveLinearMeshClient::New(meshPtr);
+  MEDCoupling::MEDCouplingCurveLinearMesh *meshFromDistant=MEDCoupling::MEDCouplingCurveLinearMeshClient::New(meshPtr);
   meshPtr->UnRegister();
   CORBA::release(meshPtr);
-  ParaMEDMEM::MEDCouplingCurveLinearMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildCLMesh();
+  MEDCoupling::MEDCouplingCurveLinearMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildCLMesh();
   CPPUNIT_ASSERT(meshFromDistant->isEqual(meshRef,1e-12));
   meshRef->decrRef();
   meshFromDistant->decrRef();
@@ -237,10 +237,10 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetchingCurveLine
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetching1SGTUMesh()
 {
   SALOME_MED::MEDCoupling1SGTUMeshCorbaInterface_ptr meshPtr=_objC->get1SGTUMesh();
-  ParaMEDMEM::MEDCoupling1SGTUMesh *meshFromDistant=ParaMEDMEM::MEDCoupling1SGTUMeshClient::New(meshPtr);
+  MEDCoupling::MEDCoupling1SGTUMesh *meshFromDistant=MEDCoupling::MEDCoupling1SGTUMeshClient::New(meshPtr);
   meshPtr->UnRegister();
   CORBA::release(meshPtr);
-  ParaMEDMEM::MEDCoupling1SGTUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build1SGTUMesh();
+  MEDCoupling::MEDCoupling1SGTUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build1SGTUMesh();
   CPPUNIT_ASSERT(meshFromDistant->isEqual(meshRef,1e-12));
   meshRef->decrRef();
   meshFromDistant->decrRef();
@@ -249,10 +249,10 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetching1SGTUMesh
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetching1DGTUMesh()
 {
   SALOME_MED::MEDCoupling1DGTUMeshCorbaInterface_ptr meshPtr=_objC->get1DGTUMesh();
-  ParaMEDMEM::MEDCoupling1DGTUMesh *meshFromDistant=ParaMEDMEM::MEDCoupling1DGTUMeshClient::New(meshPtr);
+  MEDCoupling::MEDCoupling1DGTUMesh *meshFromDistant=MEDCoupling::MEDCoupling1DGTUMeshClient::New(meshPtr);
   meshPtr->UnRegister();
   CORBA::release(meshPtr);
-  ParaMEDMEM::MEDCoupling1DGTUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build1DGTUMesh();
+  MEDCoupling::MEDCoupling1DGTUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build1DGTUMesh();
   CPPUNIT_ASSERT(meshFromDistant->isEqual(meshRef,1e-12));
   meshRef->decrRef();
   meshFromDistant->decrRef();
@@ -261,10 +261,10 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetching1DGTUMesh
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaField2DNTFetching()
 {
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr fieldPtr=_objC->getFieldScalarOn2DNT();
-  ParaMEDMEM::MEDCouplingFieldDouble *fieldCpp=ParaMEDMEM::MEDCouplingFieldDoubleClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingFieldDouble *fieldCpp=MEDCoupling::MEDCouplingFieldDoubleClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
-  ParaMEDMEM::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldScalarOn2DNT();
+  MEDCoupling::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldScalarOn2DNT();
   CPPUNIT_ASSERT(fieldCpp->isEqual(refField,1.e-12,1.e-15));
   CPPUNIT_ASSERT_THROW(fieldCpp->setTime(1.23,4,5),INTERP_KERNEL::Exception);
   refField->decrRef();
@@ -274,8 +274,8 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaField2DNTFetching
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaField2DNTMultiFetching()
 {
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr fieldPtr=_objC->getFieldScalarOn2DNT();
-  ParaMEDMEM::MEDCouplingFieldDouble *fieldCpp=ParaMEDMEM::MEDCouplingFieldDoubleClient::New(fieldPtr);
-  ParaMEDMEM::MEDCouplingFieldDouble *fieldCpp2=ParaMEDMEM::MEDCouplingFieldDoubleClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingFieldDouble *fieldCpp=MEDCoupling::MEDCouplingFieldDoubleClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingFieldDouble *fieldCpp2=MEDCoupling::MEDCouplingFieldDoubleClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
   CPPUNIT_ASSERT(fieldCpp->isEqual(fieldCpp2,1.e-12,1.e-15));
@@ -288,7 +288,7 @@ void *SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaField2DNTMultiFe
   char *stackS=(char *)stack;
   CORBA::Object_var obj=_orb->string_to_object(stackS);
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr fieldPtr=SALOME_MED::MEDCouplingFieldDoubleCorbaInterface::_narrow(obj);
-  ParaMEDMEM::MEDCouplingFieldDouble *fieldCpp=ParaMEDMEM::MEDCouplingFieldDoubleClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingFieldDouble *fieldCpp=MEDCoupling::MEDCouplingFieldDoubleClient::New(fieldPtr);
   CORBA::release(fieldPtr);
   return fieldCpp;
 }
@@ -300,7 +300,7 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaField2DNTMultiFet
   //doing nbOfThreads-1 Register.
   char *ior=_orb->object_to_string(fieldPtr);
   pthread_t threads[nbOfThreads];
-  ParaMEDMEM::MEDCouplingFieldDouble *rets[nbOfThreads];
+  MEDCoupling::MEDCouplingFieldDouble *rets[nbOfThreads];
   for(int i=0;i<nbOfThreads;i++)
     pthread_create(&threads[i],0,checkCorbaField2DNTMultiFetchingMTStatic,ior);
   for(int i=0;i<nbOfThreads;i++)
@@ -317,10 +317,10 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaField2DNTMultiFet
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldNode2DNTFetching()
 {
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr fieldPtr=_objC->getFieldNodeScalarOn2DNT();
-  ParaMEDMEM::MEDCouplingFieldDouble *fieldCpp=ParaMEDMEM::MEDCouplingFieldDoubleClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingFieldDouble *fieldCpp=MEDCoupling::MEDCouplingFieldDoubleClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
-  ParaMEDMEM::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldNodeScalarOn2DNT();
+  MEDCoupling::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldNodeScalarOn2DNT();
   CPPUNIT_ASSERT(fieldCpp->isEqual(refField,1.e-12,1.e-15));
   CPPUNIT_ASSERT_THROW(fieldCpp->setTime(1.23,4,5),INTERP_KERNEL::Exception);
   refField->decrRef();
@@ -330,10 +330,10 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldNode2DNTFetc
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaField3DNTFetching()
 {
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr fieldPtr=_objC->getFieldScalarOn3DNT();
-  ParaMEDMEM::MEDCouplingFieldDouble *fieldCpp=ParaMEDMEM::MEDCouplingFieldDoubleClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingFieldDouble *fieldCpp=MEDCoupling::MEDCouplingFieldDoubleClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
-  ParaMEDMEM::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DNT();
+  MEDCoupling::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DNT();
   CPPUNIT_ASSERT(fieldCpp->isEqual(refField,1.e-12,1.e-15));
   CPPUNIT_ASSERT_THROW(fieldCpp->setTime(1.23,4,5),INTERP_KERNEL::Exception);
   refField->decrRef();
@@ -355,10 +355,10 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaField3DSurfWTFetc
   CPPUNIT_ASSERT(std::string((*comps)[2])=="ccccc");
   delete comps;
   //
-  ParaMEDMEM::MEDCouplingFieldDouble *fieldCpp=ParaMEDMEM::MEDCouplingFieldDoubleClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingFieldDouble *fieldCpp=MEDCoupling::MEDCouplingFieldDoubleClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
-  ParaMEDMEM::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DSurfWT();
+  MEDCoupling::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DSurfWT();
   CPPUNIT_ASSERT(fieldCpp->isEqual(refField,1.e-12,1.e-15));
   int dt,it;
   fieldCpp->getTime(dt,it);
@@ -371,10 +371,10 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaField3DSurfWTFetc
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaField3DSurfCOTIFetching()
 {
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr fieldPtr=_objC->getFieldScalarOn3DSurfCOTI();
-  ParaMEDMEM::MEDCouplingFieldDouble *fieldCpp=ParaMEDMEM::MEDCouplingFieldDoubleClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingFieldDouble *fieldCpp=MEDCoupling::MEDCouplingFieldDoubleClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
-  ParaMEDMEM::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DSurfCOTI();
+  MEDCoupling::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DSurfCOTI();
   CPPUNIT_ASSERT(fieldCpp->isEqual(refField,1.e-12,1.e-15));
   int dt,it;
   fieldCpp->getStartTime(dt,it);
@@ -390,7 +390,7 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaField3DSurfCOTIFe
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaField2DLTFetching()
 {
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr fieldPtr=_objC->getFieldScalarOn2DLT();
-  ParaMEDMEM::MEDCouplingFieldDouble *fieldCpp=ParaMEDMEM::MEDCouplingFieldDoubleClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingFieldDouble *fieldCpp=MEDCoupling::MEDCouplingFieldDoubleClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
   double res[4];
@@ -400,7 +400,7 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaField2DLTFetching
   CPPUNIT_ASSERT_DOUBLES_EQUAL(25.04,res[1],1e-12);
   CPPUNIT_ASSERT_DOUBLES_EQUAL(25.004,res[2],1e-12);
   CPPUNIT_ASSERT_DOUBLES_EQUAL(25.0004,res[3],1e-12);
-  ParaMEDMEM::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldScalarOn2DLT();
+  MEDCoupling::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldScalarOn2DLT();
   CPPUNIT_ASSERT(fieldCpp->isEqual(refField,1.e-12,1.e-15));
   int dt,it;
   CPPUNIT_ASSERT_DOUBLES_EQUAL(6.7,fieldCpp->getStartTime(dt,it),1e-14);
@@ -416,11 +416,11 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaField2DLTFetching
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldGaussPt2DWTFetching()
 {
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr fieldPtr=_objC->getFieldGaussPt2DWT();
-  ParaMEDMEM::MEDCouplingFieldDouble *fieldCpp=ParaMEDMEM::MEDCouplingFieldDoubleClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingFieldDouble *fieldCpp=MEDCoupling::MEDCouplingFieldDoubleClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
   //
-  ParaMEDMEM::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldGaussPt2DWT();
+  MEDCoupling::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldGaussPt2DWT();
   CPPUNIT_ASSERT(fieldCpp->isEqual(refField,1.e-12,1.e-15));
   refField->decrRef();
   fieldCpp->decrRef();
@@ -429,11 +429,11 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldGaussPt2DWTF
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldGaussPtNE2DWTFetching()
 {
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr fieldPtr=_objC->getFieldGaussPtNE2DWT();
-  ParaMEDMEM::MEDCouplingFieldDouble *fieldCpp=ParaMEDMEM::MEDCouplingFieldDoubleClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingFieldDouble *fieldCpp=MEDCoupling::MEDCouplingFieldDoubleClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
   //
-  ParaMEDMEM::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldGaussPtNE2DWT();
+  MEDCoupling::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldGaussPtNE2DWT();
   CPPUNIT_ASSERT(fieldCpp->isEqual(refField,1.e-12,1.e-15));
   refField->decrRef();
   fieldCpp->decrRef();
@@ -442,11 +442,11 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldGaussPtNE2DW
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldVectorOnExtrudedWT()
 {
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr fieldPtr=_objC->getFieldVectorOnExtrudedWT();
-  ParaMEDMEM::MEDCouplingFieldDouble *fieldCpp=ParaMEDMEM::MEDCouplingFieldDoubleClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingFieldDouble *fieldCpp=MEDCoupling::MEDCouplingFieldDoubleClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
   //
-  ParaMEDMEM::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldVectorOnExtrudedWT();
+  MEDCoupling::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldVectorOnExtrudedWT();
   CPPUNIT_ASSERT(fieldCpp->isEqual(refField,1.e-12,1.e-15));
   refField->decrRef();
   fieldCpp->decrRef();
@@ -455,11 +455,11 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldVectorOnExtr
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldVectorOnCMeshWT()
 {
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr fieldPtr=_objC->getFieldVectorOnCMeshWT();
-  ParaMEDMEM::MEDCouplingFieldDouble *fieldCpp=ParaMEDMEM::MEDCouplingFieldDoubleClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingFieldDouble *fieldCpp=MEDCoupling::MEDCouplingFieldDoubleClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
   //
-  ParaMEDMEM::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldVectorOnCMeshWT();
+  MEDCoupling::MEDCouplingFieldDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldVectorOnCMeshWT();
   CPPUNIT_ASSERT(fieldCpp->isEqual(refField,1.e-12,1.e-15));
   refField->decrRef();
   fieldCpp->decrRef();
@@ -468,11 +468,11 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldVectorOnCMes
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldTemplateCellOn2D()
 {
   SALOME_MED::MEDCouplingFieldTemplateCorbaInterface_ptr fieldPtr=_objC->getFieldTemplateCellOn2D();
-  ParaMEDMEM::MEDCouplingFieldTemplate *fieldCpp=ParaMEDMEM::MEDCouplingFieldTemplateClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingFieldTemplate *fieldCpp=MEDCoupling::MEDCouplingFieldTemplateClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
   //
-  ParaMEDMEM::MEDCouplingFieldTemplate *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldTemplateCellOn2D();
+  MEDCoupling::MEDCouplingFieldTemplate *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldTemplateCellOn2D();
   CPPUNIT_ASSERT(fieldCpp->isEqual(refField,1.e-12,1.e-15));
   refField->decrRef();
   fieldCpp->decrRef();
@@ -481,11 +481,11 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldTemplateCell
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldTemplateNodeOn2D()
 {
   SALOME_MED::MEDCouplingFieldTemplateCorbaInterface_ptr fieldPtr=_objC->getFieldTemplateNodeOn2D();
-  ParaMEDMEM::MEDCouplingFieldTemplate *fieldCpp=ParaMEDMEM::MEDCouplingFieldTemplateClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingFieldTemplate *fieldCpp=MEDCoupling::MEDCouplingFieldTemplateClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
   //
-  ParaMEDMEM::MEDCouplingFieldTemplate *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldTemplateNodeOn2D();
+  MEDCoupling::MEDCouplingFieldTemplate *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldTemplateNodeOn2D();
   CPPUNIT_ASSERT(fieldCpp->isEqual(refField,1.e-12,1.e-15));
   refField->decrRef();
   fieldCpp->decrRef();
@@ -494,11 +494,11 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldTemplateNode
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldTemplateGaussPtOn2D()
 {
   SALOME_MED::MEDCouplingFieldTemplateCorbaInterface_ptr fieldPtr=_objC->getFieldTemplateGaussPtOn2D();
-  ParaMEDMEM::MEDCouplingFieldTemplate *fieldCpp=ParaMEDMEM::MEDCouplingFieldTemplateClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingFieldTemplate *fieldCpp=MEDCoupling::MEDCouplingFieldTemplateClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
   //
-  ParaMEDMEM::MEDCouplingFieldTemplate *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldTemplateGaussPtOn2D();
+  MEDCoupling::MEDCouplingFieldTemplate *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldTemplateGaussPtOn2D();
   CPPUNIT_ASSERT(fieldCpp->isEqual(refField,1.e-12,1.e-15));
   refField->decrRef();
   fieldCpp->decrRef();
@@ -507,11 +507,11 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldTemplateGaus
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldTemplateGaussNEOn2D()
 {
   SALOME_MED::MEDCouplingFieldTemplateCorbaInterface_ptr fieldPtr=_objC->getFieldTemplateGaussNEOn2D();
-  ParaMEDMEM::MEDCouplingFieldTemplate *fieldCpp=ParaMEDMEM::MEDCouplingFieldTemplateClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingFieldTemplate *fieldCpp=MEDCoupling::MEDCouplingFieldTemplateClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
   //
-  ParaMEDMEM::MEDCouplingFieldTemplate *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldTemplateGaussNEOn2D();
+  MEDCoupling::MEDCouplingFieldTemplate *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildFieldTemplateGaussNEOn2D();
   CPPUNIT_ASSERT(fieldCpp->isEqual(refField,1.e-12,1.e-15));
   refField->decrRef();
   fieldCpp->decrRef();
@@ -520,11 +520,11 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFieldTemplateGaus
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaMultiFields1()
 {
   SALOME_MED::MEDCouplingMultiFieldsCorbaInterface_ptr fieldPtr=_objC->getMultiFields1();
-  ParaMEDMEM::MEDCouplingMultiFields *fieldCpp=ParaMEDMEM::MEDCouplingMultiFieldsClient::New(fieldPtr);
+  MEDCoupling::MEDCouplingMultiFields *fieldCpp=MEDCoupling::MEDCouplingMultiFieldsClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
   //
-  ParaMEDMEM::MEDCouplingMultiFields *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildMultiFields1();
+  MEDCoupling::MEDCouplingMultiFields *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildMultiFields1();
   CPPUNIT_ASSERT(fieldCpp->isEqual(refField,1.e-12,1.e-15));
   refField->decrRef();
   fieldCpp->decrRef();
@@ -545,11 +545,11 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaArrayDouble1()
   CPPUNIT_ASSERT(std::string((*comps)[2])=="ttt");
   delete comps;
   //
-  ParaMEDMEM::DataArrayDouble *fieldCpp=ParaMEDMEM::DataArrayDoubleClient::New(fieldPtr);
+  MEDCoupling::DataArrayDouble *fieldCpp=MEDCoupling::DataArrayDoubleClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
   //
-  ParaMEDMEM::DataArrayDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildArrayDouble1();
+  MEDCoupling::DataArrayDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildArrayDouble1();
   CPPUNIT_ASSERT(fieldCpp->isEqual(*refField,1.e-12));
   refField->decrRef();
   fieldCpp->decrRef();
@@ -558,11 +558,11 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaArrayDouble1()
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaArrayDouble2()
 {
   SALOME_MED::DataArrayDoubleCorbaInterface_ptr fieldPtr=_objC->getArrayDouble2();
-  ParaMEDMEM::DataArrayDouble *fieldCpp=ParaMEDMEM::DataArrayDoubleClient::New(fieldPtr);
+  MEDCoupling::DataArrayDouble *fieldCpp=MEDCoupling::DataArrayDoubleClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
   //
-  ParaMEDMEM::DataArrayDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildArrayDouble2();
+  MEDCoupling::DataArrayDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildArrayDouble2();
   CPPUNIT_ASSERT(fieldCpp->isEqual(*refField,1.e-12));
   refField->decrRef();
   fieldCpp->decrRef();
@@ -571,11 +571,11 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaArrayDouble2()
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaArrayDouble3()
 {
   SALOME_MED::DataArrayDoubleCorbaInterface_ptr fieldPtr=_objC->getArrayDouble3();
-  ParaMEDMEM::DataArrayDouble *fieldCpp=ParaMEDMEM::DataArrayDoubleClient::New(fieldPtr);
+  MEDCoupling::DataArrayDouble *fieldCpp=MEDCoupling::DataArrayDoubleClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
   //
-  ParaMEDMEM::DataArrayDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildArrayDouble3();
+  MEDCoupling::DataArrayDouble *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildArrayDouble3();
   CPPUNIT_ASSERT(fieldCpp->isEqual(*refField,1.e-12));
   refField->decrRef();
   fieldCpp->decrRef();
@@ -584,11 +584,11 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaArrayDouble3()
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaArrayInt1()
 {
   SALOME_MED::DataArrayIntCorbaInterface_ptr fieldPtr=_objC->getArrayInt1();
-  ParaMEDMEM::DataArrayInt *fieldCpp=ParaMEDMEM::DataArrayIntClient::New(fieldPtr);
+  MEDCoupling::DataArrayInt *fieldCpp=MEDCoupling::DataArrayIntClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
   //
-  ParaMEDMEM::DataArrayInt *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildArrayInt1();
+  MEDCoupling::DataArrayInt *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildArrayInt1();
   CPPUNIT_ASSERT(fieldCpp->isEqual(*refField));
   refField->decrRef();
   fieldCpp->decrRef();
@@ -597,11 +597,11 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaArrayInt1()
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaArrayInt2()
 {
   SALOME_MED::DataArrayIntCorbaInterface_ptr fieldPtr=_objC->getArrayInt2();
-  ParaMEDMEM::DataArrayInt *fieldCpp=ParaMEDMEM::DataArrayIntClient::New(fieldPtr);
+  MEDCoupling::DataArrayInt *fieldCpp=MEDCoupling::DataArrayIntClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
   //
-  ParaMEDMEM::DataArrayInt *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildArrayInt2();
+  MEDCoupling::DataArrayInt *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildArrayInt2();
   CPPUNIT_ASSERT(fieldCpp->isEqual(*refField));
   refField->decrRef();
   fieldCpp->decrRef();
@@ -610,11 +610,11 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaArrayInt2()
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaArrayInt3()
 {
   SALOME_MED::DataArrayIntCorbaInterface_ptr fieldPtr=_objC->getArrayInt3();
-  ParaMEDMEM::DataArrayInt *fieldCpp=ParaMEDMEM::DataArrayIntClient::New(fieldPtr);
+  MEDCoupling::DataArrayInt *fieldCpp=MEDCoupling::DataArrayIntClient::New(fieldPtr);
   fieldPtr->UnRegister();
   CORBA::release(fieldPtr);
   //
-  ParaMEDMEM::DataArrayInt *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildArrayInt3();
+  MEDCoupling::DataArrayInt *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildArrayInt3();
   CPPUNIT_ASSERT(fieldCpp->isEqual(*refField));
   refField->decrRef();
   fieldCpp->decrRef();
@@ -626,8 +626,8 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetchingCoords1()
   SALOME_MED::DataArrayDoubleCorbaInterface_ptr cooPtr=meshPtr->getCoords();
   meshPtr->UnRegister();
   CORBA::release(meshPtr);
-  ParaMEDMEM::DataArrayDouble *cooCpp=ParaMEDMEM::DataArrayDoubleClient::New(cooPtr);
-  ParaMEDMEM::MEDCouplingUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build3DSurfMesh();
+  MEDCoupling::DataArrayDouble *cooCpp=MEDCoupling::DataArrayDoubleClient::New(cooPtr);
+  MEDCoupling::MEDCouplingUMesh *meshRef=SALOME_TEST::MEDCouplingCorbaServBasicsTest::build3DSurfMesh();
   //
   CPPUNIT_ASSERT(meshRef->getCoords()->isEqual(*cooCpp,1e-12));
   //
@@ -640,11 +640,11 @@ void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaFetchingCoords1()
 void SALOME_TEST::MEDCouplingCorbaServBasicsTestClt::checkCorbaMultiFields2()
 {
   SALOME_MED::MEDCouplingFieldOverTimeCorbaInterface_ptr fotPtr=_objC->getMultiFields2();
-  ParaMEDMEM::MEDCouplingFieldOverTimeClient *fotc=ParaMEDMEM::MEDCouplingFieldOverTimeClient::New(fotPtr);
+  MEDCoupling::MEDCouplingFieldOverTimeClient *fotc=MEDCoupling::MEDCouplingFieldOverTimeClient::New(fotPtr);
   fotPtr->UnRegister();
   CORBA::release(fotPtr);
   //
-  ParaMEDMEM::MEDCouplingFieldOverTime *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildMultiFields2();
+  MEDCoupling::MEDCouplingFieldOverTime *refField=SALOME_TEST::MEDCouplingCorbaServBasicsTest::buildMultiFields2();
   CPPUNIT_ASSERT(fotc->isEqual(refField,1.e-12,1.e-15));
   refField->decrRef();
   std::vector<double> ts=fotc->getTimeSteps();
index 01f7f4dc593e5bae918c88791ddc94ab4029bbdd..5357fa1ffdbdea44bb0d6b3ac66391097d1e0a4a 100644 (file)
@@ -29,7 +29,7 @@
 
 #include <cppunit/extensions/HelperMacros.h>
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingUMesh;
 }
@@ -131,7 +131,7 @@ namespace SALOME_TEST
     static void *checkCorbaField2DNTMultiFetchingMTStatic(void *stack);
   private:
     static SALOME_TEST::MEDCouplingMeshFieldFactory_ptr _objC;
-    static ParaMEDMEM::MEDCouplingUMesh *_mesh_from_distant;
+    static MEDCoupling::MEDCouplingUMesh *_mesh_from_distant;
   public:
     static int _argc;
     static char **_argv;
index 3bd9e40743e83226648bd619ba5d250dd5c74993..7324b72e3668646aaa019931d2b464fb320a7747 100644 (file)
@@ -64,8 +64,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::get1DMesh()
   {
-    ParaMEDMEM::MEDCouplingUMesh *m1=MEDCouplingCorbaServBasicsTest::build1DMesh();
-    ParaMEDMEM::MEDCouplingUMeshServant *m=new ParaMEDMEM::MEDCouplingUMeshServant(m1);
+    MEDCoupling::MEDCouplingUMesh *m1=MEDCouplingCorbaServBasicsTest::build1DMesh();
+    MEDCoupling::MEDCouplingUMeshServant *m=new MEDCoupling::MEDCouplingUMeshServant(m1);
     m1->decrRef();
     SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -73,8 +73,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::get2DMesh()
   {
-    ParaMEDMEM::MEDCouplingUMesh *m1=MEDCouplingCorbaServBasicsTest::build2DMesh();
-    ParaMEDMEM::MEDCouplingUMeshServant *m=new ParaMEDMEM::MEDCouplingUMeshServant(m1);
+    MEDCoupling::MEDCouplingUMesh *m1=MEDCouplingCorbaServBasicsTest::build2DMesh();
+    MEDCoupling::MEDCouplingUMeshServant *m=new MEDCoupling::MEDCouplingUMeshServant(m1);
     m1->decrRef();
     SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -82,8 +82,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::get3DMesh()
   {
-    ParaMEDMEM::MEDCouplingUMesh *m1=MEDCouplingCorbaServBasicsTest::build3DMesh();
-    ParaMEDMEM::MEDCouplingUMeshServant *m=new ParaMEDMEM::MEDCouplingUMeshServant(m1);
+    MEDCoupling::MEDCouplingUMesh *m1=MEDCouplingCorbaServBasicsTest::build3DMesh();
+    MEDCoupling::MEDCouplingUMeshServant *m=new MEDCoupling::MEDCouplingUMeshServant(m1);
     m1->decrRef();
     SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -91,8 +91,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::get3DSurfMesh()
   {
-    ParaMEDMEM::MEDCouplingUMesh *m1=MEDCouplingCorbaServBasicsTest::build3DSurfMesh();
-    ParaMEDMEM::MEDCouplingUMeshServant *m=new ParaMEDMEM::MEDCouplingUMeshServant(m1);
+    MEDCoupling::MEDCouplingUMesh *m1=MEDCouplingCorbaServBasicsTest::build3DSurfMesh();
+    MEDCoupling::MEDCouplingUMeshServant *m=new MEDCoupling::MEDCouplingUMeshServant(m1);
     m1->decrRef();
     SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -100,8 +100,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::get0DMesh()
   {
-    ParaMEDMEM::MEDCouplingUMesh *m1=MEDCouplingCorbaServBasicsTest::build0DMesh();
-    ParaMEDMEM::MEDCouplingUMeshServant *m=new ParaMEDMEM::MEDCouplingUMeshServant(m1);
+    MEDCoupling::MEDCouplingUMesh *m1=MEDCouplingCorbaServBasicsTest::build0DMesh();
+    MEDCoupling::MEDCouplingUMeshServant *m=new MEDCoupling::MEDCouplingUMeshServant(m1);
     m1->decrRef();
     SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -109,8 +109,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getM1DMesh()
   {
-    ParaMEDMEM::MEDCouplingUMesh *m1=MEDCouplingCorbaServBasicsTest::buildM1DMesh();
-    ParaMEDMEM::MEDCouplingUMeshServant *m=new ParaMEDMEM::MEDCouplingUMeshServant(m1);
+    MEDCoupling::MEDCouplingUMesh *m1=MEDCouplingCorbaServBasicsTest::buildM1DMesh();
+    MEDCoupling::MEDCouplingUMeshServant *m=new MEDCoupling::MEDCouplingUMeshServant(m1);
     m1->decrRef();
     SALOME_MED::MEDCouplingUMeshCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -118,10 +118,10 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingExtrudedMeshCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getExtrudedMesh()
   {
-    ParaMEDMEM::MEDCouplingUMesh *m2D;
-    ParaMEDMEM::MEDCouplingExtrudedMesh *m1=MEDCouplingCorbaServBasicsTest::buildExtrudedMesh(m2D);
+    MEDCoupling::MEDCouplingUMesh *m2D;
+    MEDCoupling::MEDCouplingExtrudedMesh *m1=MEDCouplingCorbaServBasicsTest::buildExtrudedMesh(m2D);
     m2D->decrRef();
-    ParaMEDMEM::MEDCouplingExtrudedMeshServant *m=new ParaMEDMEM::MEDCouplingExtrudedMeshServant(m1);
+    MEDCoupling::MEDCouplingExtrudedMeshServant *m=new MEDCoupling::MEDCouplingExtrudedMeshServant(m1);
     m1->decrRef();
     SALOME_MED::MEDCouplingExtrudedMeshCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -129,8 +129,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingCMeshCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getCMesh()
   {
-    ParaMEDMEM::MEDCouplingCMesh *m1=MEDCouplingCorbaServBasicsTest::buildCMesh();
-    ParaMEDMEM::MEDCouplingCMeshServant *m=new ParaMEDMEM::MEDCouplingCMeshServant(m1);
+    MEDCoupling::MEDCouplingCMesh *m1=MEDCouplingCorbaServBasicsTest::buildCMesh();
+    MEDCoupling::MEDCouplingCMeshServant *m=new MEDCoupling::MEDCouplingCMeshServant(m1);
     m1->decrRef();
     SALOME_MED::MEDCouplingCMeshCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -138,8 +138,8 @@ namespace SALOME_TEST
   
   SALOME_MED::MEDCouplingIMeshCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getIMesh()
   {
-    ParaMEDMEM::MEDCouplingIMesh *m1=MEDCouplingCorbaServBasicsTest::buildIMesh();
-    ParaMEDMEM::MEDCouplingIMeshServant *m=new ParaMEDMEM::MEDCouplingIMeshServant(m1);
+    MEDCoupling::MEDCouplingIMesh *m1=MEDCouplingCorbaServBasicsTest::buildIMesh();
+    MEDCoupling::MEDCouplingIMeshServant *m=new MEDCoupling::MEDCouplingIMeshServant(m1);
     m1->decrRef();
     SALOME_MED::MEDCouplingIMeshCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -147,8 +147,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingCurveLinearMeshCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getCLMesh()
   {
-    ParaMEDMEM::MEDCouplingCurveLinearMesh *m1=MEDCouplingCorbaServBasicsTest::buildCLMesh();
-    ParaMEDMEM::MEDCouplingCurveLinearMeshServant *m=new ParaMEDMEM::MEDCouplingCurveLinearMeshServant(m1);
+    MEDCoupling::MEDCouplingCurveLinearMesh *m1=MEDCouplingCorbaServBasicsTest::buildCLMesh();
+    MEDCoupling::MEDCouplingCurveLinearMeshServant *m=new MEDCoupling::MEDCouplingCurveLinearMeshServant(m1);
     m1->decrRef();
     SALOME_MED::MEDCouplingCurveLinearMeshCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -156,8 +156,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCoupling1SGTUMeshCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::get1SGTUMesh()
   {
-    ParaMEDMEM::MEDCoupling1SGTUMesh *m1=MEDCouplingCorbaServBasicsTest::build1SGTUMesh();
-    ParaMEDMEM::MEDCoupling1SGTUMeshServant *m=new ParaMEDMEM::MEDCoupling1SGTUMeshServant(m1);
+    MEDCoupling::MEDCoupling1SGTUMesh *m1=MEDCouplingCorbaServBasicsTest::build1SGTUMesh();
+    MEDCoupling::MEDCoupling1SGTUMeshServant *m=new MEDCoupling::MEDCoupling1SGTUMeshServant(m1);
     m1->decrRef();
     SALOME_MED::MEDCoupling1SGTUMeshCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -165,8 +165,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCoupling1DGTUMeshCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::get1DGTUMesh()
   {
-    ParaMEDMEM::MEDCoupling1DGTUMesh *m1=MEDCouplingCorbaServBasicsTest::build1DGTUMesh();
-    ParaMEDMEM::MEDCoupling1DGTUMeshServant *m=new ParaMEDMEM::MEDCoupling1DGTUMeshServant(m1);
+    MEDCoupling::MEDCoupling1DGTUMesh *m1=MEDCouplingCorbaServBasicsTest::build1DGTUMesh();
+    MEDCoupling::MEDCoupling1DGTUMeshServant *m=new MEDCoupling::MEDCoupling1DGTUMeshServant(m1);
     m1->decrRef();
     SALOME_MED::MEDCoupling1DGTUMeshCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -174,8 +174,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getFieldScalarOn2DNT()
   {
-    ParaMEDMEM::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldScalarOn2DNT();
-    ParaMEDMEM::MEDCouplingFieldDoubleServant *m=new ParaMEDMEM::MEDCouplingFieldDoubleServant(field);
+    MEDCoupling::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldScalarOn2DNT();
+    MEDCoupling::MEDCouplingFieldDoubleServant *m=new MEDCoupling::MEDCouplingFieldDoubleServant(field);
     field->decrRef();
     SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -183,8 +183,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getFieldNodeScalarOn2DNT()
   {
-    ParaMEDMEM::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldNodeScalarOn2DNT();
-    ParaMEDMEM::MEDCouplingFieldDoubleServant *m=new ParaMEDMEM::MEDCouplingFieldDoubleServant(field);
+    MEDCoupling::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldNodeScalarOn2DNT();
+    MEDCoupling::MEDCouplingFieldDoubleServant *m=new MEDCoupling::MEDCouplingFieldDoubleServant(field);
     field->decrRef();
     SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -192,8 +192,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getFieldScalarOn3DNT()
   {
-    ParaMEDMEM::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DNT();
-    ParaMEDMEM::MEDCouplingFieldDoubleServant *m=new ParaMEDMEM::MEDCouplingFieldDoubleServant(field);
+    MEDCoupling::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DNT();
+    MEDCoupling::MEDCouplingFieldDoubleServant *m=new MEDCoupling::MEDCouplingFieldDoubleServant(field);
     field->decrRef();
     SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -201,8 +201,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getFieldScalarOn3DSurfWT()
   {
-    ParaMEDMEM::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DSurfWT();
-    ParaMEDMEM::MEDCouplingFieldDoubleServant *m=new ParaMEDMEM::MEDCouplingFieldDoubleServant(field);
+    MEDCoupling::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DSurfWT();
+    MEDCoupling::MEDCouplingFieldDoubleServant *m=new MEDCoupling::MEDCouplingFieldDoubleServant(field);
     field->decrRef();
     SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -210,8 +210,8 @@ namespace SALOME_TEST
   
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getFieldScalarOn3DSurfCOTI()
   {
-    ParaMEDMEM::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DSurfCOTI();
-    ParaMEDMEM::MEDCouplingFieldDoubleServant *m=new ParaMEDMEM::MEDCouplingFieldDoubleServant(field);
+    MEDCoupling::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldScalarOn3DSurfCOTI();
+    MEDCoupling::MEDCouplingFieldDoubleServant *m=new MEDCoupling::MEDCouplingFieldDoubleServant(field);
     field->decrRef();
     SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -219,8 +219,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getFieldScalarOn2DLT()
   {
-    ParaMEDMEM::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldScalarOn2DLT();
-    ParaMEDMEM::MEDCouplingFieldDoubleServant *m=new ParaMEDMEM::MEDCouplingFieldDoubleServant(field);
+    MEDCoupling::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldScalarOn2DLT();
+    MEDCoupling::MEDCouplingFieldDoubleServant *m=new MEDCoupling::MEDCouplingFieldDoubleServant(field);
     field->decrRef();
     SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -228,8 +228,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getFieldGaussPt2DWT()
   {
-    ParaMEDMEM::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldGaussPt2DWT();
-    ParaMEDMEM::MEDCouplingFieldDoubleServant *m=new ParaMEDMEM::MEDCouplingFieldDoubleServant(field);
+    MEDCoupling::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldGaussPt2DWT();
+    MEDCoupling::MEDCouplingFieldDoubleServant *m=new MEDCoupling::MEDCouplingFieldDoubleServant(field);
     field->decrRef();
     SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -237,8 +237,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getFieldGaussPtNE2DWT()
   {
-    ParaMEDMEM::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldGaussPtNE2DWT();
-    ParaMEDMEM::MEDCouplingFieldDoubleServant *m=new ParaMEDMEM::MEDCouplingFieldDoubleServant(field);
+    MEDCoupling::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldGaussPtNE2DWT();
+    MEDCoupling::MEDCouplingFieldDoubleServant *m=new MEDCoupling::MEDCouplingFieldDoubleServant(field);
     field->decrRef();
     SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -246,8 +246,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getFieldVectorOnExtrudedWT()
   {
-    ParaMEDMEM::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldVectorOnExtrudedWT();
-    ParaMEDMEM::MEDCouplingFieldDoubleServant *m=new ParaMEDMEM::MEDCouplingFieldDoubleServant(field);
+    MEDCoupling::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldVectorOnExtrudedWT();
+    MEDCoupling::MEDCouplingFieldDoubleServant *m=new MEDCoupling::MEDCouplingFieldDoubleServant(field);
     field->decrRef();
     SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -255,8 +255,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getFieldVectorOnCMeshWT()
   {
-    ParaMEDMEM::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldVectorOnCMeshWT();
-    ParaMEDMEM::MEDCouplingFieldDoubleServant *m=new ParaMEDMEM::MEDCouplingFieldDoubleServant(field);
+    MEDCoupling::MEDCouplingFieldDouble *field=MEDCouplingCorbaServBasicsTest::buildFieldVectorOnCMeshWT();
+    MEDCoupling::MEDCouplingFieldDoubleServant *m=new MEDCoupling::MEDCouplingFieldDoubleServant(field);
     field->decrRef();
     SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -264,8 +264,8 @@ namespace SALOME_TEST
   
   SALOME_MED::MEDCouplingFieldTemplateCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getFieldTemplateCellOn2D()
   {
-    ParaMEDMEM::MEDCouplingFieldTemplate *field=MEDCouplingCorbaServBasicsTest::buildFieldTemplateCellOn2D();
-    ParaMEDMEM::MEDCouplingFieldTemplateServant *m=new ParaMEDMEM::MEDCouplingFieldTemplateServant(field);
+    MEDCoupling::MEDCouplingFieldTemplate *field=MEDCouplingCorbaServBasicsTest::buildFieldTemplateCellOn2D();
+    MEDCoupling::MEDCouplingFieldTemplateServant *m=new MEDCoupling::MEDCouplingFieldTemplateServant(field);
     field->decrRef();
     SALOME_MED::MEDCouplingFieldTemplateCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -273,8 +273,8 @@ namespace SALOME_TEST
   
   SALOME_MED::MEDCouplingFieldTemplateCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getFieldTemplateNodeOn2D()
   {
-    ParaMEDMEM::MEDCouplingFieldTemplate *field=MEDCouplingCorbaServBasicsTest::buildFieldTemplateNodeOn2D();
-    ParaMEDMEM::MEDCouplingFieldTemplateServant *m=new ParaMEDMEM::MEDCouplingFieldTemplateServant(field);
+    MEDCoupling::MEDCouplingFieldTemplate *field=MEDCouplingCorbaServBasicsTest::buildFieldTemplateNodeOn2D();
+    MEDCoupling::MEDCouplingFieldTemplateServant *m=new MEDCoupling::MEDCouplingFieldTemplateServant(field);
     field->decrRef();
     SALOME_MED::MEDCouplingFieldTemplateCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -282,8 +282,8 @@ namespace SALOME_TEST
   
   SALOME_MED::MEDCouplingFieldTemplateCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getFieldTemplateGaussPtOn2D()
   {
-    ParaMEDMEM::MEDCouplingFieldTemplate *field=MEDCouplingCorbaServBasicsTest::buildFieldTemplateGaussPtOn2D();
-    ParaMEDMEM::MEDCouplingFieldTemplateServant *m=new ParaMEDMEM::MEDCouplingFieldTemplateServant(field);
+    MEDCoupling::MEDCouplingFieldTemplate *field=MEDCouplingCorbaServBasicsTest::buildFieldTemplateGaussPtOn2D();
+    MEDCoupling::MEDCouplingFieldTemplateServant *m=new MEDCoupling::MEDCouplingFieldTemplateServant(field);
     field->decrRef();
     SALOME_MED::MEDCouplingFieldTemplateCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -291,8 +291,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingFieldTemplateCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getFieldTemplateGaussNEOn2D()
   {
-    ParaMEDMEM::MEDCouplingFieldTemplate *field=MEDCouplingCorbaServBasicsTest::buildFieldTemplateGaussNEOn2D();
-    ParaMEDMEM::MEDCouplingFieldTemplateServant *m=new ParaMEDMEM::MEDCouplingFieldTemplateServant(field);
+    MEDCoupling::MEDCouplingFieldTemplate *field=MEDCouplingCorbaServBasicsTest::buildFieldTemplateGaussNEOn2D();
+    MEDCoupling::MEDCouplingFieldTemplateServant *m=new MEDCoupling::MEDCouplingFieldTemplateServant(field);
     field->decrRef();
     SALOME_MED::MEDCouplingFieldTemplateCorbaInterface_ptr ret=m->_this();
     return ret;
@@ -300,8 +300,8 @@ namespace SALOME_TEST
 
   SALOME_MED::MEDCouplingMultiFieldsCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getMultiFields1()
   {
-    ParaMEDMEM::MEDCouplingMultiFields *fields=MEDCouplingCorbaServBasicsTest::buildMultiFields1();
-    ParaMEDMEM::MEDCouplingMultiFieldsServant *s=new ParaMEDMEM::MEDCouplingMultiFieldsServant(fields);
+    MEDCoupling::MEDCouplingMultiFields *fields=MEDCouplingCorbaServBasicsTest::buildMultiFields1();
+    MEDCoupling::MEDCouplingMultiFieldsServant *s=new MEDCoupling::MEDCouplingMultiFieldsServant(fields);
     fields->decrRef();
     SALOME_MED::MEDCouplingMultiFieldsCorbaInterface_ptr ret=s->_this();
     return ret;
@@ -309,56 +309,56 @@ namespace SALOME_TEST
 
   SALOME_MED::DataArrayDoubleCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getArrayDouble1()
   {
-    ParaMEDMEM::DataArrayDouble *retCpp=MEDCouplingCorbaServBasicsTest::buildArrayDouble1();
-    ParaMEDMEM::DataArrayDoubleServant *retServ=new ParaMEDMEM::DataArrayDoubleServant(retCpp);
+    MEDCoupling::DataArrayDouble *retCpp=MEDCouplingCorbaServBasicsTest::buildArrayDouble1();
+    MEDCoupling::DataArrayDoubleServant *retServ=new MEDCoupling::DataArrayDoubleServant(retCpp);
     retCpp->decrRef();
     return retServ->_this();
   }
 
   SALOME_MED::DataArrayDoubleCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getArrayDouble2()
   {
-    ParaMEDMEM::DataArrayDouble *retCpp=MEDCouplingCorbaServBasicsTest::buildArrayDouble2();
-    ParaMEDMEM::DataArrayDoubleServant *retServ=new ParaMEDMEM::DataArrayDoubleServant(retCpp);
+    MEDCoupling::DataArrayDouble *retCpp=MEDCouplingCorbaServBasicsTest::buildArrayDouble2();
+    MEDCoupling::DataArrayDoubleServant *retServ=new MEDCoupling::DataArrayDoubleServant(retCpp);
     retCpp->decrRef();
     return retServ->_this();
   }
 
   SALOME_MED::DataArrayDoubleCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getArrayDouble3()
   {
-    ParaMEDMEM::DataArrayDouble *retCpp=MEDCouplingCorbaServBasicsTest::buildArrayDouble3();
-    ParaMEDMEM::DataArrayDoubleServant *retServ=new ParaMEDMEM::DataArrayDoubleServant(retCpp);
+    MEDCoupling::DataArrayDouble *retCpp=MEDCouplingCorbaServBasicsTest::buildArrayDouble3();
+    MEDCoupling::DataArrayDoubleServant *retServ=new MEDCoupling::DataArrayDoubleServant(retCpp);
     retCpp->decrRef();
     return retServ->_this();
   }
 
   SALOME_MED::DataArrayIntCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getArrayInt1()
   {
-    ParaMEDMEM::DataArrayInt *retCpp=MEDCouplingCorbaServBasicsTest::buildArrayInt1();
-    ParaMEDMEM::DataArrayIntServant *retServ=new ParaMEDMEM::DataArrayIntServant(retCpp);
+    MEDCoupling::DataArrayInt *retCpp=MEDCouplingCorbaServBasicsTest::buildArrayInt1();
+    MEDCoupling::DataArrayIntServant *retServ=new MEDCoupling::DataArrayIntServant(retCpp);
     retCpp->decrRef();
     return retServ->_this();
   }
 
   SALOME_MED::DataArrayIntCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getArrayInt2()
   {
-    ParaMEDMEM::DataArrayInt *retCpp=MEDCouplingCorbaServBasicsTest::buildArrayInt2();
-    ParaMEDMEM::DataArrayIntServant *retServ=new ParaMEDMEM::DataArrayIntServant(retCpp);
+    MEDCoupling::DataArrayInt *retCpp=MEDCouplingCorbaServBasicsTest::buildArrayInt2();
+    MEDCoupling::DataArrayIntServant *retServ=new MEDCoupling::DataArrayIntServant(retCpp);
     retCpp->decrRef();
     return retServ->_this();
   }
 
   SALOME_MED::DataArrayIntCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getArrayInt3()
   {
-    ParaMEDMEM::DataArrayInt *retCpp=MEDCouplingCorbaServBasicsTest::buildArrayInt3();
-    ParaMEDMEM::DataArrayIntServant *retServ=new ParaMEDMEM::DataArrayIntServant(retCpp);
+    MEDCoupling::DataArrayInt *retCpp=MEDCouplingCorbaServBasicsTest::buildArrayInt3();
+    MEDCoupling::DataArrayIntServant *retServ=new MEDCoupling::DataArrayIntServant(retCpp);
     retCpp->decrRef();
     return retServ->_this();
   }
 
   SALOME_MED::MEDCouplingFieldOverTimeCorbaInterface_ptr MEDCouplingMeshFieldFactoryComponent::getMultiFields2()
   {
-    ParaMEDMEM::MEDCouplingFieldOverTime *fot=MEDCouplingCorbaServBasicsTest::buildMultiFields2();
-    ParaMEDMEM::MEDCouplingFieldOverTimeServant *retServ=new ParaMEDMEM::MEDCouplingFieldOverTimeServant(fot);
+    MEDCoupling::MEDCouplingFieldOverTime *fot=MEDCouplingCorbaServBasicsTest::buildMultiFields2();
+    MEDCoupling::MEDCouplingFieldOverTimeServant *retServ=new MEDCoupling::MEDCouplingFieldOverTimeServant(fot);
     fot->decrRef();
     return retServ->_this();
   }
index 034f8f33bd1511a93d9c7a4505a6142402429463..4edc74c960039a8e881c75b670b865836e6c6d6b 100644 (file)
@@ -28,7 +28,7 @@
 #endif
 #include CORBA_SERVER_HEADER(MEDCouplingCorbaServantTest)
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingUMesh;
 }
index 4e922a7b0b7e62fbd00f72e96b6d2fc5d70132a4..280cb531360d8c4763307249761ea63c72813ce5 100644 (file)
@@ -36,7 +36,7 @@
 #include <iostream>
 #include <fstream>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 CPPUNIT_TEST_SUITE_REGISTRATION( SALOME_TEST::MEDCouplingCorbaServBasicsTestClt );
 
index 7a0f2d25690bcdf8fe47cf1386985087913e4a5f..50ce650390027cf6173b41cec0649c1c2ef8e81f 100644 (file)
@@ -25,7 +25,7 @@
 #include <iostream>
 #include <fstream>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 
 int mainCorbaServ(int argc, char **argv);
 
index ab8ba14762dd1bfd9bf049fd80233260eac06c79..b93ea35f0c6c1997c485e780c239050122d29e8f 100644 (file)
 
 #include <iostream>
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 %}
 
 %include "MEDCouplingCommon.i"
 
-%newobject ParaMEDMEM::MEDCouplingFieldDoubleClient::New;
-%newobject ParaMEDMEM::MEDCouplingFieldTemplateClient::New;
-%newobject ParaMEDMEM::MEDCouplingUMeshClient::New;
-%newobject ParaMEDMEM::MEDCoupling1SGTUMeshClient::New;
-%newobject ParaMEDMEM::MEDCoupling1DGTUMeshClient::New;
-%newobject ParaMEDMEM::MEDCouplingExtrudedMeshClient::New;
-%newobject ParaMEDMEM::MEDCouplingCMeshClient::New;
-%newobject ParaMEDMEM::MEDCouplingIMeshClient::New;
-%newobject ParaMEDMEM::MEDCouplingCurveLinearMeshClient::New;
-%newobject ParaMEDMEM::MEDCouplingMultiFieldsClient::New;
-%newobject ParaMEDMEM::MEDCouplingFieldOverTimeClient::New;
-%newobject ParaMEDMEM::DataArrayDoubleClient::New;
-%newobject ParaMEDMEM::DataArrayIntClient::New;
+%newobject MEDCoupling::MEDCouplingFieldDoubleClient::New;
+%newobject MEDCoupling::MEDCouplingFieldTemplateClient::New;
+%newobject MEDCoupling::MEDCouplingUMeshClient::New;
+%newobject MEDCoupling::MEDCoupling1SGTUMeshClient::New;
+%newobject MEDCoupling::MEDCoupling1DGTUMeshClient::New;
+%newobject MEDCoupling::MEDCouplingExtrudedMeshClient::New;
+%newobject MEDCoupling::MEDCouplingCMeshClient::New;
+%newobject MEDCoupling::MEDCouplingIMeshClient::New;
+%newobject MEDCoupling::MEDCouplingCurveLinearMeshClient::New;
+%newobject MEDCoupling::MEDCouplingMultiFieldsClient::New;
+%newobject MEDCoupling::MEDCouplingFieldOverTimeClient::New;
+%newobject MEDCoupling::DataArrayDoubleClient::New;
+%newobject MEDCoupling::DataArrayIntClient::New;
 
 %nodefaultctor;
 %nodefaultdtor;
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingFieldDoubleClient
   {
@@ -555,88 +555,88 @@ namespace ParaMEDMEM
 }
 
 %pythoncode %{
-def ParaMEDMEMDataArrayDoublenew(cls,*args):
+def MEDCouplingDataArrayDoublenew(cls,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayDouble____new___(cls,args)
-def ParaMEDMEMDataArrayDoubleIadd(self,*args):
+def MEDCouplingDataArrayDoubleIadd(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayDouble____iadd___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleIsub(self,*args):
+def MEDCouplingDataArrayDoubleIsub(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayDouble____isub___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleImul(self,*args):
+def MEDCouplingDataArrayDoubleImul(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayDouble____imul___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleIdiv(self,*args):
+def MEDCouplingDataArrayDoubleIdiv(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayDouble____idiv___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleIpow(self,*args):
+def MEDCouplingDataArrayDoubleIpow(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayDouble____ipow___(self, self, *args)
-def ParaMEDMEMMEDCouplingFieldDoublenew(cls,*args):
+def MEDCouplingFieldDoublenew(cls,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.MEDCouplingFieldDouble____new___(cls,args)
-def ParaMEDMEMMEDCouplingFieldDoubleIadd(self,*args):
+def MEDCouplingFieldDoubleIadd(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.MEDCouplingFieldDouble____iadd___(self, self, *args)
-def ParaMEDMEMMEDCouplingFieldDoubleIsub(self,*args):
+def MEDCouplingFieldDoubleIsub(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.MEDCouplingFieldDouble____isub___(self, self, *args)
-def ParaMEDMEMMEDCouplingFieldDoubleImul(self,*args):
+def MEDCouplingFieldDoubleImul(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.MEDCouplingFieldDouble____imul___(self, self, *args)
-def ParaMEDMEMMEDCouplingFieldDoubleIdiv(self,*args):
+def MEDCouplingFieldDoubleIdiv(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.MEDCouplingFieldDouble____idiv___(self, self, *args)
-def ParaMEDMEMMEDCouplingFieldDoubleIpow(self,*args):
+def MEDCouplingFieldDoubleIpow(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.MEDCouplingFieldDouble____ipow___(self, self, *args)
-def ParaMEDMEMDataArrayIntnew(cls,*args):
+def MEDCouplingDataArrayIntnew(cls,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayInt____new___(cls,args)
-def ParaMEDMEMDataArrayIntIadd(self,*args):
+def MEDCouplingDataArrayIntIadd(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayInt____iadd___(self, self, *args)
-def ParaMEDMEMDataArrayIntIsub(self,*args):
+def MEDCouplingDataArrayIntIsub(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayInt____isub___(self, self, *args)
-def ParaMEDMEMDataArrayIntImul(self,*args):
+def MEDCouplingDataArrayIntImul(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayInt____imul___(self, self, *args)
-def ParaMEDMEMDataArrayIntIdiv(self,*args):
+def MEDCouplingDataArrayIntIdiv(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayInt____idiv___(self, self, *args)
-def ParaMEDMEMDataArrayIntImod(self,*args):
+def MEDCouplingDataArrayIntImod(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayInt____imod___(self, self, *args)
-def ParaMEDMEMDataArrayIntIpow(self,*args):
+def MEDCouplingDataArrayIntIpow(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayInt____ipow___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleTupleIadd(self,*args):
+def MEDCouplingDataArrayDoubleTupleIadd(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayDoubleTuple____iadd___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleTupleIsub(self,*args):
+def MEDCouplingDataArrayDoubleTupleIsub(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayDoubleTuple____isub___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleTupleImul(self,*args):
+def MEDCouplingDataArrayDoubleTupleImul(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayDoubleTuple____imul___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleTupleIdiv(self,*args):
+def MEDCouplingDataArrayDoubleTupleIdiv(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayDoubleTuple____idiv___(self, self, *args)
-def ParaMEDMEMDataArrayIntTupleIadd(self,*args):
+def MEDCouplingDataArrayIntTupleIadd(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayIntTuple____iadd___(self, self, *args)
-def ParaMEDMEMDataArrayIntTupleIsub(self,*args):
+def MEDCouplingDataArrayIntTupleIsub(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayIntTuple____isub___(self, self, *args)
-def ParaMEDMEMDataArrayIntTupleImul(self,*args):
+def MEDCouplingDataArrayIntTupleImul(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayIntTuple____imul___(self, self, *args)
-def ParaMEDMEMDataArrayIntTupleIdiv(self,*args):
+def MEDCouplingDataArrayIntTupleIdiv(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayIntTuple____idiv___(self, self, *args)
-def ParaMEDMEMDataArrayIntTupleImod(self,*args):
+def MEDCouplingDataArrayIntTupleImod(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DataArrayIntTuple____imod___(self, self, *args)
 def ParaMEDMEMDenseMatrixIadd(self,*args):
@@ -645,25 +645,25 @@ def ParaMEDMEMDenseMatrixIadd(self,*args):
 def ParaMEDMEMDenseMatrixIsub(self,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.DenseMatrix____isub___(self, self, *args)
-def ParaMEDMEMMEDCouplingUMeshnew(cls,*args):
+def MEDCouplingUMeshnew(cls,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.MEDCouplingUMesh____new___(cls,args)
-def ParaMEDMEMMEDCoupling1DGTUMeshnew(cls,*args):
+def MEDCoupling1DGTUMeshnew(cls,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.MEDCoupling1DGTUMesh____new___(cls,args)
-def ParaMEDMEMMEDCoupling1SGTUMeshnew(cls,*args):
+def MEDCoupling1SGTUMeshnew(cls,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.MEDCoupling1SGTUMesh____new___(cls,args)
-def ParaMEDMEMMEDCouplingCurveLinearMeshnew(cls,*args):
+def MEDCouplingCurveLinearMeshnew(cls,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.MEDCouplingCurveLinearMesh____new___(cls,args)
-def ParaMEDMEMMEDCouplingCMeshnew(cls,*args):
+def MEDCouplingCMeshnew(cls,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.MEDCouplingCMesh____new___(cls,args)
-def ParaMEDMEMMEDCouplingIMeshnew(cls,*args):
+def MEDCouplingIMeshnew(cls,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.MEDCouplingIMesh____new___(cls,args)
-def ParaMEDMEMMEDCouplingExtrudedMeshnew(cls,*args):
+def MEDCouplingExtrudedMeshnew(cls,*args):
     import _MEDCouplingClient
     return _MEDCouplingClient.MEDCouplingExtrudedMesh____new___(cls,args)
 %}
index a57298512b0d22970730c2ca6a0677889e1911f9..6c3266d4bb287ac27188102e291b1229a969f547 100644 (file)
 #include "DataArrayIntServant.hxx"
 #include "MEDCouplingCorbaTypemaps.i"
 
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
 %}
 
 %include "MEDCouplingCommon.i"
 
-namespace ParaMEDMEM
+namespace MEDCoupling
 {
   class MEDCouplingFieldDoubleServant
   {
@@ -315,115 +315,115 @@ namespace ParaMEDMEM
 }
 
 %pythoncode %{
-def ParaMEDMEMDataArrayDoublenew(cls,*args):
+def MEDCouplingDataArrayDoublenew(cls,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayDouble____new___(cls,args)
-def ParaMEDMEMDataArrayDoubleIadd(self,*args):
+def MEDCouplingDataArrayDoubleIadd(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayDouble____iadd___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleIsub(self,*args):
+def MEDCouplingDataArrayDoubleIsub(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayDouble____isub___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleImul(self,*args):
+def MEDCouplingDataArrayDoubleImul(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayDouble____imul___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleIdiv(self,*args):
+def MEDCouplingDataArrayDoubleIdiv(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayDouble____idiv___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleIpow(self,*args):
+def MEDCouplingDataArrayDoubleIpow(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayDouble____ipow___(self, self, *args)
-def ParaMEDMEMMEDCouplingFieldDoublenew(cls,*args):
+def MEDCouplingFieldDoublenew(cls,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.MEDCouplingFieldDouble____new___(cls,args)
-def ParaMEDMEMMEDCouplingFieldDoubleIadd(self,*args):
+def MEDCouplingFieldDoubleIadd(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.MEDCouplingFieldDouble____iadd___(self, self, *args)
-def ParaMEDMEMMEDCouplingFieldDoubleIsub(self,*args):
+def MEDCouplingFieldDoubleIsub(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.MEDCouplingFieldDouble____isub___(self, self, *args)
-def ParaMEDMEMMEDCouplingFieldDoubleImul(self,*args):
+def MEDCouplingFieldDoubleImul(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.MEDCouplingFieldDouble____imul___(self, self, *args)
-def ParaMEDMEMMEDCouplingFieldDoubleIdiv(self,*args):
+def MEDCouplingFieldDoubleIdiv(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.MEDCouplingFieldDouble____idiv___(self, self, *args)
-def ParaMEDMEMMEDCouplingFieldDoubleIpow(self,*args):
+def MEDCouplingFieldDoubleIpow(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.MEDCouplingFieldDouble____ipow___(self, self, *args)
-def ParaMEDMEMDataArrayIntnew(cls,*args):
+def MEDCouplingDataArrayIntnew(cls,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayInt____new___(cls,args)
-def ParaMEDMEMDataArrayIntIadd(self,*args):
+def MEDCouplingDataArrayIntIadd(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayInt____iadd___(self, self, *args)
-def ParaMEDMEMDataArrayIntIsub(self,*args):
+def MEDCouplingDataArrayIntIsub(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayInt____isub___(self, self, *args)
-def ParaMEDMEMDataArrayIntImul(self,*args):
+def MEDCouplingDataArrayIntImul(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayInt____imul___(self, self, *args)
-def ParaMEDMEMDataArrayIntIdiv(self,*args):
+def MEDCouplingDataArrayIntIdiv(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayInt____idiv___(self, self, *args)
-def ParaMEDMEMDataArrayIntImod(self,*args):
+def MEDCouplingDataArrayIntImod(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayInt____imod___(self, self, *args)
-def ParaMEDMEMDataArrayIntIpow(self,*args):
+def MEDCouplingDataArrayIntIpow(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayInt____ipow___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleTupleIadd(self,*args):
+def MEDCouplingDataArrayDoubleTupleIadd(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayDoubleTuple____iadd___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleTupleIsub(self,*args):
+def MEDCouplingDataArrayDoubleTupleIsub(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayDoubleTuple____isub___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleTupleImul(self,*args):
+def MEDCouplingDataArrayDoubleTupleImul(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayDoubleTuple____imul___(self, self, *args)
-def ParaMEDMEMDataArrayDoubleTupleIdiv(self,*args):
+def MEDCouplingDataArrayDoubleTupleIdiv(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayDoubleTuple____idiv___(self, self, *args)
-def ParaMEDMEMDataArrayIntTupleIadd(self,*args):
+def MEDCouplingDataArrayIntTupleIadd(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayIntTuple____iadd___(self, self, *args)
-def ParaMEDMEMDataArrayIntTupleIsub(self,*args):
+def MEDCouplingDataArrayIntTupleIsub(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayIntTuple____isub___(self, self, *args)
-def ParaMEDMEMDataArrayIntTupleImul(self,*args):
+def MEDCouplingDataArrayIntTupleImul(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayIntTuple____imul___(self, self, *args)
-def ParaMEDMEMDataArrayIntTupleIdiv(self,*args):
+def MEDCouplingDataArrayIntTupleIdiv(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayIntTuple____idiv___(self, self, *args)
-def ParaMEDMEMDataArrayIntTupleImod(self,*args):
+def MEDCouplingDataArrayIntTupleImod(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DataArrayIntTuple____imod___(self, self, *args)
-def ParaMEDMEMDenseMatrixIadd(self,*args):
+def MEDCouplingDenseMatrixIadd(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DenseMatrix____iadd___(self, self, *args)
-def ParaMEDMEMDenseMatrixIsub(self,*args):
+def MEDCouplingDenseMatrixIsub(self,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.DenseMatrix____isub___(self, self, *args)
-def ParaMEDMEMMEDCouplingUMeshnew(cls,*args):
+def MEDCouplingUMeshnew(cls,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.MEDCouplingUMesh____new___(cls,args)
-def ParaMEDMEMMEDCoupling1DGTUMeshnew(cls,*args):
+def MEDCoupling1DGTUMeshnew(cls,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.MEDCoupling1DGTUMesh____new___(cls,args)
-def ParaMEDMEMMEDCoupling1SGTUMeshnew(cls,*args):
+def MEDCoupling1SGTUMeshnew(cls,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.MEDCoupling1SGTUMesh____new___(cls,args)
-def ParaMEDMEMMEDCouplingCurveLinearMeshnew(cls,*args):
+def MEDCouplingCurveLinearMeshnew(cls,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.MEDCouplingCurveLinearMesh____new___(cls,args)
-def ParaMEDMEMMEDCouplingCMeshnew(cls,*args):
+def MEDCouplingCMeshnew(cls,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.MEDCouplingCMesh____new___(cls,args)
-def ParaMEDMEMMEDCouplingIMeshnew(cls,*args):
+def MEDCouplingIMeshnew(cls,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.MEDCouplingIMesh____new___(cls,args)
-def ParaMEDMEMMEDCouplingExtrudedMeshnew(cls,*args):
+def MEDCouplingExtrudedMeshnew(cls,*args):
     import _MEDCouplingCorba
     return _MEDCouplingCorba.MEDCouplingExtrudedMesh____new___(cls,args)
 %}