Salome HOME
projects
/
tools
/
medcoupling.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
MEDCoupling API change - stage #1
[tools/medcoupling.git]
/
src
/
MEDLoader
/
Test
/
SauvLoaderTest.cxx
diff --git
a/src/MEDLoader/Test/SauvLoaderTest.cxx
b/src/MEDLoader/Test/SauvLoaderTest.cxx
index 66fbcda6b31ce6ff23df870f4bee6636ff30c221..296e8ad20c2d7652b58d148ff6ab2a21d788ef74 100644
(file)
--- a/
src/MEDLoader/Test/SauvLoaderTest.cxx
+++ b/
src/MEDLoader/Test/SauvLoaderTest.cxx
@@
-27,7
+27,7
@@
#include "TestInterpKernelUtils.hxx" // getResourceFile()
#ifdef WIN32
#include "TestInterpKernelUtils.hxx" // getResourceFile()
#ifdef WIN32
-#
include <windows.h>
+#include <windows.h>
#else
# include <unistd.h>
#endif
#else
# include <unistd.h>
#endif
@@
-35,14
+35,14
@@
#include <vector>
#include <string>
#include <vector>
#include <string>
-using namespace
ParaMEDMEM
;
+using namespace
MEDCoupling
;
void SauvLoaderTest::testSauv2Med()
{
// read a file containing all types of readable piles
std::string file = INTERP_TEST::getResourceFile("allPillesTest.sauv", 3);
void SauvLoaderTest::testSauv2Med()
{
// read a file containing all types of readable piles
std::string file = INTERP_TEST::getResourceFile("allPillesTest.sauv", 3);
- M
EDCouplingAutoRefCountObjectPtr
<SauvReader> sr=SauvReader::New(file.c_str());
- M
EDCouplingAutoRefCountObjectPtr
<MEDFileData> d2=sr->loadInMEDFileDS();
+ M
CAuto
<SauvReader> sr=SauvReader::New(file.c_str());
+ M
CAuto
<MEDFileData> d2=sr->loadInMEDFileDS();
// write MED
d2->write("allPillesTest.med",0);
// check
// write MED
d2->write("allPillesTest.med",0);
// check
@@
-59,23
+59,23
@@
void SauvLoaderTest::testMed2SauvOnAMeshWithVoidFamily()
const int nbOfNodes = 6;
double coords[nbOfNodes*spaceDim] = {0,0, 1,0, 1,1, 0,1, 2,0, 2,1};
int conn[8]={0,1,2,3, 1,4,5,2};
const int nbOfNodes = 6;
double coords[nbOfNodes*spaceDim] = {0,0, 1,0, 1,1, 0,1, 2,0, 2,1};
int conn[8]={0,1,2,3, 1,4,5,2};
- M
EDCouplingAutoRefCountObjectPtr
<MEDCouplingUMesh> mesh2d=MEDCouplingUMesh::New("Mesh",spaceDim);
+ M
CAuto
<MEDCouplingUMesh> mesh2d=MEDCouplingUMesh::New("Mesh",spaceDim);
mesh2d->allocateCells(2);
mesh2d->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);
mesh2d->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+4);
mesh2d->finishInsertingCells();
mesh2d->allocateCells(2);
mesh2d->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);
mesh2d->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+4);
mesh2d->finishInsertingCells();
- M
EDCouplingAutoRefCountObjectPtr
<DataArrayDouble> myCoords=DataArrayDouble::New();
+ M
CAuto
<DataArrayDouble> myCoords=DataArrayDouble::New();
myCoords->alloc(nbOfNodes,spaceDim);
std::copy(coords,coords+nbOfNodes*spaceDim,myCoords->getPointer());
mesh2d->setCoords(myCoords);
// create a MedFileUMesh
myCoords->alloc(nbOfNodes,spaceDim);
std::copy(coords,coords+nbOfNodes*spaceDim,myCoords->getPointer());
mesh2d->setCoords(myCoords);
// create a MedFileUMesh
- M
EDCouplingAutoRefCountObjectPtr
<MEDFileUMesh> m= MEDFileUMesh::New();
+ M
CAuto
<MEDFileUMesh> m= MEDFileUMesh::New();
m->setMeshAtLevel(0,mesh2d);
// Create families and groups
m->setMeshAtLevel(0,mesh2d);
// Create families and groups
- M
EDCouplingAutoRefCountObjectPtr
<DataArrayInt> fam = DataArrayInt::New();
+ M
CAuto
<DataArrayInt> fam = DataArrayInt::New();
fam->alloc(2,1);
int elemsFams[2] = {-2,-3};
std::copy(elemsFams,elemsFams+2,fam->getPointer());
fam->alloc(2,1);
int elemsFams[2] = {-2,-3};
std::copy(elemsFams,elemsFams+2,fam->getPointer());
@@
-102,23
+102,23
@@
void SauvLoaderTest::testMed2SauvOnAMeshWithVoidFamily()
// write to SAUV
const char* sauvFile = "mesh_with_void_family.sauv";
// write to SAUV
const char* sauvFile = "mesh_with_void_family.sauv";
- M
EDCouplingAutoRefCountObjectPtr
<MEDFileData> medData = MEDFileData::New();
- M
EDCouplingAutoRefCountObjectPtr
<MEDFileMeshes> medMeshes = MEDFileMeshes::New();
- M
EDCouplingAutoRefCountObjectPtr
<SauvWriter> sw=SauvWriter::New();
+ M
CAuto
<MEDFileData> medData = MEDFileData::New();
+ M
CAuto
<MEDFileMeshes> medMeshes = MEDFileMeshes::New();
+ M
CAuto
<SauvWriter> sw=SauvWriter::New();
medMeshes->setMeshAtPos(0, m);
medData->setMeshes(medMeshes);
sw->setMEDFileDS(medData);
sw->write(sauvFile);
// read SAUV and check groups
medMeshes->setMeshAtPos(0, m);
medData->setMeshes(medMeshes);
sw->setMEDFileDS(medData);
sw->write(sauvFile);
// read SAUV and check groups
- M
EDCouplingAutoRefCountObjectPtr
<SauvReader> sr=SauvReader::New(sauvFile);
- M
EDCouplingAutoRefCountObjectPtr
<MEDFileData> d2=sr->loadInMEDFileDS();
+ M
CAuto
<SauvReader> sr=SauvReader::New(sauvFile);
+ M
CAuto
<MEDFileData> d2=sr->loadInMEDFileDS();
MEDFileUMesh* m2 = static_cast<MEDFileUMesh*>( d2->getMeshes()->getMeshAtPos(0) );
MEDFileUMesh* m2 = static_cast<MEDFileUMesh*>( d2->getMeshes()->getMeshAtPos(0) );
- M
EDCouplingAutoRefCountObjectPtr
<MEDCouplingUMesh> group1 = m2->getGroup(0, "Group1");
+ M
CAuto
<MEDCouplingUMesh> group1 = m2->getGroup(0, "Group1");
CPPUNIT_ASSERT_EQUAL(1,(int)group1->getNumberOfCells());
CPPUNIT_ASSERT_EQUAL(1,(int)group1->getNumberOfCells());
- M
EDCouplingAutoRefCountObjectPtr
<MEDCouplingUMesh> group2 = m2->getGroup(0, "Group2");
+ M
CAuto
<MEDCouplingUMesh> group2 = m2->getGroup(0, "Group2");
CPPUNIT_ASSERT_EQUAL(1,(int)group2->getNumberOfCells());
CPPUNIT_ASSERT_EQUAL(1,(int)group2->getNumberOfCells());
- M
EDCouplingAutoRefCountObjectPtr
<MEDCouplingUMesh> grptot = m2->getGroup(0, "Grouptot");
+ M
CAuto
<MEDCouplingUMesh> grptot = m2->getGroup(0, "Grouptot");
CPPUNIT_ASSERT_EQUAL(2,(int)grptot->getNumberOfCells());
}
CPPUNIT_ASSERT_EQUAL(2,(int)grptot->getNumberOfCells());
}
@@
-126,22
+126,22
@@
void SauvLoaderTest::testSauv2MedOnA3SubsField()
{
// read SAUV
std::string sauvFile = INTERP_TEST::getResourceFile("portico_3subs.sauv", 3);
{
// read SAUV
std::string sauvFile = INTERP_TEST::getResourceFile("portico_3subs.sauv", 3);
- M
EDCouplingAutoRefCountObjectPtr
<SauvReader> sr=SauvReader::New(sauvFile.c_str());
- M
EDCouplingAutoRefCountObjectPtr
<MEDFileData> d2=sr->loadInMEDFileDS();
+ M
CAuto
<SauvReader> sr=SauvReader::New(sauvFile.c_str());
+ M
CAuto
<MEDFileData> d2=sr->loadInMEDFileDS();
// check mesh
MEDFileUMesh* m2 = static_cast<MEDFileUMesh*>(d2->getMeshes()->getMeshAtPos(0));
// check mesh
MEDFileUMesh* m2 = static_cast<MEDFileUMesh*>(d2->getMeshes()->getMeshAtPos(0));
- M
EDCouplingAutoRefCountObjectPtr
<MEDCouplingUMesh> mesh1d = m2->getMeshAtLevel(0);
- M
EDCouplingAutoRefCountObjectPtr
<MEDCouplingFieldDouble> length1dField = mesh1d->getMeasureField(0);
+ M
CAuto
<MEDCouplingUMesh> mesh1d = m2->getMeshAtLevel(0);
+ M
CAuto
<MEDCouplingFieldDouble> length1dField = mesh1d->getMeasureField(0);
std::cout << "Length of 1d elements: " << length1dField->accumulate(0) << std::endl;
CPPUNIT_ASSERT_DOUBLES_EQUAL(3, length1dField->accumulate(0), 1e-12);
// check field
std::cout << "Length of 1d elements: " << length1dField->accumulate(0) << std::endl;
CPPUNIT_ASSERT_DOUBLES_EQUAL(3, length1dField->accumulate(0), 1e-12);
// check field
- M
EDCouplingAutoRefCountObjectPtr
<MEDFileFieldMultiTS> field =
+ M
CAuto
<MEDFileFieldMultiTS> field =
dynamic_cast<MEDFileFieldMultiTS *>(d2->getFields()->getFieldWithName("CHAM1D"));
std::cout << "Number of components in field: " << field->getInfo().size() << std::endl;
CPPUNIT_ASSERT_EQUAL(6,(int)field->getInfo().size());
std::vector< std::pair<int,int> > timesteps = field->getIterations();
dynamic_cast<MEDFileFieldMultiTS *>(d2->getFields()->getFieldWithName("CHAM1D"));
std::cout << "Number of components in field: " << field->getInfo().size() << std::endl;
CPPUNIT_ASSERT_EQUAL(6,(int)field->getInfo().size());
std::vector< std::pair<int,int> > timesteps = field->getIterations();
- M
EDCouplingAutoRefCountObjectPtr
<MEDCouplingFieldDouble> field1d =
+ M
CAuto
<MEDCouplingFieldDouble> field1d =
field->getFieldOnMeshAtLevel(ON_GAUSS_NE, timesteps[0].first, timesteps[0].second, 0, m2);
// Check first component of the field
field->getFieldOnMeshAtLevel(ON_GAUSS_NE, timesteps[0].first, timesteps[0].second, 0, m2);
// Check first component of the field
@@
-170,11
+170,11
@@
void SauvLoaderTest::testMed2Sauv()
{
// read pointe.med
std::string file = INTERP_TEST::getResourceFile("pointe.med", 3);
{
// read pointe.med
std::string file = INTERP_TEST::getResourceFile("pointe.med", 3);
- M
EDCouplingAutoRefCountObjectPtr
<MEDFileData> pointeMed=MEDFileData::New(file.c_str());
+ M
CAuto
<MEDFileData> pointeMed=MEDFileData::New(file.c_str());
// add 3 faces to pointeMed
MEDFileUMesh* pointeMedMesh = static_cast<MEDFileUMesh*>(pointeMed->getMeshes()->getMeshAtPos(0));
// add 3 faces to pointeMed
MEDFileUMesh* pointeMedMesh = static_cast<MEDFileUMesh*>(pointeMed->getMeshes()->getMeshAtPos(0));
- M
EDCouplingAutoRefCountObjectPtr
<MEDCouplingUMesh> pointeM1D = MEDCouplingUMesh::New();
+ M
CAuto
<MEDCouplingUMesh> pointeM1D = MEDCouplingUMesh::New();
DataArrayDouble *coords = pointeMedMesh->getCoords();
pointeM1D->setCoords( coords );
pointeM1D->setMeshDimension( 2 );
DataArrayDouble *coords = pointeMedMesh->getCoords();
pointeM1D->setCoords( coords );
pointeM1D->setMeshDimension( 2 );
@@
-191,11
+191,11
@@
void SauvLoaderTest::testMed2Sauv()
pointeMed->getMeshes()->setMeshAtPos( 0, pointeMedMesh );
// add a field on 2 faces to pointeMed
pointeMed->getMeshes()->setMeshAtPos( 0, pointeMedMesh );
// add a field on 2 faces to pointeMed
- M
EDCouplingAutoRefCountObjectPtr
<MEDFileFieldMultiTS> ff1=MEDFileFieldMultiTS::New();
- M
EDCouplingAutoRefCountObjectPtr
<MEDCouplingFieldDouble> f1=MEDCouplingFieldDouble::New(ON_GAUSS_NE,ONE_TIME);
+ M
CAuto
<MEDFileFieldMultiTS> ff1=MEDFileFieldMultiTS::New();
+ M
CAuto
<MEDCouplingFieldDouble> f1=MEDCouplingFieldDouble::New(ON_GAUSS_NE,ONE_TIME);
f1->setMesh( pointeM1D );
f1->setName("Field on 2 faces");
f1->setMesh( pointeM1D );
f1->setName("Field on 2 faces");
- M
EDCouplingAutoRefCountObjectPtr
<DataArrayDouble> d=DataArrayDouble::New();
+ M
CAuto
<DataArrayDouble> d=DataArrayDouble::New();
d->alloc(3+4,2);
d->setInfoOnComponent(0,"sigX [MPa]");
d->setInfoOnComponent(1,"sigY [GPa]");
d->alloc(3+4,2);
d->setInfoOnComponent(0,"sigX [MPa]");
d->setInfoOnComponent(1,"sigY [GPa]");
@@
-205,7
+205,7
@@
void SauvLoaderTest::testMed2Sauv()
};
std::copy(vals,vals+d->getNbOfElems(),d->getPointer());
f1->setArray(d);
};
std::copy(vals,vals+d->getNbOfElems(),d->getPointer());
f1->setArray(d);
- M
EDCouplingAutoRefCountObjectPtr
<DataArrayInt> da=DataArrayInt::New();
+ M
CAuto
<DataArrayInt> da=DataArrayInt::New();
int ids[] =
{
0,2
int ids[] =
{
0,2
@@
-220,7
+220,7
@@
void SauvLoaderTest::testMed2Sauv()
MEDFileFields* pointeFields = pointeMed->getFields();
for ( int i = 0; i < pointeFields->getNumberOfFields(); ++i )
{
MEDFileFields* pointeFields = pointeMed->getFields();
for ( int i = 0; i < pointeFields->getNumberOfFields(); ++i )
{
- M
EDCouplingAutoRefCountObjectPtr
<MEDFileAnyTypeFieldMultiTS> ts = pointeFields->getFieldAtPos(i);
+ M
CAuto
<MEDFileAnyTypeFieldMultiTS> ts = pointeFields->getFieldAtPos(i);
if ( std::string("fieldnodeint") == ts->getName())
{
pointeFields->destroyFieldAtPos( i );
if ( std::string("fieldnodeint") == ts->getName())
{
pointeFields->destroyFieldAtPos( i );
@@
-229,13
+229,13
@@
void SauvLoaderTest::testMed2Sauv()
}
// write pointeMed to SAUV
const char* sauvFile = "pointe.sauv";
}
// write pointeMed to SAUV
const char* sauvFile = "pointe.sauv";
- M
EDCouplingAutoRefCountObjectPtr
<SauvWriter> sw=SauvWriter::New();
+ M
CAuto
<SauvWriter> sw=SauvWriter::New();
sw->setMEDFileDS(pointeMed);
sw->write(sauvFile);
// read SAUV and check
sw->setMEDFileDS(pointeMed);
sw->write(sauvFile);
// read SAUV and check
- M
EDCouplingAutoRefCountObjectPtr
<SauvReader> sr=SauvReader::New(sauvFile);
- M
EDCouplingAutoRefCountObjectPtr
<MEDFileData> d2=sr->loadInMEDFileDS();
+ M
CAuto
<SauvReader> sr=SauvReader::New(sauvFile);
+ M
CAuto
<MEDFileData> d2=sr->loadInMEDFileDS();
CPPUNIT_ASSERT_EQUAL(1,d2->getNumberOfMeshes());
CPPUNIT_ASSERT_EQUAL(4,d2->getNumberOfFields());
MEDFileUMesh * m = static_cast<MEDFileUMesh*>( d2->getMeshes()->getMeshAtPos(0) );
CPPUNIT_ASSERT_EQUAL(1,d2->getNumberOfMeshes());
CPPUNIT_ASSERT_EQUAL(4,d2->getNumberOfFields());
MEDFileUMesh * m = static_cast<MEDFileUMesh*>( d2->getMeshes()->getMeshAtPos(0) );
@@
-250,25
+250,25
@@
void SauvLoaderTest::testMed2Sauv()
CPPUNIT_ASSERT( std::find(groups.begin(),groups.end(),"groupe5") != groups.end() );
CPPUNIT_ASSERT( std::find(groups.begin(),groups.end(),"maa1") != groups.end() );
CPPUNIT_ASSERT_EQUAL(16,m->getSizeAtLevel(0));
CPPUNIT_ASSERT( std::find(groups.begin(),groups.end(),"groupe5") != groups.end() );
CPPUNIT_ASSERT( std::find(groups.begin(),groups.end(),"maa1") != groups.end() );
CPPUNIT_ASSERT_EQUAL(16,m->getSizeAtLevel(0));
- M
EDCouplingAutoRefCountObjectPtr<MEDCouplingMesh> um0 = m->getGen
MeshAtLevel(0);
+ M
CAuto<MEDCouplingMesh> um0 = m->get
MeshAtLevel(0);
CPPUNIT_ASSERT_EQUAL(12, um0->getNumberOfCellsWithType( INTERP_KERNEL::NORM_TETRA4 ));
CPPUNIT_ASSERT_EQUAL(2, um0->getNumberOfCellsWithType( INTERP_KERNEL::NORM_PYRA5 ));
CPPUNIT_ASSERT_EQUAL(2, um0->getNumberOfCellsWithType( INTERP_KERNEL::NORM_HEXA8 ));
CPPUNIT_ASSERT_EQUAL(12, um0->getNumberOfCellsWithType( INTERP_KERNEL::NORM_TETRA4 ));
CPPUNIT_ASSERT_EQUAL(2, um0->getNumberOfCellsWithType( INTERP_KERNEL::NORM_PYRA5 ));
CPPUNIT_ASSERT_EQUAL(2, um0->getNumberOfCellsWithType( INTERP_KERNEL::NORM_HEXA8 ));
- M
EDCouplingAutoRefCountObjectPtr<MEDCouplingMesh> um1 = m->getGen
MeshAtLevel(-1);
+ M
CAuto<MEDCouplingMesh> um1 = m->get
MeshAtLevel(-1);
CPPUNIT_ASSERT_EQUAL(2, um1->getNumberOfCellsWithType( INTERP_KERNEL::NORM_TRI3 ));
CPPUNIT_ASSERT_EQUAL(2, um1->getNumberOfCellsWithType( INTERP_KERNEL::NORM_TRI3 ));
- M
EDCouplingAutoRefCountObjectPtr
<MEDCouplingUMesh> pointeUM0 =
- static_cast<MEDCouplingUMesh*>( pointeMedMesh->get
Gen
MeshAtLevel(0));
+ M
CAuto
<MEDCouplingUMesh> pointeUM0 =
+ static_cast<MEDCouplingUMesh*>( pointeMedMesh->getMeshAtLevel(0));
DataArrayDouble *coo = m->getCoords();
DataArrayDouble *pointeCoo = pointeMedMesh->getCoords();
CPPUNIT_ASSERT(coo->isEqualWithoutConsideringStr(*pointeCoo,1e-12));
DataArrayDouble *coo = m->getCoords();
DataArrayDouble *pointeCoo = pointeMedMesh->getCoords();
CPPUNIT_ASSERT(coo->isEqualWithoutConsideringStr(*pointeCoo,1e-12));
- M
EDCouplingAutoRefCountObjectPtr
<MEDCouplingFieldDouble> vol = um0->getMeasureField(0);
- M
EDCouplingAutoRefCountObjectPtr
<MEDCouplingFieldDouble> pointeVol = pointeUM0->getMeasureField(0);
+ M
CAuto
<MEDCouplingFieldDouble> vol = um0->getMeasureField(0);
+ M
CAuto
<MEDCouplingFieldDouble> pointeVol = pointeUM0->getMeasureField(0);
CPPUNIT_ASSERT_DOUBLES_EQUAL( vol->accumulate(0), pointeVol->accumulate(0),1e-12);
// check fields
// fieldnodedouble
CPPUNIT_ASSERT_DOUBLES_EQUAL( vol->accumulate(0), pointeVol->accumulate(0),1e-12);
// check fields
// fieldnodedouble
- M
EDCouplingAutoRefCountObjectPtr
<MEDFileFieldMultiTS> fieldnodedoubleTS1 =
+ M
CAuto
<MEDFileFieldMultiTS> fieldnodedoubleTS1 =
dynamic_cast<MEDFileFieldMultiTS *>(pointeMed->getFields()->getFieldWithName("fieldnodedouble"));
dynamic_cast<MEDFileFieldMultiTS *>(pointeMed->getFields()->getFieldWithName("fieldnodedouble"));
- M
EDCouplingAutoRefCountObjectPtr
<MEDFileFieldMultiTS> fieldnodedoubleTS2 =
+ M
CAuto
<MEDFileFieldMultiTS> fieldnodedoubleTS2 =
dynamic_cast<MEDFileFieldMultiTS *>(d2->getFields()->getFieldWithName("fieldnodedouble"));
CPPUNIT_ASSERT_EQUAL( fieldnodedoubleTS1->getInfo().size(), fieldnodedoubleTS2->getInfo().size());
for ( size_t i = 0; i < fieldnodedoubleTS1->getInfo().size(); ++i )
dynamic_cast<MEDFileFieldMultiTS *>(d2->getFields()->getFieldWithName("fieldnodedouble"));
CPPUNIT_ASSERT_EQUAL( fieldnodedoubleTS1->getInfo().size(), fieldnodedoubleTS2->getInfo().size());
for ( size_t i = 0; i < fieldnodedoubleTS1->getInfo().size(); ++i )
@@
-278,16
+278,16
@@
void SauvLoaderTest::testMed2Sauv()
std::vector< std::pair<int,int> > io2 = fieldnodedoubleTS2->getIterations();
for ( int i =0; i < fieldnodedoubleTS1->getNumberOfTS(); ++i )
{
std::vector< std::pair<int,int> > io2 = fieldnodedoubleTS2->getIterations();
for ( int i =0; i < fieldnodedoubleTS1->getNumberOfTS(); ++i )
{
- M
EDCouplingAutoRefCountObjectPtr
<MEDCouplingFieldDouble> fnd1 =
+ M
CAuto
<MEDCouplingFieldDouble> fnd1 =
fieldnodedoubleTS1->getFieldOnMeshAtLevel(ON_NODES, io1[i].first,io1[i].second,pointeUM0);
fieldnodedoubleTS1->getFieldOnMeshAtLevel(ON_NODES, io1[i].first,io1[i].second,pointeUM0);
- M
EDCouplingAutoRefCountObjectPtr
<MEDCouplingFieldDouble> fnd2 =
+ M
CAuto
<MEDCouplingFieldDouble> fnd2 =
fieldnodedoubleTS2->getFieldOnMeshAtLevel(ON_NODES, io2[i].first,io2[i].second,um0);
CPPUNIT_ASSERT( fnd1->getArray()->isEqual( *fnd2->getArray(), 1e-12 ));
}
// fieldcelldoublevector
fieldnodedoubleTS2->getFieldOnMeshAtLevel(ON_NODES, io2[i].first,io2[i].second,um0);
CPPUNIT_ASSERT( fnd1->getArray()->isEqual( *fnd2->getArray(), 1e-12 ));
}
// fieldcelldoublevector
- M
EDCouplingAutoRefCountObjectPtr
<MEDFileFieldMultiTS> fieldcelldoublevectorTS1 =
+ M
CAuto
<MEDFileFieldMultiTS> fieldcelldoublevectorTS1 =
dynamic_cast<MEDFileFieldMultiTS *>(pointeMed->getFields()->getFieldWithName("fieldcelldoublevector"));
dynamic_cast<MEDFileFieldMultiTS *>(pointeMed->getFields()->getFieldWithName("fieldcelldoublevector"));
- M
EDCouplingAutoRefCountObjectPtr
<MEDFileFieldMultiTS> fieldcelldoublevectorTS2 =
+ M
CAuto
<MEDFileFieldMultiTS> fieldcelldoublevectorTS2 =
dynamic_cast<MEDFileFieldMultiTS *>(d2->getFields()->getFieldWithName("fieldcelldoublevector"));
CPPUNIT_ASSERT_EQUAL( fieldcelldoublevectorTS1->getInfo().size(), fieldcelldoublevectorTS2->getInfo().size());
for ( size_t i = 0; i < fieldcelldoublevectorTS1->getInfo().size(); ++i )
dynamic_cast<MEDFileFieldMultiTS *>(d2->getFields()->getFieldWithName("fieldcelldoublevector"));
CPPUNIT_ASSERT_EQUAL( fieldcelldoublevectorTS1->getInfo().size(), fieldcelldoublevectorTS2->getInfo().size());
for ( size_t i = 0; i < fieldcelldoublevectorTS1->getInfo().size(); ++i )
@@
-297,19
+297,19
@@
void SauvLoaderTest::testMed2Sauv()
io2 = fieldcelldoublevectorTS2->getIterations();
for ( int i =0; i < fieldcelldoublevectorTS1->getNumberOfTS(); ++i )
{
io2 = fieldcelldoublevectorTS2->getIterations();
for ( int i =0; i < fieldcelldoublevectorTS1->getNumberOfTS(); ++i )
{
- M
EDCouplingAutoRefCountObjectPtr
<MEDCouplingFieldDouble> fnd1 =
+ M
CAuto
<MEDCouplingFieldDouble> fnd1 =
fieldcelldoublevectorTS1->getFieldOnMeshAtLevel(ON_CELLS, io1[i].first,io1[i].second,pointeUM0);
fieldcelldoublevectorTS1->getFieldOnMeshAtLevel(ON_CELLS, io1[i].first,io1[i].second,pointeUM0);
- M
EDCouplingAutoRefCountObjectPtr
<MEDCouplingFieldDouble> fnd2 =
+ M
CAuto
<MEDCouplingFieldDouble> fnd2 =
fieldcelldoublevectorTS2->getFieldOnMeshAtLevel(ON_CELLS, io2[i].first,io2[i].second,um0);
CPPUNIT_ASSERT_DOUBLES_EQUAL( fnd1->accumulate(0), fnd2->accumulate(0), 1e-12 );
CPPUNIT_ASSERT_DOUBLES_EQUAL( fnd1->accumulate(1), fnd2->accumulate(1), 1e-12 );
CPPUNIT_ASSERT_DOUBLES_EQUAL( fnd1->accumulate(2), fnd2->accumulate(2), 1e-12 );
}
// "Field on 2 faces"
fieldcelldoublevectorTS2->getFieldOnMeshAtLevel(ON_CELLS, io2[i].first,io2[i].second,um0);
CPPUNIT_ASSERT_DOUBLES_EQUAL( fnd1->accumulate(0), fnd2->accumulate(0), 1e-12 );
CPPUNIT_ASSERT_DOUBLES_EQUAL( fnd1->accumulate(1), fnd2->accumulate(1), 1e-12 );
CPPUNIT_ASSERT_DOUBLES_EQUAL( fnd1->accumulate(2), fnd2->accumulate(2), 1e-12 );
}
// "Field on 2 faces"
- M
EDCouplingAutoRefCountObjectPtr
<MEDFileFieldMultiTS> fieldOnFaces =
+ M
CAuto
<MEDFileFieldMultiTS> fieldOnFaces =
dynamic_cast<MEDFileFieldMultiTS *>(d2->getFields()->getFieldWithName(f1->getName().c_str()));
io1 = fieldOnFaces->getIterations();
dynamic_cast<MEDFileFieldMultiTS *>(d2->getFields()->getFieldWithName(f1->getName().c_str()));
io1 = fieldOnFaces->getIterations();
- M
EDCouplingAutoRefCountObjectPtr
<MEDCouplingFieldDouble> fof =
+ M
CAuto
<MEDCouplingFieldDouble> fof =
fieldOnFaces->getFieldOnMeshAtLevel(f1->getTypeOfField(),io1[0].first,io1[0].second,um1);
CPPUNIT_ASSERT( d->isEqual( *fof->getArray(), 1e-12 ));
}
fieldOnFaces->getFieldOnMeshAtLevel(f1->getTypeOfField(),io1[0].first,io1[0].second,um1);
CPPUNIT_ASSERT( d->isEqual( *fof->getArray(), 1e-12 ));
}