From: cvw <cvw>
Date: Fri, 16 Mar 2012 13:09:43 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: V6_main_FINAL~784
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a241a5afb3269711c18c68dd19f921288adf884f;p=tools%2Fmedcoupling.git

*** empty log message ***
---

diff --git a/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx b/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx
index 7c151b224..2131ff4c0 100644
--- a/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx
+++ b/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx
@@ -703,7 +703,7 @@ void MEDPARTITIONERTest::verifyTestMeshWithVecFieldOnNodes()
     }
   m->decrRef();
   
-  MEDFileUMesh * mf = MEDFileUMesh::New(_file_name.c_str(),_meshName.c_str(),-1,-1);
+  MEDFileUMesh * mf = MEDFileUMesh::New(_file_name.c_str(),_mesh_name.c_str(),-1,-1);
   vector<int> lev;
   lev=mf->getNonEmptyLevels();
   if (_verbose)
diff --git a/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx b/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx
index 8af687247..1278b458e 100644
--- a/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx
+++ b/src/MEDPartitioner/Test/MEDPARTITIONERTest.hxx
@@ -46,7 +46,7 @@ public:
   int _nj;
   int _nk;
   int _ntot;
-  std::string _fileName; //initial test mesh file med CUBE3D
+  std::string _file_name; //initial test mesh file med CUBE3D
   std::string _file_name_with_faces; //initial test mesh file med CUBE3D plus a set of faces
   std::string _file_name2; //initial test mesh file med CARRE3D
   std::string _file_name_huge_xml;
diff --git a/src/MEDPartitioner/Test/MEDPARTITIONERTestPara.cxx b/src/MEDPartitioner/Test/MEDPARTITIONERTestPara.cxx
index 2fab79d54..28c171c42 100644
--- a/src/MEDPartitioner/Test/MEDPARTITIONERTestPara.cxx
+++ b/src/MEDPartitioner/Test/MEDPARTITIONERTestPara.cxx
@@ -157,7 +157,7 @@ void MEDPARTITIONERTest::verifyMedpartitionerOnSmallSizeForFieldOnCells()
   string fileName,cmd,execName,sourceName,targetName,input;
   execName=getenv("MED_ROOT_DIR");  //.../INSTALL/MED
   execName+="/bin/salome/medpartitioner_para";
-  fileName=_fileName;
+  fileName=_file_name;
   fileName.replace(fileName.find(".med"),4,"_WithVecFieldOnCells.med");
   
   ParaMEDMEM::MEDFileUMesh* initialMesh=ParaMEDMEM::MEDFileUMesh::New(fileName.c_str(),_mesh_name.c_str());
@@ -245,7 +245,7 @@ void MEDPARTITIONERTest::verifyMedpartitionerOnSmallSizeForFieldOnGaussNe()
   string fileName,cmd,execName,sourceName,targetName,input;
   execName=getenv("MED_ROOT_DIR");  //.../INSTALL/MED
   execName+="/bin/salome/medpartitioner_para";
-  fileName=_fileName;
+  fileName=_file_name;
   fileName.replace(fileName.find(".med"),4,"_WithVecFieldOnGaussNe.med");
   
   ParaMEDMEM::MEDFileUMesh* initialMesh=ParaMEDMEM::MEDFileUMesh::New(fileName.c_str(),_mesh_name.c_str());
@@ -369,8 +369,8 @@ void MEDPARTITIONERTest::launchMedpartitionerOnTestMeshes()
   CPPUNIT_ASSERT_EQUAL(0, res);
   
   cmd="mpirun -np 2 "+execName+" --ndomains=2 --split-method=metis";  //on same proc
-  sourceName=_fileName;
-  targetName=_fileName;
+  sourceName=_file_name;
+  targetName=_file_name;
   targetName.replace(targetName.find(".med"),4,"_partitionedTo2_");
   cmd+=" --input-file="+sourceName+" --output-file="+targetName+" --verbose="+IntToStr(_verbose);
   if (_verbose) cout<<endl<<cmd<<endl;
@@ -378,8 +378,8 @@ void MEDPARTITIONERTest::launchMedpartitionerOnTestMeshes()
   CPPUNIT_ASSERT_EQUAL(0, res);
   
   cmd="mpirun -np 3 "+execName+" --ndomains=5 --split-method=metis"; //on less proc
-  sourceName=_fileName;
-  targetName=_fileName;
+  sourceName=_file_name;
+  targetName=_file_name;
   targetName.replace(targetName.find(".med"),4,"_partitionedTo5_");
   cmd+=" --input-file="+sourceName+" --output-file="+targetName+" --verbose="+IntToStr(_verbose);
   if (_verbose) cout<<endl<<cmd<<endl;
@@ -388,7 +388,7 @@ void MEDPARTITIONERTest::launchMedpartitionerOnTestMeshes()
   
   cmd="mpirun -np 1 "+execName+" --ndomains=1 --split-method=metis";  //on 1 proc
   sourceName=targetName+".xml";
-  targetName=_fileName;
+  targetName=_file_name;
   targetName.replace(targetName.find(".med"),4,"_remergedFrom5_");
   cmd+=" --input-file="+sourceName+" --output-file="+targetName+" --verbose="+IntToStr(_verbose);
   if (_verbose) cout<<endl<<cmd<<endl;
@@ -397,7 +397,7 @@ void MEDPARTITIONERTest::launchMedpartitionerOnTestMeshes()
 
   cmd="mpirun -np 8 "+execName+" --ndomains=1 --split-method=metis";  //on more proc
   //sourceName=targetName+".xml";
-  targetName=_fileName;
+  targetName=_file_name;
   targetName.replace(targetName.find(".med"),4,"_remergedFrom5_");
   cmd+=" --input-file="+sourceName+" --output-file="+targetName+" --verbose="+IntToStr(_verbose);
   if (_verbose) cout<<endl<<cmd<<endl;