X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParaMEDMEMTest%2FParaMEDMEMTest_InterpKernelDEC.cxx;h=7f6ef3893a9a0646a50b5a5a8e4a018cc9b5001e;hb=c4551c56aa89896595842e5b41b048044681b4e8;hp=0f75367f150317bf06f6e07d608b28626960d199;hpb=e8f616a523471bd47f2eb60e6fded7b2b6363639;p=tools%2Fmedcoupling.git diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_InterpKernelDEC.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_InterpKernelDEC.cxx index 0f75367f1..7f6ef3893 100644 --- a/src/ParaMEDMEMTest/ParaMEDMEMTest_InterpKernelDEC.cxx +++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_InterpKernelDEC.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2015 CEA/DEN, EDF R&D +// Copyright (C) 2007-2016 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 @@ -149,7 +149,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_1D() MEDCoupling::ComponentTopology comptopo; parafieldP0 = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); double *valueP0=parafieldP0->getField()->getArray()->getPointer(); - parafieldP0->getField()->setNature(ConservativeVolumic); + parafieldP0->getField()->setNature(IntensiveMaximum); if(rank==0) { valueP0[0]=7.; valueP0[1]=8.; @@ -198,7 +198,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_1D() } MEDCoupling::ComponentTopology comptopo; parafieldP0 = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); - parafieldP0->getField()->setNature(ConservativeVolumic); + parafieldP0->getField()->setNature(IntensiveMaximum); } // test 1 MEDCoupling::InterpKernelDEC dec(*source_group,*target_group); @@ -235,14 +235,14 @@ void ParaMEDMEMTest::testInterpKernelDEC_1D() const double *res=parafieldP0->getField()->getArray()->getConstPointer(); if(rank==3) { - CPPUNIT_ASSERT_EQUAL(1,parafieldP0->getField()->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,parafieldP0->getField()->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(1,(int)parafieldP0->getField()->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)parafieldP0->getField()->getNumberOfComponents()); CPPUNIT_ASSERT_DOUBLES_EQUAL(7.4,res[0],1e-12); } if(rank==4) { - CPPUNIT_ASSERT_EQUAL(1,parafieldP0->getField()->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,parafieldP0->getField()->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(1,(int)parafieldP0->getField()->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)parafieldP0->getField()->getNumberOfComponents()); CPPUNIT_ASSERT_DOUBLES_EQUAL(9.0540540540540526,res[0],1e-12); } dec.sendData(); @@ -338,7 +338,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_2DCurve() MEDCoupling::ComponentTopology comptopo; parafieldP0 = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); double *valueP0=parafieldP0->getField()->getArray()->getPointer(); - parafieldP0->getField()->setNature(ConservativeVolumic); + parafieldP0->getField()->setNature(IntensiveMaximum); if(rank==0) { valueP0[0]=7.; valueP0[1]=8.; @@ -387,7 +387,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_2DCurve() } MEDCoupling::ComponentTopology comptopo; parafieldP0 = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); - parafieldP0->getField()->setNature(ConservativeVolumic); + parafieldP0->getField()->setNature(IntensiveMaximum); } // test 1 MEDCoupling::InterpKernelDEC dec(*source_group,*target_group); @@ -424,14 +424,14 @@ void ParaMEDMEMTest::testInterpKernelDEC_2DCurve() const double *res=parafieldP0->getField()->getArray()->getConstPointer(); if(rank==3) { - CPPUNIT_ASSERT_EQUAL(1,parafieldP0->getField()->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,parafieldP0->getField()->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(1,(int)parafieldP0->getField()->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)parafieldP0->getField()->getNumberOfComponents()); CPPUNIT_ASSERT_DOUBLES_EQUAL(7.4,res[0],1e-12); } if(rank==4) { - CPPUNIT_ASSERT_EQUAL(1,parafieldP0->getField()->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,parafieldP0->getField()->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(1,(int)parafieldP0->getField()->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)parafieldP0->getField()->getNumberOfComponents()); CPPUNIT_ASSERT_DOUBLES_EQUAL(9.0540540540540526,res[0],1e-12); } dec.sendData(); @@ -516,7 +516,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_2D_(const char *srcMeth, const char *ta ostringstream meshname ; meshname<< "Mesh_2_"<< rank+1; - mesh=MEDLoader::ReadUMeshFromFile(fName.c_str(),meshname.str().c_str(),0); + mesh=ReadUMeshFromFile(fName.c_str(),meshname.str().c_str(),0); paramesh=new ParaMESH (mesh,*source_group,"source mesh"); @@ -526,7 +526,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_2D_(const char *srcMeth, const char *ta if(srcM=="P0") { parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); - parafield->getField()->setNature(ConservativeVolumic); + parafield->getField()->setNature(IntensiveMaximum); } else parafield = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo); @@ -555,7 +555,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_2D_(const char *srcMeth, const char *ta string fName = INTERP_TEST::getResourceFile(strstream.str()); ostringstream meshname ; meshname<< "Mesh_3_"<getField()->setNature(ConservativeVolumic); + parafield->getField()->setNature(IntensiveMaximum); } else parafield = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo); @@ -601,14 +601,14 @@ void ParaMEDMEMTest::testInterpKernelDEC_2D_(const char *srcMeth, const char *ta ostringstream filename; filename<<"./sourcesquareb_"<myRank()+1; aRemover.Register(filename.str().c_str()); - //MEDLoader::WriteField("./sourcesquareb",parafield->getField()); + //WriteField("./sourcesquareb",parafield->getField()); dec.recvData(); cout <<"writing"<myRank()==0) aRemover.Register("./sourcesquare"); - //MEDLoader::WriteField("./sourcesquare",parafield->getField()); + //WriteField("./sourcesquare",parafield->getField()); filename<<"./sourcesquare_"<myRank()+1; @@ -631,7 +631,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_2D_(const char *srcMeth, const char *ta dec.recvData(); ParaMEDLoader::WriteParaMesh("./targetsquareb",paramesh); - //MEDLoader::WriteField("./targetsquareb",parafield->getField()); + //WriteField("./targetsquareb",parafield->getField()); if (target_group->myRank()==0) aRemover.Register("./targetsquareb"); ostringstream filename; @@ -639,7 +639,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_2D_(const char *srcMeth, const char *ta aRemover.Register(filename.str().c_str()); dec.sendData(); ParaMEDLoader::WriteParaMesh("./targetsquare",paramesh); - //MEDLoader::WriteField("./targetsquare",parafield->getField()); + //WriteField("./targetsquare",parafield->getField()); if (target_group->myRank()==0) aRemover.Register("./targetsquareb"); @@ -720,7 +720,7 @@ void ParaMEDMEMTest::testInterpKernelDEC2_2D_(const char *srcMeth, const char *t ostringstream meshname ; meshname<< "Mesh_2_"<< rank+1; - mesh=MEDLoader::ReadUMeshFromFile(fName.c_str(),meshname.str().c_str(),0); + mesh=ReadUMeshFromFile(fName.c_str(),meshname.str().c_str(),0); MEDCoupling::ComponentTopology comptopo; if(srcM=="P0") { @@ -730,7 +730,7 @@ void ParaMEDMEMTest::testInterpKernelDEC2_2D_(const char *srcMeth, const char *t array->alloc(mcfield->getNumberOfTuples(),1); mcfield->setArray(array); array->decrRef(); - mcfield->setNature(ConservativeVolumic); + mcfield->setNature(IntensiveMaximum); } else { @@ -763,7 +763,7 @@ void ParaMEDMEMTest::testInterpKernelDEC2_2D_(const char *srcMeth, const char *t string fName = INTERP_TEST::getResourceFile(strstream.str()); ostringstream meshname ; meshname<< "Mesh_3_"<alloc(mcfield->getNumberOfTuples(),1); mcfield->setArray(array); array->decrRef(); - mcfield->setNature(ConservativeVolumic); + mcfield->setNature(IntensiveMaximum); } else { @@ -889,7 +889,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_3D_(const char *srcMeth, const char *ta ostringstream meshname ; meshname<< "Mesh_3_"<< rank+1; - mesh=MEDLoader::ReadUMeshFromFile(fName.c_str(),meshname.str().c_str(),0); + mesh=ReadUMeshFromFile(fName.c_str(),meshname.str().c_str(),0); paramesh=new ParaMESH (mesh,*source_group,"source mesh"); @@ -899,7 +899,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_3D_(const char *srcMeth, const char *ta if(srcM=="P0") { parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); - parafield->getField()->setNature(ConservativeVolumic); + parafield->getField()->setNature(IntensiveMaximum); } else parafield = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo); @@ -928,7 +928,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_3D_(const char *srcMeth, const char *ta std::string fName = INTERP_TEST::getResourceFile(strstream.str()); ostringstream meshname ; meshname<< "Mesh_6"; - mesh = MEDLoader::ReadUMeshFromFile(fName.c_str(),meshname.str().c_str(),0); + mesh = ReadUMeshFromFile(fName.c_str(),meshname.str().c_str(),0); paramesh=new ParaMESH (mesh,*target_group,"target mesh"); // MEDCoupling::ParaSUPPORT* parasupport=new UnstructuredParaSUPPORT(support,*target_group); @@ -936,7 +936,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_3D_(const char *srcMeth, const char *ta if(targetM=="P0") { parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); - parafield->getField()->setNature(ConservativeVolumic); + parafield->getField()->setNature(IntensiveMaximum); } else parafield = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo); @@ -972,14 +972,14 @@ void ParaMEDMEMTest::testInterpKernelDEC_3D_(const char *srcMeth, const char *ta ostringstream filename; filename<<"./sourcesquareb_"<myRank()+1; aRemover.Register(filename.str().c_str()); - //MEDLoader::WriteField("./sourcesquareb",parafield->getField()); + //WriteField("./sourcesquareb",parafield->getField()); dec.recvData(); cout <<"writing"<myRank()==0) aRemover.Register("./sourcesquare"); - //MEDLoader::WriteField("./sourcesquare",parafield->getField()); + //WriteField("./sourcesquare",parafield->getField()); filename<<"./sourcesquare_"<myRank()+1; @@ -998,7 +998,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_3D_(const char *srcMeth, const char *ta dec.recvData(); ParaMEDLoader::WriteParaMesh("./targetsquareb",paramesh); - //MEDLoader::WriteField("./targetsquareb",parafield->getField()); + //WriteField("./targetsquareb",parafield->getField()); if (target_group->myRank()==0) aRemover.Register("./targetsquareb"); ostringstream filename; @@ -1006,7 +1006,7 @@ void ParaMEDMEMTest::testInterpKernelDEC_3D_(const char *srcMeth, const char *ta aRemover.Register(filename.str().c_str()); dec.sendData(); ParaMEDLoader::WriteParaMesh("./targetsquare",paramesh); - //MEDLoader::WriteField("./targetsquare",parafield->getField()); + //WriteField("./targetsquare",parafield->getField()); if (target_group->myRank()==0) aRemover.Register("./targetsquareb"); @@ -1165,7 +1165,7 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() } //test 1 - Conservative volumic MEDCoupling::InterpKernelDEC dec(*source_group,*target_group); - parafield->getField()->setNature(ConservativeVolumic); + parafield->getField()->setNature(IntensiveMaximum); if (source_group->containsMyRank()) { dec.setMethod("P0"); @@ -1186,9 +1186,9 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[0],res[0],1e-13); CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[1],res[1],1e-13); } - //test 2 - Integral + //test 2 - ExtensiveMaximum MEDCoupling::InterpKernelDEC dec2(*source_group,*target_group); - parafield->getField()->setNature(Integral); + parafield->getField()->setNature(ExtensiveMaximum); if (source_group->containsMyRank()) { dec2.setMethod("P0"); @@ -1209,9 +1209,9 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[0],res[0],1e-13); CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[1],res[1],1e-13); } - //test 3 - Integral with global constraint + //test 3 - ExtensiveMaximum with global constraint MEDCoupling::InterpKernelDEC dec3(*source_group,*target_group); - parafield->getField()->setNature(IntegralGlobConstraint); + parafield->getField()->setNature(ExtensiveConservation); if (source_group->containsMyRank()) { dec3.setMethod("P0"); @@ -1232,9 +1232,9 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[0],res[0],1e-13); CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[1],res[1],1e-13); } - //test 4 - RevIntegral + //test 4 - IntensiveConservation MEDCoupling::InterpKernelDEC dec4(*source_group,*target_group); - parafield->getField()->setNature(RevIntegral); + parafield->getField()->setNature(IntensiveConservation); if (source_group->containsMyRank()) { dec4.setMethod("P0"); @@ -1257,7 +1257,7 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() } //test 5 - Conservative volumic reversed MEDCoupling::InterpKernelDEC dec5(*source_group,*target_group); - parafield->getField()->setNature(ConservativeVolumic); + parafield->getField()->setNature(IntensiveMaximum); if (source_group->containsMyRank()) { dec5.setMethod("P0"); @@ -1266,7 +1266,7 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() dec5.setForcedRenormalization(false); dec5.recvData(); const double *res=parafield->getField()->getArray()->getConstPointer(); - CPPUNIT_ASSERT_EQUAL(1,parafield->getField()->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)parafield->getField()->getNumberOfTuples()); const double expected[]={37.8518518518519,43.5333333333333}; CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[rank],res[0],1e-13); } @@ -1282,9 +1282,9 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() res[1]=toSet[1]; dec5.sendData(); } - //test 6 - Integral reversed + //test 6 - ExtensiveMaximum reversed MEDCoupling::InterpKernelDEC dec6(*source_group,*target_group); - parafield->getField()->setNature(Integral); + parafield->getField()->setNature(ExtensiveMaximum); if (source_group->containsMyRank()) { dec6.setMethod("P0"); @@ -1293,7 +1293,7 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() dec6.setForcedRenormalization(false); dec6.recvData(); const double *res=parafield->getField()->getArray()->getConstPointer(); - CPPUNIT_ASSERT_EQUAL(1,parafield->getField()->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)parafield->getField()->getNumberOfTuples()); const double expected[]={0.794600591715977,1.35631163708087}; CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[rank],res[0],1e-13); } @@ -1309,9 +1309,9 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() res[1]=toSet[1]; dec6.sendData(); } - //test 7 - Integral with global constraint reversed + //test 7 - ExtensiveMaximum with global constraint reversed MEDCoupling::InterpKernelDEC dec7(*source_group,*target_group); - parafield->getField()->setNature(IntegralGlobConstraint); + parafield->getField()->setNature(ExtensiveConservation); if (source_group->containsMyRank()) { dec7.setMethod("P0"); @@ -1320,7 +1320,7 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() dec7.setForcedRenormalization(false); dec7.recvData(); const double *res=parafield->getField()->getArray()->getConstPointer(); - CPPUNIT_ASSERT_EQUAL(1,parafield->getField()->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)parafield->getField()->getNumberOfTuples()); const double expected[]={36.4592592592593,44.5407407407407}; CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[rank],res[0],1e-13); } @@ -1336,9 +1336,9 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() res[1]=toSet[1]; dec7.sendData(); } - //test 8 - Integral with RevIntegral reversed + //test 8 - ExtensiveMaximum with IntensiveConservation reversed MEDCoupling::InterpKernelDEC dec8(*source_group,*target_group); - parafield->getField()->setNature(RevIntegral); + parafield->getField()->setNature(IntensiveConservation); if (source_group->containsMyRank()) { dec8.setMethod("P0"); @@ -1347,7 +1347,7 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P0() dec8.setForcedRenormalization(false); dec8.recvData(); const double *res=parafield->getField()->getArray()->getConstPointer(); - CPPUNIT_ASSERT_EQUAL(1,parafield->getField()->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)parafield->getField()->getNumberOfTuples()); const double expected[]={0.81314102564102553,1.3428994082840233}; CPPUNIT_ASSERT_DOUBLES_EQUAL(expected[rank],res[0],1e-13); } @@ -1443,8 +1443,8 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P1P1P0() parafieldP1 = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo); double *valueP0=parafieldP0->getField()->getArray()->getPointer(); double *valueP1=parafieldP1->getField()->getArray()->getPointer(); - parafieldP0->getField()->setNature(ConservativeVolumic); - parafieldP1->getField()->setNature(ConservativeVolumic); + parafieldP0->getField()->setNature(IntensiveMaximum); + parafieldP1->getField()->setNature(IntensiveMaximum); if(rank==0) { valueP0[0]=31.; @@ -1527,8 +1527,8 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P1P1P0() MEDCoupling::ComponentTopology comptopo; parafieldP0 = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); parafieldP1 = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo); - parafieldP0->getField()->setNature(ConservativeVolumic); - parafieldP1->getField()->setNature(ConservativeVolumic); + parafieldP0->getField()->setNature(IntensiveMaximum); + parafieldP1->getField()->setNature(IntensiveMaximum); } // test 1 - P0 P1 MEDCoupling::InterpKernelDEC dec(*source_group,*target_group); @@ -1561,24 +1561,24 @@ void ParaMEDMEMTest::testInterpKernelDECNonOverlapp_2D_P0P1P1P0() if(rank==2) { const double expectP2[5]={39.0, 31.0, 31.0, 47.0, 39.0}; - CPPUNIT_ASSERT_EQUAL(5,parafieldP1->getField()->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,parafieldP1->getField()->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(5,(int)parafieldP1->getField()->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)parafieldP1->getField()->getNumberOfComponents()); for(int kk=0;kk<5;kk++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expectP2[kk],res[kk],1e-12); } if(rank==3) { const double expectP3[3]={39.0, 31.0, 31.0}; - CPPUNIT_ASSERT_EQUAL(3,parafieldP1->getField()->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,parafieldP1->getField()->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(3,(int)parafieldP1->getField()->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)parafieldP1->getField()->getNumberOfComponents()); for(int kk=0;kk<3;kk++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expectP3[kk],res[kk],1e-12); } if(rank==4) { const double expectP4[6]={47.0, 47.0, 47.0, 39.0, 39.0, 31.0}; - CPPUNIT_ASSERT_EQUAL(6,parafieldP1->getField()->getNumberOfTuples()); - CPPUNIT_ASSERT_EQUAL(1,parafieldP1->getField()->getNumberOfComponents()); + CPPUNIT_ASSERT_EQUAL(6,(int)parafieldP1->getField()->getNumberOfTuples()); + CPPUNIT_ASSERT_EQUAL(1,(int)parafieldP1->getField()->getNumberOfComponents()); for(int kk=0;kk<6;kk++) CPPUNIT_ASSERT_DOUBLES_EQUAL(expectP4[kk],res[kk],1e-12); } @@ -1654,7 +1654,7 @@ void ParaMEDMEMTest::testInterpKernelDEC2DM1D_P0P0() MEDCoupling::ComponentTopology comptopo; paramesh=new ParaMESH(mesh,*source_group,"source mesh"); parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); - parafield->getField()->setNature(ConservativeVolumic); + parafield->getField()->setNature(IntensiveMaximum); double *vals=parafield->getField()->getArray()->getPointer(); if(rank==0) { vals[0]=7.; vals[1]=8.; } @@ -1667,7 +1667,7 @@ void ParaMEDMEMTest::testInterpKernelDEC2DM1D_P0P0() MEDCoupling::ComponentTopology comptopo; paramesh=new ParaMESH(mesh,*target_group,"target mesh"); parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); - parafield->getField()->setNature(ConservativeVolumic); + parafield->getField()->setNature(IntensiveMaximum); } MEDCoupling::InterpKernelDEC dec(*source_group,*target_group); if(source_group->containsMyRank()) @@ -1704,7 +1704,7 @@ void ParaMEDMEMTest::testInterpKernelDEC2DM1D_P0P0() } MEDCoupling::InterpKernelDEC dec2(*source_group,*target_group); dec2.setMethod("P0"); - parafield->getField()->setNature(IntegralGlobConstraint); + parafield->getField()->setNature(ExtensiveConservation); if(source_group->containsMyRank()) { double *vals=parafield->getField()->getArray()->getPointer(); @@ -1741,7 +1741,7 @@ void ParaMEDMEMTest::testInterpKernelDEC2DM1D_P0P0() // MEDCoupling::InterpKernelDEC dec3(*source_group,*target_group); dec3.setMethod("P0"); - parafield->getField()->setNature(Integral); + parafield->getField()->setNature(ExtensiveMaximum); if(source_group->containsMyRank()) { double *vals=parafield->getField()->getArray()->getPointer(); @@ -1778,7 +1778,7 @@ void ParaMEDMEMTest::testInterpKernelDEC2DM1D_P0P0() // MEDCoupling::InterpKernelDEC dec4(*source_group,*target_group); dec4.setMethod("P0"); - parafield->getField()->setNature(RevIntegral); + parafield->getField()->setNature(IntensiveConservation); if(source_group->containsMyRank()) { double *vals=parafield->getField()->getArray()->getPointer(); @@ -1876,7 +1876,7 @@ void ParaMEDMEMTest::testInterpKernelDECPartialProcs() MEDCoupling::ComponentTopology comptopo; paramesh=new ParaMESH(mesh,*source_group,"source mesh"); parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); - parafield->getField()->setNature(ConservativeVolumic); + parafield->getField()->setNature(IntensiveMaximum); double *vals=parafield->getField()->getArray()->getPointer(); vals[0]=7.; dec=new MEDCoupling::InterpKernelDEC(*source_group,*target_group); @@ -1902,7 +1902,7 @@ void ParaMEDMEMTest::testInterpKernelDECPartialProcs() MEDCoupling::ComponentTopology comptopo; paramesh=new ParaMESH(mesh,*target_group,"target mesh"); parafield=new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); - parafield->getField()->setNature(ConservativeVolumic); + parafield->getField()->setNature(IntensiveMaximum); dec=new MEDCoupling::InterpKernelDEC(*source_group,*target_group); dec->attachLocalField(parafield); dec->synchronize(); @@ -1978,7 +1978,7 @@ void ParaMEDMEMTest::testInterpKernelDEC3DSurfEmptyBBox() MEDCoupling::ComponentTopology comptopo; parafieldP0 = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); double *valueP0=parafieldP0->getField()->getArray()->getPointer(); - parafieldP0->getField()->setNature(ConservativeVolumic); + parafieldP0->getField()->setNature(IntensiveMaximum); valueP0[0]=7.; valueP0[1]=8.; } else @@ -2016,7 +2016,7 @@ void ParaMEDMEMTest::testInterpKernelDEC3DSurfEmptyBBox() } MEDCoupling::ComponentTopology comptopo; parafieldP0 = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); - parafieldP0->getField()->setNature(ConservativeVolumic); + parafieldP0->getField()->setNature(IntensiveMaximum); } // test 1 MEDCoupling::InterpKernelDEC dec(*source_group,*target_group); @@ -2148,7 +2148,7 @@ void ParaMEDMEMTest::testAsynchronousInterpKernelDEC_2D(double dtA, double tmaxA ostringstream meshname ; meshname<< "Mesh_2_"<< rank+1; - mesh=MEDLoader::ReadUMeshFromFile(fName.c_str(),meshname.str().c_str(),0); + mesh=ReadUMeshFromFile(fName.c_str(),meshname.str().c_str(),0); paramesh=new ParaMESH (mesh,*source_group,"source mesh"); @@ -2157,7 +2157,7 @@ void ParaMEDMEMTest::testAsynchronousInterpKernelDEC_2D(double dtA, double tmaxA if(srcM=="P0") { parafield = new ParaFIELD(ON_CELLS,NO_TIME,paramesh, comptopo); - parafield->getField()->setNature(ConservativeVolumic);//InvertIntegral);//ConservativeVolumic); + parafield->getField()->setNature(IntensiveMaximum);//InvertIntegral);//IntensiveMaximum); } else parafield = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo); @@ -2190,7 +2190,7 @@ void ParaMEDMEMTest::testAsynchronousInterpKernelDEC_2D(double dtA, double tmaxA ostringstream meshname ; meshname<< "Mesh_3_"<getField()->setNature(ConservativeVolumic);//InvertIntegral);//ConservativeVolumic); + parafield->getField()->setNature(IntensiveMaximum);//InvertIntegral);//IntensiveMaximum); } else parafield = new ParaFIELD(ON_NODES,NO_TIME,paramesh, comptopo);