-// Copyright (C) 2007-2012 CEA/DEN, EDF R&D
+// Copyright (C) 2007-2015 CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
#include "MEDCouplingBasicsTest3.hxx"
#include "MEDCouplingUMesh.hxx"
#include "MEDCouplingCMesh.hxx"
-#include "MEDCouplingExtrudedMesh.hxx"
+#include "MEDCouplingMappedExtrudedMesh.hxx"
#include "MEDCouplingFieldDouble.hxx"
#include "MEDCouplingMemArray.hxx"
#include "MEDCouplingGaussLocalization.hxx"
#include <functional>
#include <iterator>
-using namespace ParaMEDMEM;
+using namespace MEDCoupling;
void MEDCouplingBasicsTest3::testGetMeasureFieldCMesh1()
{
std::copy(discX,discX+4,da->getPointer());
m->setCoordsAt(0,da);
da->decrRef();
- m->checkCoherency();
+ m->checkConsistencyLight();
CPPUNIT_ASSERT_EQUAL(4,m->getNumberOfNodes());
CPPUNIT_ASSERT_EQUAL(3,m->getNumberOfCells());
CPPUNIT_ASSERT_EQUAL(1,m->getSpaceDimension());
for(int i=0;i<4;i++)
CPPUNIT_ASSERT_DOUBLES_EQUAL(discX[i],coords->getIJ(i,0),1e-12);
coords->decrRef();
- coords=m->getBarycenterAndOwner();
+ coords=m->computeCellCenterOfMass();
CPPUNIT_ASSERT_EQUAL(3,coords->getNumberOfTuples());
CPPUNIT_ASSERT_EQUAL(1,coords->getNumberOfComponents());
const double expected1_3[3]={2.85,4.6,8.};
std::copy(discY,discY+3,da->getPointer());
m->setCoordsAt(1,da);
da->decrRef();
- m->checkCoherency();
+ m->checkConsistencyLight();
CPPUNIT_ASSERT_EQUAL(12,m->getNumberOfNodes());
CPPUNIT_ASSERT_EQUAL(6,m->getNumberOfCells());
CPPUNIT_ASSERT_EQUAL(2,m->getSpaceDimension());
for(int i=0;i<24;i++)
CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2_2[i],coords->getIJ(0,i),1e-12);
coords->decrRef();
- coords=m->getBarycenterAndOwner();
+ coords=m->computeCellCenterOfMass();
CPPUNIT_ASSERT_EQUAL(6,coords->getNumberOfTuples());
CPPUNIT_ASSERT_EQUAL(2,coords->getNumberOfComponents());
const double expected2_3[12]={2.85,17.85,4.6,17.85,8.,17.85, 2.85,34.6,4.6,34.6,8.,34.6};
std::copy(discZ,discZ+5,da->getPointer());
m->setCoordsAt(2,da);
da->decrRef();
- m->checkCoherency();
+ m->checkConsistencyLight();
CPPUNIT_ASSERT_EQUAL(60,m->getNumberOfNodes());
CPPUNIT_ASSERT_EQUAL(24,m->getNumberOfCells());
CPPUNIT_ASSERT_EQUAL(3,m->getSpaceDimension());
for(int i=0;i<180;i++)
CPPUNIT_ASSERT_DOUBLES_EQUAL(expected3_2[i],coords->getIJ(0,i),1e-12);
coords->decrRef();
- coords=m->getBarycenterAndOwner();
+ coords=m->computeCellCenterOfMass();
CPPUNIT_ASSERT_EQUAL(24,coords->getNumberOfTuples());
CPPUNIT_ASSERT_EQUAL(3,coords->getNumberOfComponents());
const double expected3_3[72]={
MEDCouplingFieldDouble *f=m->fillFromAnalytic(ON_NODES,2,"x*2.");
f->getArray()->setInfoOnComponent(0,"titi");
f->getArray()->setInfoOnComponent(1,"tutu");
- f->checkCoherency();
+ f->checkConsistencyLight();
CPPUNIT_ASSERT_EQUAL(18,f->getNumberOfTuples());
CPPUNIT_ASSERT_EQUAL(2,f->getNumberOfComponents());
const double expected1[36]={-0.6, -0.6, 0.4, 0.4, 1.4, 1.4, -0.6, -0.6, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 1.4, 1.4, -0.6, -0.6, 0.4, 0.4, 1.4, 1.4, -0.6, -0.6, 1.4, 1.4, -0.6, -0.6, 0.4, 0.4, 1.4, 1.4, 0.4, 0.4};
for(int i=0;i<36;i++)
CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],f->getIJ(0,i),1e-12);
CPPUNIT_ASSERT(f->zipCoords());
- f->checkCoherency();
+ f->checkConsistencyLight();
const double expected2[30]={-0.6, -0.6, 1.4, 1.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 1.4, 1.4, -0.6, -0.6, 0.4, 0.4, 1.4, 1.4, 1.4, 1.4, -0.6, -0.6, 0.4, 0.4, 1.4, 1.4, 0.4, 0.4};
for(int i=0;i<30;i++)
CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2[i],f->getIJ(0,i),1e-12);
CPPUNIT_ASSERT(!f->zipCoords());
- f->checkCoherency();
+ f->checkConsistencyLight();
for(int i=0;i<30;i++)
CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2[i],f->getIJ(0,i),1e-12);
CPPUNIT_ASSERT(std::string(f->getArray()->getInfoOnComponent(0))=="titi");
CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],f->getIJ(0,i),1e-12);
f->getArray()->setInfoOnComponent(0,"titi");
f->getArray()->setInfoOnComponent(1,"tutu");
- f->checkCoherency();
+ f->checkConsistencyLight();
CPPUNIT_ASSERT(f->zipConnectivity(0));
const double expected2[14]={-0.05, -0.05, 0.3666666666666667, 0.3666666666666667, 0.53333333333333321, 0.53333333333333321,
-0.05, -0.05, 0.45, 0.45, 0.36666666666666659, 0.36666666666666659, 0.033333333333333326, 0.033333333333333326};
a->decrRef();
f->setMesh(m2);
//
- f->checkCoherency();
+ f->checkConsistencyLight();
double m=f->getMaxValue();
CPPUNIT_ASSERT_DOUBLES_EQUAL(8.71,m,1e-12);
DataArrayInt *ws;
//
const double arr2[18]={-8.71,-4.53,12.41,-8.71,8.71,-8.7099,-4.55,-8.71,-5.55,-6.77,1e-200,-4.55,-8.7099,0.,-1.23,0.,-2.22,-8.71};
std::copy(arr2,arr2+18,a->getPointer());
- f->checkCoherency();
+ f->checkConsistencyLight();
m=f->getMinValue();
CPPUNIT_ASSERT_DOUBLES_EQUAL(-8.71,m,1e-12);
m=f->getMinValue2(ws);
std::copy(discX,discX+4,da->getPointer());
m->setCoordsAt(0,da);
da->decrRef();
- m->checkCoherency();
+ m->checkConsistencyLight();
double pos=2.4;
CPPUNIT_ASSERT_EQUAL(0,m->getCellContainingPoint(&pos,1e-12));
pos=3.7;
CPPUNIT_ASSERT_EQUAL(-1,m->getCellContainingPoint(&pos,1e-12));
//
MEDCouplingUMesh *m2=m->buildUnstructured();
- m2->checkCoherency();
+ m2->checkConsistencyLight();
MEDCouplingFieldDouble *f1=m->getMeasureField(false);
MEDCouplingFieldDouble *f2=m2->getMeasureField(false);
CPPUNIT_ASSERT_EQUAL(f1->getNumberOfTuples(),3);
f2->decrRef();
//
m2=m->buildUnstructured();
- m2->checkCoherency();
+ m2->checkConsistencyLight();
f1=m->getMeasureField(false);
f2=m2->getMeasureField(false);
CPPUNIT_ASSERT_EQUAL(f1->getNumberOfTuples(),6);
m->setCoordsAt(2,da);
da->decrRef();
m2=m->buildUnstructured();
- m2->checkCoherency();
+ m2->checkConsistencyLight();
f1=m->getMeasureField(false);
f2=m2->getMeasureField(false);
CPPUNIT_ASSERT_EQUAL(f1->getNumberOfTuples(),24);
a1->setInfoOnComponent(3,"dddd");
const int arr2[6]={1,2,1,2,0,0};
std::vector<int> arr2V(arr2,arr2+6);
- DataArrayDouble *a2=a1->keepSelectedComponents(arr2V);
+ DataArrayDouble *a2=static_cast<DataArrayDouble *>(a1->keepSelectedComponents(arr2V));
CPPUNIT_ASSERT_EQUAL(6,a2->getNumberOfComponents());
CPPUNIT_ASSERT_EQUAL(5,a2->getNumberOfTuples());
CPPUNIT_ASSERT(std::string(a2->getInfoOnComponent(0))=="bbbb");
for(int i=0;i<30;i++)
CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],a2->getIJ(0,i),1e-14);
DataArrayInt *a3=a1->convertToIntArr();
- DataArrayInt *a4=a3->keepSelectedComponents(arr2V);
+ DataArrayInt *a4=static_cast<DataArrayInt *>(a3->keepSelectedComponents(arr2V));
CPPUNIT_ASSERT_EQUAL(6,a4->getNumberOfComponents());
CPPUNIT_ASSERT_EQUAL(5,a4->getNumberOfTuples());
CPPUNIT_ASSERT(std::string(a4->getInfoOnComponent(0))=="bbbb");
// setSelectedComponents
const int arr3[2]={3,2};
std::vector<int> arr3V(arr3,arr3+2);
- DataArrayDouble *a5=a1->keepSelectedComponents(arr3V);
+ DataArrayDouble *a5=static_cast<DataArrayDouble *>(a1->keepSelectedComponents(arr3V));
a5->setInfoOnComponent(0,"eeee");
a5->setInfoOnComponent(1,"ffff");
const int arr4[2]={1,2};
f1->setMesh(m1);
f1->setName("f1");
f1->setArray(a1);
- f1->checkCoherency();
+ f1->checkConsistencyLight();
//
const int arr2[6]={1,2,1,2,0,0};
std::vector<int> arr2V(arr2,arr2+6);
CPPUNIT_ASSERT_DOUBLES_EQUAL(2.3,f2->getTime(dt,it),1e-13);
CPPUNIT_ASSERT_EQUAL(4,dt);
CPPUNIT_ASSERT_EQUAL(5,it);
- f2->checkCoherency();
+ f2->checkConsistencyLight();
CPPUNIT_ASSERT_EQUAL(6,f2->getNumberOfComponents());
CPPUNIT_ASSERT_EQUAL(5,f2->getNumberOfTuples());
CPPUNIT_ASSERT(std::string(f2->getArray()->getInfoOnComponent(0))=="bbbb");
f5->setTime(6.7,8,9);
f5->getArray()->setInfoOnComponent(0,"eeee");
f5->getArray()->setInfoOnComponent(1,"ffff");
- f5->checkCoherency();
+ f5->checkConsistencyLight();
const int arr4[2]={1,2};
std::vector<int> arr4V(arr4,arr4+2);
f2->setSelectedComponents(f5,arr4V);
CPPUNIT_ASSERT_EQUAL(6,f2->getNumberOfComponents());
CPPUNIT_ASSERT_EQUAL(5,f2->getNumberOfTuples());
- f2->checkCoherency();
+ f2->checkConsistencyLight();
CPPUNIT_ASSERT_DOUBLES_EQUAL(2.3,f2->getTime(dt,it),1e-13);
CPPUNIT_ASSERT_EQUAL(4,dt);
CPPUNIT_ASSERT_EQUAL(5,it);
dbl2->alloc(7,2);
CPPUNIT_ASSERT_THROW(dbl2->isUniform(10.,1e-15),INTERP_KERNEL::Exception);
CPPUNIT_ASSERT_THROW(dbl2->sort(),INTERP_KERNEL::Exception);
- CPPUNIT_ASSERT_THROW(dbl2->reverse(),INTERP_KERNEL::Exception);
CPPUNIT_ASSERT_THROW(dbl2->iota(10.),INTERP_KERNEL::Exception);
DataArrayDouble *dbl=DataArrayDouble::New();
CPPUNIT_ASSERT(!((dbl->reprZip().find("Number of components : 1"))==std::string::npos));
std::ostringstream ret;
- dbl->writeVTK(ret,2,"file.tmp");
+ dbl->writeVTK(ret,2,"file.tmp",0);
CPPUNIT_ASSERT(!((ret.str().find("<DataArray"))==std::string::npos));
CPPUNIT_ASSERT(!((ret.str().find("Float32"))==std::string::npos));
CPPUNIT_ASSERT(!((ret.str().find("16 15 14 13 12 11 10"))==std::string::npos));
- CPPUNIT_ASSERT_THROW(dbl->selectByTupleId2(0,1,-1),INTERP_KERNEL::Exception);
- CPPUNIT_ASSERT_THROW(dbl->substr(-1,1),INTERP_KERNEL::Exception);
- CPPUNIT_ASSERT_THROW(dbl->substr(8,1),INTERP_KERNEL::Exception);
- CPPUNIT_ASSERT_THROW(dbl->substr(0,8),INTERP_KERNEL::Exception);
+ CPPUNIT_ASSERT_THROW(dbl->selectByTupleIdSafeSlice(0,1,-1),INTERP_KERNEL::Exception);
+ CPPUNIT_ASSERT_THROW(dbl->subArray(-1,1),INTERP_KERNEL::Exception);
+ CPPUNIT_ASSERT_THROW(dbl->subArray(8,1),INTERP_KERNEL::Exception);
+ CPPUNIT_ASSERT_THROW(dbl->subArray(0,8),INTERP_KERNEL::Exception);
CPPUNIT_ASSERT_THROW(dbl->meldWith(dd),INTERP_KERNEL::Exception);
CPPUNIT_ASSERT_THROW(dbl->setPartOfValuesAdv(dbl2,da),INTERP_KERNEL::Exception); //dbl dbl2 not have the same number of components
dbl3->setIJ(6,0,0.);
CPPUNIT_ASSERT_THROW(dbl3->checkNoNullValues(),INTERP_KERNEL::Exception);
CPPUNIT_ASSERT_THROW(dbl3->applyInv(1.),INTERP_KERNEL::Exception); //div by zero
- CPPUNIT_ASSERT_THROW(dbl2->getIdsInRange(1.,2.),INTERP_KERNEL::Exception);
+ CPPUNIT_ASSERT_THROW(dbl2->findIdsInRange(1.,2.),INTERP_KERNEL::Exception);
std::vector<const DataArrayDouble *> a(0); //input list must be NON EMPTY
CPPUNIT_ASSERT_THROW(DataArrayDouble::Aggregate(a),INTERP_KERNEL::Exception);
CPPUNIT_ASSERT_THROW(DataArrayDouble::Meld(a),INTERP_KERNEL::Exception);
DataArrayInt *da=DataArrayInt::New();
da->alloc(7,1);
std::copy(tab1,tab1+7,da->getPointer());
- DataArrayInt *da2=da->getIdsEqual(-2);
+ DataArrayInt *da2=da->findIdsEqual(-2);
CPPUNIT_ASSERT_EQUAL(3,da2->getNumberOfTuples());
CPPUNIT_ASSERT_EQUAL(1,da2->getNumberOfComponents());
const int expected1[3]={1,3,6};
std::copy(tab1,tab1+7,da->getPointer());
const int tab2[3]={3,-2,0};
std::vector<int> tab2V(tab2,tab2+3);
- DataArrayInt *da2=da->getIdsEqualList(&tab2V[0],&tab2V[0]+tab2V.size());
+ DataArrayInt *da2=da->findIdsEqualList(&tab2V[0],&tab2V[0]+tab2V.size());
CPPUNIT_ASSERT_EQUAL(4,da2->getNumberOfTuples());
CPPUNIT_ASSERT_EQUAL(1,da2->getNumberOfComponents());
const int expected1[4]={1,3,4,6};
mesh->convertToPolyTypes(&eltsV[0],&eltsV[0]+eltsV.size());
mesh->unPolyze();
MEDCouplingUMesh *mesh2=build3DTargetMesh_1();
- mesh->checkCoherency();
+ mesh->checkConsistencyLight();
CPPUNIT_ASSERT(mesh->isEqual(mesh2,1e-12));
mesh->convertToPolyTypes(&eltsV[0],&eltsV[0]+eltsV.size());
CPPUNIT_ASSERT(!mesh->isEqual(mesh2,1e-12));
mesh->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+16);
mesh->insertNextCell(INTERP_KERNEL::NORM_HEXA8,8,conn+24);
mesh->finishInsertingCells();
- mesh->checkCoherency();
+ mesh->checkConsistencyLight();
CPPUNIT_ASSERT_EQUAL(4,mesh->getNumberOfCells());
CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_HEXA8,mesh->getTypeOfCell(0));
CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_HEXA8,mesh->getTypeOfCell(1));
CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_HEXA8,mesh->getTypeOfCell(3));
MEDCouplingFieldDouble *f1=mesh->getMeasureField(true);
mesh->convertDegeneratedCells();
- mesh->checkCoherency();
+ mesh->checkConsistencyLight();
MEDCouplingFieldDouble *f2=mesh->getMeasureField(true);
CPPUNIT_ASSERT_EQUAL(4,mesh->getNumberOfCells());
CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_PENTA6,mesh->getTypeOfCell(0));
mesh->setCoords(tmp2);
tmp2->decrRef();
const double pts[6]={0.2,0.2,0.1,0.3,-0.3,0.7};
- std::vector<int> c=mesh->getNodeIdsNearPoint(pts,1e-7);
- CPPUNIT_ASSERT_EQUAL(3,(int)c.size());
- CPPUNIT_ASSERT_EQUAL(4,c[0]);
- CPPUNIT_ASSERT_EQUAL(9,c[1]);
- CPPUNIT_ASSERT_EQUAL(11,c[2]);
- c.clear();
- std::vector<int> cI;
+ DataArrayInt *c=mesh->getNodeIdsNearPoint(pts,1e-7);
+ CPPUNIT_ASSERT_EQUAL(3,c->getNumberOfTuples());
+ CPPUNIT_ASSERT_EQUAL(4,c->getIJ(0,0));
+ CPPUNIT_ASSERT_EQUAL(9,c->getIJ(1,0));
+ CPPUNIT_ASSERT_EQUAL(11,c->getIJ(2,0));
+ c->decrRef();
+ DataArrayInt *cI=0;
mesh->getNodeIdsNearPoints(pts,3,1e-7,c,cI);
- CPPUNIT_ASSERT_EQUAL(4,(int)cI.size());
- CPPUNIT_ASSERT_EQUAL(4,(int)c.size());
- CPPUNIT_ASSERT_EQUAL(4,c[0]);
- CPPUNIT_ASSERT_EQUAL(9,c[1]);
- CPPUNIT_ASSERT_EQUAL(11,c[2]);
- CPPUNIT_ASSERT_EQUAL(6,c[3]);
- CPPUNIT_ASSERT_EQUAL(0,cI[0]);
- CPPUNIT_ASSERT_EQUAL(3,cI[1]);
- CPPUNIT_ASSERT_EQUAL(3,cI[2]);
- CPPUNIT_ASSERT_EQUAL(4,cI[3]);
+ CPPUNIT_ASSERT_EQUAL(4,cI->getNumberOfTuples());
+ CPPUNIT_ASSERT_EQUAL(4,c->getNumberOfTuples());
+ CPPUNIT_ASSERT_EQUAL(4,c->getIJ(0,0));
+ CPPUNIT_ASSERT_EQUAL(9,c->getIJ(1,0));
+ CPPUNIT_ASSERT_EQUAL(11,c->getIJ(2,0));
+ CPPUNIT_ASSERT_EQUAL(6,c->getIJ(3,0));
+ CPPUNIT_ASSERT_EQUAL(0,cI->getIJ(0,0));
+ CPPUNIT_ASSERT_EQUAL(3,cI->getIJ(1,0));
+ CPPUNIT_ASSERT_EQUAL(3,cI->getIJ(2,0));
+ CPPUNIT_ASSERT_EQUAL(4,cI->getIJ(3,0));
+ c->decrRef();
+ cI->decrRef();
mesh->decrRef();
}
CPPUNIT_ASSERT_EQUAL(37,tmp3);
tmp->decrRef();
i->convertDegeneratedCells();
- i->checkCoherency();
+ i->checkConsistencyLight();
CPPUNIT_ASSERT_EQUAL(36,i->getNumberOfCells());
CPPUNIT_ASSERT_EQUAL(37,i->getNumberOfNodes());
CPPUNIT_ASSERT_EQUAL(12,i->getNumberOfCellsWithType(INTERP_KERNEL::NORM_TRI3));
for(int k=0;k<3;k++)
CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[k],j->getIJ(0,ii*3+k),1e-10);
const double expected2[72]={0.62200846792814113, 0.16666666666681595, 1.4513530918323276, 0.38888888888923495, 2.6293994326053212, 0.7045454545460802, 0.45534180126145435, 0.45534180126150181, 1.0624642029433926, 1.0624642029435025, 1.9248539780597826, 1.9248539780599816, 0.16666666666661334, 0.62200846792815856, 0.38888888888876294, 1.4513530918323678, 0.70454545454522521, 2.629399432605394, -0.16666666666674007, 0.62200846792812436, -0.38888888888906142, 1.4513530918322881, -0.70454545454576778, 2.6293994326052488, -0.45534180126154766, 0.45534180126140844, -1.0624642029436118, 1.0624642029432834, -1.9248539780601803, 1.9248539780595841, -0.62200846792817499, 0.1666666666665495, -1.451353091832408, 0.388888888888613, -2.6293994326054668, 0.70454545454495332, -0.62200846792810593, -0.16666666666680507, -1.451353091832247, -0.38888888888921297, -2.6293994326051746, -0.70454545454604123, -0.45534180126135926, -0.45534180126159562, -1.0624642029431723, -1.0624642029437235, -1.9248539780593836, -1.9248539780603811, -0.1666666666664828, -0.62200846792819242, -0.38888888888846079, -1.4513530918324489, -0.70454545454467987, -2.6293994326055397, 0.16666666666687083, -0.62200846792808862, 0.38888888888936374, -1.4513530918322073, 0.70454545454631357, -2.6293994326051022, 0.45534180126164348, -0.45534180126131207, 1.0624642029438327, -1.0624642029430627, 1.9248539780605791, -1.9248539780591853, 0.62200846792821063, -0.16666666666641802, 1.4513530918324888, -0.38888888888831086, 2.6293994326056125, -0.70454545454440853};
- DataArrayDouble *m=i->getBarycenterAndOwner();
+ DataArrayDouble *m=i->computeCellCenterOfMass();
for(int ii=0;ii<72;ii++)
CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2[ii],m->getIJ(0,ii),1e-10);
//
const double center[2]={0.,0.};
f->rotate(center,0,M_PI/3);
MEDCouplingUMesh *g=c->buildExtrudedMesh(f,0);
- g->checkCoherency();
+ g->checkConsistencyLight();
const double expected1[]={ 0.4330127018922193, 0.4330127018922193, 0.649519052838329, 1.2990381056766578, 1.299038105676658, 1.948557158514987, 2.1650635094610955, 2.1650635094610964, 3.2475952641916446, 3.031088913245533, 3.0310889132455352, 4.546633369868303 };
MEDCouplingFieldDouble *f1=g->getMeasureField(true);
for(int i=0;i<12;i++)
CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],f1->getIJ(0,i),1e-12);
const double expected2[]={0.625, 0.21650635094610962, 1.625, 0.21650635094610959, 2.8750000000000004, 0.21650635094610965, 1.1250000000000002, 1.0825317547305482, 2.125, 1.0825317547305482, 3.3750000000000004, 1.0825317547305484, 2.125, 2.8145825622994254, 3.125, 2.8145825622994254, 4.375, 2.8145825622994254, 3.6250000000000009, 5.4126587736527414, 4.625, 5.4126587736527414, 5.875, 5.4126587736527414};
- DataArrayDouble *f2=g->getBarycenterAndOwner();
+ DataArrayDouble *f2=g->computeCellCenterOfMass();
for(int i=0;i<24;i++)
CPPUNIT_ASSERT_DOUBLES_EQUAL(expected2[i],f2->getIJ(0,i),1e-12);
//
const int expected2[7]={0,0,1,2,3,4,4};
for(int i=0;i<7;i++)
CPPUNIT_ASSERT_EQUAL(expected2[i],da->getIJ(i,0));
- m->checkCoherency();
+ m->checkConsistencyLight();
CPPUNIT_ASSERT_EQUAL(7,m->getNumberOfCells());
CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,m->getTypeOfCell(0));
CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,m->getTypeOfCell(1));
MEDCouplingFieldDouble *f=m->getMeasureField(false);
for(int i=0;i<7;i++)
CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i]*sqrt(2.),f->getIJ(i,0),1e-10);
- std::set<INTERP_KERNEL::NormalizedCellType> types=m->getAllTypes();
+ std::set<INTERP_KERNEL::NormalizedCellType> types=m->getAllGeoTypes();
CPPUNIT_ASSERT_EQUAL(2,(int)types.size());
CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,*(types.begin()));
CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_POLYGON,*(++(types.begin())));
CPPUNIT_ASSERT_EQUAL(1,da->getNumberOfComponents());
for(int i=0;i<7;i++)
CPPUNIT_ASSERT_EQUAL(expected2[i],da->getIJ(i,0));
- m->checkCoherency();
- types=m->getAllTypes();
+ m->checkConsistencyLight();
+ types=m->getAllGeoTypes();
CPPUNIT_ASSERT_EQUAL(2,(int)types.size());
CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_TRI3,*(types.begin()));
CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_POLYGON,*(++(types.begin())));
f1->setArray(arr);
arr->decrRef();
//
- f1->checkCoherency();
+ f1->checkConsistencyLight();
CPPUNIT_ASSERT(f1->simplexize(0));
- f1->checkCoherency();
+ f1->checkConsistencyLight();
const double expected1[14]={10.,110.,10.,110.,20.,120.,30.,130.,40.,140.,50.,150.,50.,150.};
for(int i=0;i<14;i++)
CPPUNIT_ASSERT_DOUBLES_EQUAL(expected1[i],f1->getIJ(0,i),1e-10);
da3->setInfoOnComponent(1,"c1da3");
da3->setInfoOnComponent(2,"c2da3");
//
- DataArrayDouble *da1C=da1->deepCpy();
+ DataArrayDouble *da1C=da1->deepCopy();
da1->meldWith(da3);
CPPUNIT_ASSERT_EQUAL(5,da1->getNumberOfComponents());
CPPUNIT_ASSERT_EQUAL(7,da1->getNumberOfTuples());
da1->setInfoOnComponent(0,"aaa");
f1->setArray(da1);
f1->setTime(3.4,2,1);
- f1->checkCoherency();
+ f1->checkConsistencyLight();
//
- MEDCouplingFieldDouble *f2=f1->deepCpy();
+ MEDCouplingFieldDouble *f2=f1->deepCopy();
f2->setMesh(f1->getMesh());
- f2->checkCoherency();
+ f2->checkConsistencyLight();
f2->changeNbOfComponents(2,5.);
(*f2)=5.;
f2->getArray()->setInfoOnComponent(0,"bbb");
f2->getArray()->setInfoOnComponent(1,"ccc");
- f2->checkCoherency();
+ f2->checkConsistencyLight();
//
MEDCouplingFieldDouble *f3=MEDCouplingFieldDouble::MeldFields(f2,f1);
- f3->checkCoherency();
+ f3->checkConsistencyLight();
CPPUNIT_ASSERT_EQUAL(5,f3->getNumberOfTuples());
CPPUNIT_ASSERT_EQUAL(3,f3->getNumberOfComponents());
CPPUNIT_ASSERT(f3->getArray()->getInfoOnComponent(0)=="bbb");
MEDCouplingFieldDouble *f4=f2->buildNewTimeReprFromThis(NO_TIME,false);
MEDCouplingFieldDouble *f5=f1->buildNewTimeReprFromThis(NO_TIME,false);
MEDCouplingFieldDouble *f6=MEDCouplingFieldDouble::MeldFields(f4,f5);
- f6->checkCoherency();
+ f6->checkConsistencyLight();
CPPUNIT_ASSERT_EQUAL(5,f6->getNumberOfTuples());
CPPUNIT_ASSERT_EQUAL(3,f6->getNumberOfComponents());
CPPUNIT_ASSERT(f6->getArray()->getInfoOnComponent(0)=="bbb");
MEDCouplingUMesh *m3=MEDCouplingUMesh::MergeUMeshes(tmp);
bool b;
int newNbOfNodes;
- DataArrayInt *da=m3->mergeNodes2(0.01,b,newNbOfNodes);
+ DataArrayInt *da=m3->mergeNodesCenter(0.01,b,newNbOfNodes);
CPPUNIT_ASSERT_EQUAL(9,m3->getNumberOfNodes());
const double expected1[18]={-0.299,-0.3, 0.201,-0.3, 0.701,-0.3, -0.299,0.2, 0.201,0.2, 0.701,0.2, -0.299,0.7, 0.201,0.7, 0.701,0.7};
for(int i=0;i<18;i++)
std::copy(targetCoords,targetCoords+18,myCoords->getPointer());
targetMesh->setCoords(myCoords);
myCoords->decrRef();
- targetMesh->checkCoherency();
+ targetMesh->checkConsistencyLight();
targetMesh->decrRef();
}
MEDCouplingFieldDouble *f2=MEDCouplingFieldDouble::New(ON_CELLS);
f2->setArray(arr);
f2->setMesh(m1);
- f2->checkCoherency();
+ f2->checkConsistencyLight();
//
MEDCouplingFieldDouble *f3=(*f1)/(*f2);
CPPUNIT_ASSERT_THROW((*f2)/(*f1),INTERP_KERNEL::Exception);
- f3->checkCoherency();
+ f3->checkConsistencyLight();
(*f1)/=(*f2);
CPPUNIT_ASSERT(f1->isEqual(f3,1e-10,1e-10));
CPPUNIT_ASSERT_THROW((*f2)/=(*f1),INTERP_KERNEL::Exception);
da1->iota(0);
const int *ptr=da1->getConstPointer();
//
- CPPUNIT_ASSERT_EQUAL(12,da1->getNbOfElems());
+ CPPUNIT_ASSERT_EQUAL((std::size_t)12,da1->getNbOfElems());
CPPUNIT_ASSERT_EQUAL(1,da1->getNumberOfComponents());
CPPUNIT_ASSERT_EQUAL(12,da1->getNumberOfTuples());
da1->rearrange(4);
CPPUNIT_ASSERT(ptr==da1->getConstPointer());
- CPPUNIT_ASSERT_EQUAL(12,da1->getNbOfElems());
+ CPPUNIT_ASSERT_EQUAL((std::size_t)12,da1->getNbOfElems());
CPPUNIT_ASSERT_EQUAL(4,da1->getNumberOfComponents());
CPPUNIT_ASSERT_EQUAL(3,da1->getNumberOfTuples());
for(int i=0;i<12;i++)
//
da1->rearrange(6);
CPPUNIT_ASSERT(ptr==da1->getConstPointer());
- CPPUNIT_ASSERT_EQUAL(12,da1->getNbOfElems());
+ CPPUNIT_ASSERT_EQUAL((std::size_t)12,da1->getNbOfElems());
CPPUNIT_ASSERT_EQUAL(6,da1->getNumberOfComponents());
CPPUNIT_ASSERT_EQUAL(2,da1->getNumberOfTuples());
for(int i=0;i<12;i++)
//
da1->rearrange(12);
CPPUNIT_ASSERT(ptr==da1->getConstPointer());
- CPPUNIT_ASSERT_EQUAL(12,da1->getNbOfElems());
+ CPPUNIT_ASSERT_EQUAL((std::size_t)12,da1->getNbOfElems());
CPPUNIT_ASSERT_EQUAL(12,da1->getNumberOfComponents());
CPPUNIT_ASSERT_EQUAL(1,da1->getNumberOfTuples());
for(int i=0;i<12;i++)
//
da1->rearrange(3);
CPPUNIT_ASSERT(ptr==da1->getConstPointer());
- CPPUNIT_ASSERT_EQUAL(12,da1->getNbOfElems());
+ CPPUNIT_ASSERT_EQUAL((std::size_t)12,da1->getNbOfElems());
CPPUNIT_ASSERT_EQUAL(3,da1->getNumberOfComponents());
CPPUNIT_ASSERT_EQUAL(4,da1->getNumberOfTuples());
for(int i=0;i<12;i++)
da1->decrRef();
const double *ptr2=da2->getConstPointer();
//
- CPPUNIT_ASSERT_EQUAL(12,da2->getNbOfElems());
+ CPPUNIT_ASSERT_EQUAL((std::size_t)12,da2->getNbOfElems());
CPPUNIT_ASSERT_EQUAL(3,da2->getNumberOfComponents());
CPPUNIT_ASSERT_EQUAL(4,da2->getNumberOfTuples());
da2->rearrange(4);
CPPUNIT_ASSERT(ptr2==da2->getConstPointer());
- CPPUNIT_ASSERT_EQUAL(12,da2->getNbOfElems());
+ CPPUNIT_ASSERT_EQUAL((std::size_t)12,da2->getNbOfElems());
CPPUNIT_ASSERT_EQUAL(4,da2->getNumberOfComponents());
CPPUNIT_ASSERT_EQUAL(3,da2->getNumberOfTuples());
for(int i=0;i<12;i++)
//
da2->rearrange(6);
CPPUNIT_ASSERT(ptr2==da2->getConstPointer());
- CPPUNIT_ASSERT_EQUAL(12,da2->getNbOfElems());
+ CPPUNIT_ASSERT_EQUAL((std::size_t)12,da2->getNbOfElems());
CPPUNIT_ASSERT_EQUAL(6,da2->getNumberOfComponents());
CPPUNIT_ASSERT_EQUAL(2,da2->getNumberOfTuples());
for(int i=0;i<12;i++)
//
da2->rearrange(1);
CPPUNIT_ASSERT(ptr2==da2->getConstPointer());
- CPPUNIT_ASSERT_EQUAL(12,da2->getNbOfElems());
+ CPPUNIT_ASSERT_EQUAL((std::size_t)12,da2->getNbOfElems());
CPPUNIT_ASSERT_EQUAL(1,da2->getNumberOfComponents());
CPPUNIT_ASSERT_EQUAL(12,da2->getNumberOfTuples());
for(int i=0;i<12;i++)
//
da2->rearrange(3);
CPPUNIT_ASSERT(ptr2==da2->getConstPointer());
- CPPUNIT_ASSERT_EQUAL(12,da2->getNbOfElems());
+ CPPUNIT_ASSERT_EQUAL((std::size_t)12,da2->getNbOfElems());
CPPUNIT_ASSERT_EQUAL(3,da2->getNumberOfComponents());
CPPUNIT_ASSERT_EQUAL(4,da2->getNumberOfTuples());
for(int i=0;i<12;i++)
const int arr[12]={1,2,3,2,2,3,5,1,5,5,2,2};
da1->alloc(4,3);
std::copy(arr,arr+12,da1->getPointer());
- std::set<int> s=da1->getDifferentValues();
+ DataArrayInt *s=da1->getDifferentValues();
const int expected1[4]={1,2,3,5};
- CPPUNIT_ASSERT_EQUAL(4,(int)s.size());
- CPPUNIT_ASSERT(std::equal(expected1,expected1+4,s.begin()));
+ CPPUNIT_ASSERT_EQUAL(4,s->getNumberOfTuples());
+ CPPUNIT_ASSERT(std::equal(expected1,expected1+4,s->begin()));
da1->decrRef();
+ s->decrRef();
}
void MEDCouplingBasicsTest3::testDAIBuildPermutationArr1()
ms2[0]=m1; ms2[1]=m2_2; ms2[2]=m3_2;
//
MEDCouplingUMesh *m4=MEDCouplingUMesh::MergeUMeshes(ms);
- m4->checkCoherency();
+ m4->checkConsistencyLight();
CPPUNIT_ASSERT_EQUAL(10,m4->getNumberOfCells());
CPPUNIT_ASSERT_EQUAL(20,m4->getNumberOfNodes());
- CPPUNIT_ASSERT_EQUAL(45,m4->getMeshLength());
+ CPPUNIT_ASSERT_EQUAL(45,m4->getNodalConnectivityArrayLen());
//
MEDCouplingMesh *m4bis=MEDCouplingMesh::MergeMeshes(ms2);
CPPUNIT_ASSERT(m4->isEqual(m4bis,1e-12));
//
const int vec3[5]={0,1,2,3,4};
MEDCouplingUMesh *m4_1=(MEDCouplingUMesh *)m4->buildPartOfMySelf(vec3,vec3+5,false);
- m4_1->setName(m1->getName());
+ m4_1->setName(m1->getName().c_str());
CPPUNIT_ASSERT(m4_1->isEqual(m1,1e-12));
m4_1->decrRef();
//
CPPUNIT_ASSERT_EQUAL(2,m4_3->getNumberOfCells());
CPPUNIT_ASSERT_EQUAL(3,m4_3->getNumberOfNodes());
m3_2->zipCoords();
- m4_3->setName(m3_2->getName());
+ m4_3->setName(m3_2->getName().c_str());
CPPUNIT_ASSERT(m4_3->isEqual(m3_2,1e-12));
m4_3->decrRef();
//
coo->setName("My0D");
std::copy(sourceCoords,sourceCoords+12,coo->getPointer());
MEDCouplingUMesh *m=MEDCouplingUMesh::Build0DMeshFromCoords(coo);
- m->checkCoherency();
+ m->checkConsistencyLight();
CPPUNIT_ASSERT_EQUAL(4,m->getNumberOfNodes());
CPPUNIT_ASSERT_EQUAL(4,m->getNumberOfCells());
CPPUNIT_ASSERT_EQUAL(3,m->getSpaceDimension());
CPPUNIT_ASSERT_EQUAL(0,m->getMeshDimension());
- const std::set<INTERP_KERNEL::NormalizedCellType>& types=m->getAllTypes();
+ std::set<INTERP_KERNEL::NormalizedCellType> types=m->getAllGeoTypes();
CPPUNIT_ASSERT_EQUAL(1,(int)types.size());
CPPUNIT_ASSERT_EQUAL(INTERP_KERNEL::NORM_POINT1,*types.begin());
for(int i=0;i<4;i++)