From 77a77e1b474cd43090a17212b5825f7b5795bf2c Mon Sep 17 00:00:00 2001 From: cvw Date: Fri, 16 Mar 2012 13:06:47 +0000 Subject: [PATCH] *** empty log message *** --- .../Test/MEDPARTITIONERTest.cxx | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx b/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx index 0fbf68817..7c151b224 100644 --- a/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx +++ b/src/MEDPartitioner/Test/MEDPARTITIONERTest.cxx @@ -58,7 +58,7 @@ void MEDPARTITIONERTest::setSize(int ni, int nj, int nk) this->_nk=nk; this->_ntot=_ni*_nj*_nk; string ijk=IntToStr(ni)+"x"+IntToStr(nj)+"x"+IntToStr(nk); - this->_fileName="tmp_testMesh_"+ijk+".med"; + this->_file_name="tmp_testMesh_"+ijk+".med"; this->_file_name_with_faces="tmp_testMeshWithFaces_"+ijk+".med"; string ij=IntToStr(ni)+"x"+IntToStr(nj); this->_file_name2="tmp_testMesh_"+ij+".med"; @@ -325,7 +325,7 @@ MEDCouplingFieldDouble * MEDPARTITIONERTest::buildVecFieldOnCells(string myfileN field.push_back(j+.2); field.push_back(k+.3); } - //cvwat + MEDCouplingUMesh *mesh=MEDLoader::ReadUMeshFromFile(myfileName.c_str(),_mesh_name.c_str(),0); int nbOfCells=mesh->getNumberOfCells(); MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_CELLS,ONE_TIME); @@ -359,7 +359,7 @@ MEDCouplingFieldDouble * MEDPARTITIONERTest::buildVecFieldOnNodes() field.push_back(k+.3); } - MEDCouplingUMesh *mesh=MEDLoader::ReadUMeshFromFile(_fileName.c_str(),_mesh_name.c_str(),0); + MEDCouplingUMesh *mesh=MEDLoader::ReadUMeshFromFile(_file_name.c_str(),_mesh_name.c_str(),0); int nbOfNodes=mesh->getNumberOfNodes(); MEDCouplingFieldDouble *f1=MEDCouplingFieldDouble::New(ON_NODES,ONE_TIME); f1->setName("VectorFieldOnNodes"); @@ -384,12 +384,12 @@ void MEDPARTITIONERTest::createTestMeshWithoutField() { { MEDCouplingUMesh * mesh = buildCUBE3DMesh(); - MEDLoader::WriteUMesh(_fileName.c_str(),mesh,true); - if (_verbose) cout<getName(),0); - if (_verbose) cout<<_fileName<<" reread"<getName(),0); + if (_verbose) cout<<_file_name<<" reread"<isEqual(mesh_rw,1e-12)); mesh_rw->decrRef(); } @@ -575,7 +575,7 @@ void MEDPARTITIONERTest::createHugeTestMesh(int ni, int nj, int nk, int nbx, int void MEDPARTITIONERTest::createTestMeshWithVecFieldOnCells() { { - string name=_fileName; + string name=_file_name; MEDCouplingFieldDouble *f1=buildVecFieldOnCells(name); name.replace(name.find(".med"),4,"_WithVecFieldOnCells.med"); MEDLoader::WriteField(name.c_str(),f1,true); @@ -594,7 +594,7 @@ void MEDPARTITIONERTest::createTestMeshWithVecFieldOnCells() f1->decrRef(); } { - string name=_fileName; + string name=_file_name; MEDCouplingFieldDouble *f1=buildVecFieldOnCells(name); name.replace(name.find(".med"),4,"_WithVecFieldOnGaussNe.med"); MEDCouplingFieldDouble *f3=MEDCouplingFieldDouble::New(ON_GAUSS_NE,ONE_TIME); @@ -670,7 +670,7 @@ void MEDPARTITIONERTest::createTestMeshWithVecFieldOnCells() void MEDPARTITIONERTest::createTestMeshWithVecFieldOnNodes() { MEDCouplingFieldDouble *f1=buildVecFieldOnNodes(); - string name=_fileName; + string name=_file_name; name.replace(name.find(".med"),4,"_WithVecFieldOnNodes.med"); MEDLoader::WriteField(name.c_str(),f1,true); if (_verbose) cout<& types=m->getAllTypes(); @@ -703,7 +703,7 @@ void MEDPARTITIONERTest::verifyTestMeshWithVecFieldOnNodes() } m->decrRef(); - MEDFileUMesh * mf = MEDFileUMesh::New(_fileName.c_str(),_meshName.c_str(),-1,-1); + MEDFileUMesh * mf = MEDFileUMesh::New(_file_name.c_str(),_meshName.c_str(),-1,-1); vector lev; lev=mf->getNonEmptyLevels(); if (_verbose) -- 2.39.2