const int OverlapElementLocator::START_TAG_MESH_XCH = 1140;
OverlapElementLocator::OverlapElementLocator(const ParaFIELD *sourceField, const ParaFIELD *targetField,
- const ProcessorGroup& group, double epsAbs, int workSharingAlgo)
+ const ProcessorGroup& group, double eps, double epsAbs, int workSharingAlgo)
: _local_source_field(sourceField),
_local_target_field(targetField),
_local_source_mesh(0),
_local_target_mesh(0),
_domain_bounding_boxes(0),
_group(group),
- _epsAbs(epsAbs)
+ _bbox_eps(eps),
+ _bbox_eps_abs(epsAbs)
{
if(_local_source_field)
_local_source_mesh=_local_source_field->getSupport()->getCellMesh();
case 1:
computeTodoList_new(false); break;
case 2:
- computeTodoList_new(true); break;
+ computeTodoList_new(true); break;
default:
throw INTERP_KERNEL::Exception("OverlapElementLocator::OverlapElementLocator(): invalid algorithm selected!");
}
comm_interface.allGather(minmax, bbSize, MPI_DOUBLE,
_domain_bounding_boxes,bbSize, MPI_DOUBLE,
*comm);
-
+ // Adjust bounding boxes with relative and absolute epsilons:
+ adjustDomainBoundingBoxes();
+
// Computation of all pairs needing an interpolation pairs are duplicated now !
-
_proc_pairs.clear();//first is source second is target
_proc_pairs.resize(_group.size());
for(int i=0;i<_group.size();i++)
* + remove this job from proc#i, and mark it as 'unremovable' from proc#j
* - repeat until no more duplicates are found
*/
- void OverlapElementLocator::computeTodoList_new(bool revertIter)
+ void OverlapElementLocator::computeTodoList_new(bool optimized)
{
using namespace std;
int infinity = std::numeric_limits<int>::max();
// Nothing more to do:
if (max_sz == -1)
break;
- // For this proc, job with less loaded second proc:
+ // For this proc (max_id), job with less loaded second proc is to be identified (and then will be removed from max_id)
int min_sz = infinity;
map<ProcCouple, int> & max_map = full_set[max_id];
ProcCouple hit_cpl = make_pair(-1,-1);
- if(revertIter)
+ for(itMap=max_map.begin(); itMap != max_map.end(); itMap++)
{
- // Use a reverse iterator here increases our chances to hit a couple of the form (i, myProcId)
- // meaning that the final matrix computed won't have to be sent: save some comm.
- map<ProcCouple, int> ::const_reverse_iterator ritMap;
- for(ritMap=max_map.rbegin(); ritMap != max_map.rend(); ritMap++)
- if ((*ritMap).second < min_sz)
- hit_cpl = (*ritMap).first;
- }
- else
- {
- for(itMap=max_map.begin(); itMap != max_map.end(); itMap++)
- if ((*itMap).second < min_sz)
- hit_cpl = (*itMap).first;
+ int new_size = (*itMap).second;
+ const ProcCouple & a_cpl = (*itMap).first;
+ // If there are several candidates always favor the removal of a job which will not stay local (ie (myProcId, j))
+ // For such a job the computed matrix has to be sent: so avoid some comm.
+ if (new_size < min_sz ||
+ (optimized && new_size <= min_sz && a_cpl.second != max_id && new_size != infinity)
+ )
+ {
+ min_sz = new_size;
+ hit_cpl = a_cpl;
+ }
}
+
if (hit_cpl.first == -1)
{
// Plouf. Current proc 'max_id' can not be reduced. Invalid it:
return std::find(_to_do_list.begin(), _to_do_list.end(), cpl)!=_to_do_list.end();
}
+ /*! Readjusts a set of bounding boxes so that they are extended
+ in all dimensions for avoiding missing interesting intersections
+
+ Taken from:
+ void PlanarIntersector<MyMeshType,MyMatrix>::adjustBoundingBoxes(...)
+ */
+ void OverlapElementLocator::adjustDomainBoundingBoxes()
+ {
+ long size = 2*_group.size(); // 2 meshes per proc: source / target
+ int bbSize = size*2*_local_space_dim; // 2 (min/max)
+
+ for (int i=0; i<size; i++)
+ {
+ double max=- std::numeric_limits<double>::max();
+ for(int idim=0; idim<_local_space_dim; idim++)
+ {
+ // idim(max) - idim(min) = idim(extent)
+ double Dx = _domain_bounding_boxes[i*2*_local_space_dim+1+2*idim] - _domain_bounding_boxes[i*2*_local_space_dim+2*idim];
+ max=(max<Dx)?Dx:max;
+ }
+ for(int idim=0; idim<_local_space_dim; idim++)
+ {
+ _domain_bounding_boxes[i*2*_local_space_dim+2*idim ] -= _bbox_eps*max + _bbox_eps_abs;
+ _domain_bounding_boxes[i*2*_local_space_dim+2*idim+1] += _bbox_eps*max + _bbox_eps_abs;
+ }
+ }
+ }
+
bool OverlapElementLocator::intersectsBoundingBox(int isource, int itarget) const
{
const double *source_bb=_domain_bounding_boxes+isource*2*2*_local_space_dim;
for (int idim=0; idim < _local_space_dim; idim++)
{
- bool intersects = (target_bb[idim*2]<source_bb[idim*2+1]+_epsAbs)
- && (source_bb[idim*2]<target_bb[idim*2+1]+_epsAbs);
+ bool intersects = (target_bb[idim*2]<source_bb[idim*2+1])
+ && (source_bb[idim*2]<target_bb[idim*2+1]);
if (!intersects)
return false;
}
class ParaMEDMEMTest : public CppUnit::TestFixture
{
CPPUNIT_TEST_SUITE( ParaMEDMEMTest );
- CPPUNIT_TEST(testMPIProcessorGroup_constructor); // 1 and 2 procs
- CPPUNIT_TEST(testMPIProcessorGroup_boolean); // 1 and 2 procs
- CPPUNIT_TEST(testMPIProcessorGroup_rank); // >=2 procs
- CPPUNIT_TEST(testBlockTopology_constructor); // >=2 procs
- CPPUNIT_TEST(testBlockTopology_serialize); // 1 proc
- CPPUNIT_TEST(testInterpKernelDEC_1D); // 5 procs
- CPPUNIT_TEST(testInterpKernelDEC_2DCurve); // 5 procs
- CPPUNIT_TEST(testInterpKernelDEC_2D); // 5 procs
- CPPUNIT_TEST(testInterpKernelDEC2_2D); // 5 procs
- CPPUNIT_TEST(testInterpKernelDEC_2DP0P1); // Not impl.
- CPPUNIT_TEST(testInterpKernelDEC_3D); // 3 procs
- CPPUNIT_TEST(testInterpKernelDECNonOverlapp_2D_P0P0); // 5 procs
- CPPUNIT_TEST(testInterpKernelDECNonOverlapp_2D_P0P1P1P0); // 5 procs
- CPPUNIT_TEST(testInterpKernelDEC2DM1D_P0P0); // 3 procs
- CPPUNIT_TEST(testInterpKernelDECPartialProcs); // 3 procs
- CPPUNIT_TEST(testInterpKernelDEC3DSurfEmptyBBox); // 3 procs
+// CPPUNIT_TEST(testMPIProcessorGroup_constructor); // 1 and 2 procs
+// CPPUNIT_TEST(testMPIProcessorGroup_boolean); // 1 and 2 procs
+// CPPUNIT_TEST(testMPIProcessorGroup_rank); // >=2 procs
+// CPPUNIT_TEST(testBlockTopology_constructor); // >=2 procs
+// CPPUNIT_TEST(testBlockTopology_serialize); // 1 proc
+// CPPUNIT_TEST(testInterpKernelDEC_1D); // 5 procs
+// CPPUNIT_TEST(testInterpKernelDEC_2DCurve); // 5 procs
+// CPPUNIT_TEST(testInterpKernelDEC_2D); // 5 procs
+// CPPUNIT_TEST(testInterpKernelDEC2_2D); // 5 procs
+// CPPUNIT_TEST(testInterpKernelDEC_2DP0P1); // Not impl.
+// CPPUNIT_TEST(testInterpKernelDEC_3D); // 3 procs
+// CPPUNIT_TEST(testInterpKernelDECNonOverlapp_2D_P0P0); // 5 procs
+// CPPUNIT_TEST(testInterpKernelDECNonOverlapp_2D_P0P1P1P0); // 5 procs
+// CPPUNIT_TEST(testInterpKernelDEC2DM1D_P0P0); // 3 procs
+// CPPUNIT_TEST(testInterpKernelDECPartialProcs); // 3 procs
+// CPPUNIT_TEST(testInterpKernelDEC3DSurfEmptyBBox); // 3 procs
+// CPPUNIT_TEST(testOverlapDEC_LMEC_seq);
+// CPPUNIT_TEST(testOverlapDEC_LMEC_para);
CPPUNIT_TEST(testOverlapDEC1); // 3 procs
CPPUNIT_TEST(testOverlapDEC1_bis); // 3 procs
CPPUNIT_TEST(testOverlapDEC1_ter); // 3 procs
CPPUNIT_TEST(testOverlapDEC2_bis); // 3 procs
CPPUNIT_TEST(testOverlapDEC2_ter); // 3 procs
CPPUNIT_TEST(testOverlapDEC3); // 2 procs
+ CPPUNIT_TEST(testOverlapDEC3_bis); // 2 procs
+ CPPUNIT_TEST(testOverlapDEC3_ter); // 2 procs
CPPUNIT_TEST(testOverlapDEC4); // 2 procs
-
- CPPUNIT_TEST(testSynchronousEqualInterpKernelWithoutInterpNativeDEC_2D);// 5 procs
- CPPUNIT_TEST(testSynchronousEqualInterpKernelWithoutInterpDEC_2D); // 5 procs
- CPPUNIT_TEST(testSynchronousEqualInterpKernelDEC_2D); // 5 procs
- CPPUNIT_TEST(testSynchronousFasterSourceInterpKernelDEC_2D); // 5 procs
- CPPUNIT_TEST(testSynchronousSlowerSourceInterpKernelDEC_2D); // 5 procs
- CPPUNIT_TEST(testSynchronousSlowSourceInterpKernelDEC_2D); // 5 procs
- CPPUNIT_TEST(testSynchronousFastSourceInterpKernelDEC_2D); // 5 procs
- CPPUNIT_TEST(testAsynchronousEqualInterpKernelDEC_2D); // 5 procs
- CPPUNIT_TEST(testAsynchronousFasterSourceInterpKernelDEC_2D); // 5 procs
- CPPUNIT_TEST(testAsynchronousSlowerSourceInterpKernelDEC_2D); // 5 procs
- CPPUNIT_TEST(testAsynchronousSlowSourceInterpKernelDEC_2D); // 5 procs
- CPPUNIT_TEST(testAsynchronousFastSourceInterpKernelDEC_2D); // 5 procs
-#ifdef MED_ENABLE_FVM
- //can be added again after FVM correction for 2D
- // CPPUNIT_TEST(testNonCoincidentDEC_2D);
- CPPUNIT_TEST(testNonCoincidentDEC_3D);
-#endif
- CPPUNIT_TEST(testStructuredCoincidentDEC); // 5 procs
- CPPUNIT_TEST(testICoco1); // 2 procs
- CPPUNIT_TEST(testGauthier1); // 4 procs
- CPPUNIT_TEST(testGauthier2); // >= 2 procs
- CPPUNIT_TEST(testGauthier3); // 4 procs
- CPPUNIT_TEST(testGauthier4); // 3 procs
- CPPUNIT_TEST(testFabienAPI1); // 3 procs
- CPPUNIT_TEST(testFabienAPI2); // 3 procs
+ CPPUNIT_TEST(testOverlapDEC4_bis); // 2 procs
+ CPPUNIT_TEST(testOverlapDEC4_ter); // 2 procs
+//
+// CPPUNIT_TEST(testSynchronousEqualInterpKernelWithoutInterpNativeDEC_2D);// 5 procs
+// CPPUNIT_TEST(testSynchronousEqualInterpKernelWithoutInterpDEC_2D); // 5 procs
+// CPPUNIT_TEST(testSynchronousEqualInterpKernelDEC_2D); // 5 procs
+// CPPUNIT_TEST(testSynchronousFasterSourceInterpKernelDEC_2D); // 5 procs
+// CPPUNIT_TEST(testSynchronousSlowerSourceInterpKernelDEC_2D); // 5 procs
+// CPPUNIT_TEST(testSynchronousSlowSourceInterpKernelDEC_2D); // 5 procs
+// CPPUNIT_TEST(testSynchronousFastSourceInterpKernelDEC_2D); // 5 procs
+// CPPUNIT_TEST(testAsynchronousEqualInterpKernelDEC_2D); // 5 procs
+// CPPUNIT_TEST(testAsynchronousFasterSourceInterpKernelDEC_2D); // 5 procs
+// CPPUNIT_TEST(testAsynchronousSlowerSourceInterpKernelDEC_2D); // 5 procs
+// CPPUNIT_TEST(testAsynchronousSlowSourceInterpKernelDEC_2D); // 5 procs
+// CPPUNIT_TEST(testAsynchronousFastSourceInterpKernelDEC_2D); // 5 procs
+//#ifdef MED_ENABLE_FVM
+// //can be added again after FVM correction for 2D
+// // CPPUNIT_TEST(testNonCoincidentDEC_2D);
+// CPPUNIT_TEST(testNonCoincidentDEC_3D);
+//#endif
+// CPPUNIT_TEST(testStructuredCoincidentDEC); // 5 procs
+// CPPUNIT_TEST(testICoco1); // 2 procs
+// CPPUNIT_TEST(testGauthier1); // 4 procs
+// CPPUNIT_TEST(testGauthier2); // >= 2 procs
+// CPPUNIT_TEST(testGauthier3); // 4 procs
+// CPPUNIT_TEST(testGauthier4); // 3 procs
+// CPPUNIT_TEST(testFabienAPI1); // 3 procs
+// CPPUNIT_TEST(testFabienAPI2); // 3 procs
CPPUNIT_TEST_SUITE_END();
void testInterpKernelDEC2DM1D_P0P0();
void testInterpKernelDECPartialProcs();
void testInterpKernelDEC3DSurfEmptyBBox();
+ void testOverlapDEC_LMEC_seq();
+ void testOverlapDEC_LMEC_para();
void testOverlapDEC1();
void testOverlapDEC1_bis();
void testOverlapDEC1_ter();
void testOverlapDEC2_bis();
void testOverlapDEC2_ter();
void testOverlapDEC3();
-// void testOverlapDEC3_bis();
+ void testOverlapDEC3_bis();
+ void testOverlapDEC3_ter();
void testOverlapDEC4();
+ void testOverlapDEC4_bis();
+ void testOverlapDEC4_ter();
#ifdef MED_ENABLE_FVM
void testNonCoincidentDEC_2D();
void testNonCoincidentDEC_3D();
typedef MEDCouplingAutoRefCountObjectPtr<MEDCouplingFieldDouble> MFDouble;
typedef MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> DADouble;
-//void ParaMEDMEMTest::testOverlapDEC_LMEC_seq()
-//{
-// // T_SC_Trio_src.med -- "SupportOf_"
-// // T_SC_Trio_dst.med -- "SupportOf_T_SC_Trio"
-// // h_TH_Trio_src.med -- "SupportOf_"
-// // h_TH_Trio_dst.med -- "SupportOf_h_TH_Trio"
-// string rep("/export/home/adrien/support/antoine_LMEC/");
-// string src_mesh_nam(rep + string("T_SC_Trio_src.med"));
-// string tgt_mesh_nam(rep + string("T_SC_Trio_dst.med"));
-//// string src_mesh_nam(rep + string("h_TH_Trio_src.med"));
-//// string tgt_mesh_nam(rep + string("h_TH_Trio_dst.med"));
-// MUMesh src_mesh=MEDLoader::ReadUMeshFromFile(src_mesh_nam,"SupportOf_",0);
-// MUMesh tgt_mesh=MEDLoader::ReadUMeshFromFile(tgt_mesh_nam,"SupportOf_T_SC_Trio",0);
-//// MUMesh tgt_mesh=MEDLoader::ReadUMeshFromFile(tgt_mesh_nam,"SupportOf_h_TH_Trio",0);
-//
-// MFDouble srcField = MEDCouplingFieldDouble::New(ON_CELLS, ONE_TIME);
-// srcField->setMesh(src_mesh);
-// DataArrayDouble * dad = DataArrayDouble::New(); dad->alloc(src_mesh->getNumberOfCells(),1);
-// dad->fillWithValue(1.0);
-// srcField->setArray(dad);
-// srcField->setNature(ConservativeVolumic);
-//
-// MEDCouplingRemapper remap;
-// remap.setOrientation(2); // always consider surface intersections as absolute areas.
-// remap.prepare(src_mesh, tgt_mesh, "P0P0");
-// MFDouble tgtField = remap.transferField(srcField, 1.0e+300);
-// tgtField->setName("result");
-// string out_nam(rep + string("adrien.med"));
-// MEDLoader::WriteField(out_nam,tgtField, true);
-// cout << "wrote: " << out_nam << "\n";
-// double integ1 = 0.0, integ2 = 0.0;
-// srcField->integral(true, &integ1);
-// tgtField->integral(true, &integ2);
-//// tgtField->reprQuickOverview(cout);
-// CPPUNIT_ASSERT_DOUBLES_EQUAL(integ1,integ2,1e-8);
-//
-// dad->decrRef();
-//}
-//
-//void ParaMEDMEMTest::testOverlapDEC_LMEC_para()
-//{
-// using namespace ParaMEDMEM;
-//
-// int size;
-// int rank;
-// MPI_Comm_size(MPI_COMM_WORLD,&size);
-// MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-//
-// if (size != 1) return ;
-//
-// int nproc = 1;
-// std::set<int> procs;
-//
-// for (int i=0; i<nproc; i++)
-// procs.insert(i);
-//
-// CommInterface interface;
-// OverlapDEC dec(procs);
-//
-// ParaMESH* parameshS=0;
-// ParaMESH* parameshT=0;
-// ParaFIELD* parafieldS=0;
-// ParaFIELD* parafieldT=0;
-// MFDouble srcField;
-//
-// // **** FILE LOADING
-// // T_SC_Trio_src.med -- "SupportOf_"
-// // T_SC_Trio_dst.med -- "SupportOf_T_SC_Trio"
-// // h_TH_Trio_src.med -- "SupportOf_"
-// // h_TH_Trio_dst.med -- "SupportOf_h_TH_Trio"
-// string rep("/export/home/adrien/support/antoine_LMEC/");
-// string src_mesh_nam(rep + string("T_SC_Trio_src.med"));
-// string tgt_mesh_nam(rep + string("T_SC_Trio_dst.med"));
-//
-//
-// MPI_Barrier(MPI_COMM_WORLD);
-// if(rank==0)
-// {
-// // string src_mesh_nam(rep + string("h_TH_Trio_src.med"));
-// // string tgt_mesh_nam(rep + string("h_TH_Trio_dst.med"));
-// MUMesh src_mesh=MEDLoader::ReadUMeshFromFile(src_mesh_nam,"SupportOf_",0);
-// MUMesh tgt_mesh=MEDLoader::ReadUMeshFromFile(tgt_mesh_nam,"SupportOf_T_SC_Trio",0);
-// // MUMesh tgt_mesh=MEDLoader::ReadUMeshFromFile(tgt_mesh_nam,"SupportOf_h_TH_Trio",0);
-//
-// // **** SOURCE
-// srcField = MEDCouplingFieldDouble::New(ON_CELLS, ONE_TIME);
-// srcField->setMesh(src_mesh);
-// DataArrayDouble * dad = DataArrayDouble::New(); dad->alloc(src_mesh->getNumberOfCells(),1);
-// dad->fillWithValue(1.0);
-// srcField->setArray(dad);
-// srcField->setNature(ConservativeVolumic);
-//
-// ComponentTopology comptopo;
-// parameshS = new ParaMESH(src_mesh,*dec.getGroup(),"source mesh");
-// parafieldS = new ParaFIELD(ON_CELLS,ONE_TIME,parameshS,comptopo);
-// parafieldS->getField()->setNature(ConservativeVolumic);//IntegralGlobConstraint
-// parafieldS->getField()->setArray(dad);
-//
-// // **** TARGET
-// parameshT=new ParaMESH(tgt_mesh,*dec.getGroup(),"target mesh");
-// parafieldT=new ParaFIELD(ON_CELLS,ONE_TIME,parameshT,comptopo);
-// parafieldT->getField()->setNature(ConservativeVolumic);//IntegralGlobConstraint
-// parafieldT->getField()->getArray()->fillWithValue(1.0e300);
-//// valsT[0]=7.;
-// }
-// dec.setOrientation(2);
-// dec.attachSourceLocalField(parafieldS);
-// dec.attachTargetLocalField(parafieldT);
-// dec.synchronize();
-// dec.sendRecvData(true);
-// //
-// if(rank==0)
-// {
-// double integ1 = 0.0, integ2 = 0.0;
-// MEDCouplingFieldDouble * tgtField;
-//
-// srcField->integral(true, &integ1);
-// tgtField = parafieldT->getField();
-//// tgtField->reprQuickOverview(cout);
-// tgtField->integral(true, &integ2);
-// tgtField->setName("result");
-// string out_nam(rep + string("adrien_para.med"));
-// MEDLoader::WriteField(out_nam,tgtField, true);
-// cout << "wrote: " << out_nam << "\n";
-// CPPUNIT_ASSERT_DOUBLES_EQUAL(integ1,integ2,1e-8);
-// }
-// delete parafieldS;
-// delete parafieldT;
-// delete parameshS;
-// delete parameshT;
-//
-// MPI_Barrier(MPI_COMM_WORLD);
-//}
+void ParaMEDMEMTest::testOverlapDEC_LMEC_seq()
+{
+ // T_SC_Trio_src.med -- "SupportOf_"
+ // T_SC_Trio_dst.med -- "SupportOf_T_SC_Trio" // 2D
+ // h_TH_Trio_src.med -- "SupportOf_"
+ // h_TH_Trio_dst.med -- "SupportOf_h_TH_Trio" // 3D
+ string rep("/export/home/adrien/support/antoine_LMEC/");
+ string src_mesh_nam(rep + string("T_SC_Trio_src.med"));
+ string tgt_mesh_nam(rep + string("T_SC_Trio_dst.med"));
+// string src_mesh_nam(rep + string("h_TH_Trio_src.med"));
+// string tgt_mesh_nam(rep + string("h_TH_Trio_dst.med"));
+ MUMesh src_mesh=MEDLoader::ReadUMeshFromFile(src_mesh_nam,"SupportOf_",0);
+ MUMesh tgt_mesh=MEDLoader::ReadUMeshFromFile(tgt_mesh_nam,"SupportOf_T_SC_Trio",0);
+// MUMesh tgt_mesh=MEDLoader::ReadUMeshFromFile(tgt_mesh_nam,"SupportOf_h_TH_Trio",0);
+
+ MFDouble srcField = MEDCouplingFieldDouble::New(ON_CELLS, ONE_TIME);
+ srcField->setMesh(src_mesh);
+ DataArrayDouble * dad = DataArrayDouble::New(); dad->alloc(src_mesh->getNumberOfCells(),1);
+ dad->fillWithValue(1.0);
+ srcField->setArray(dad);
+ srcField->setNature(ConservativeVolumic);
+
+ MEDCouplingRemapper remap;
+ remap.setOrientation(2); // always consider surface intersections as absolute areas.
+ remap.setBoundingBoxAdjustment(0.0);
+ remap.prepare(src_mesh, tgt_mesh, "P0P0");
+ MFDouble tgtField = remap.transferField(srcField, 1.0e+300);
+ tgtField->setName("result");
+ string out_nam(rep + string("adrien.med"));
+ MEDLoader::WriteField(out_nam,tgtField, true);
+ cout << "wrote: " << out_nam << "\n";
+ double integ1 = 0.0, integ2 = 0.0;
+ srcField->integral(true, &integ1);
+ tgtField->integral(true, &integ2);
+ tgtField->reprQuickOverview(cout);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(integ1,integ2,1e-8);
+
+ dad->decrRef();
+}
//
+void ParaMEDMEMTest::testOverlapDEC_LMEC_para()
+{
+ using namespace ParaMEDMEM;
+
+ int size;
+ int rank;
+ MPI_Comm_size(MPI_COMM_WORLD,&size);
+ MPI_Comm_rank(MPI_COMM_WORLD,&rank);
+
+ if (size != 1) return ;
+
+ int nproc = 1;
+ std::set<int> procs;
+
+ for (int i=0; i<nproc; i++)
+ procs.insert(i);
+
+ CommInterface interface;
+ OverlapDEC dec(procs);
+ MFDouble srcField, tgtField;
+
+ // **** FILE LOADING
+ // T_SC_Trio_src.med -- "SupportOf_"
+ // T_SC_Trio_dst.med -- "SupportOf_T_SC_Trio"
+ // h_TH_Trio_src.med -- "SupportOf_"
+ // h_TH_Trio_dst.med -- "SupportOf_h_TH_Trio"
+ string rep("/export/home/adrien/support/antoine_LMEC/");
+ string src_mesh_nam(rep + string("T_SC_Trio_src.med"));
+ string tgt_mesh_nam(rep + string("T_SC_Trio_dst.med"));
+
+
+ MPI_Barrier(MPI_COMM_WORLD);
+ if(rank==0)
+ {
+ // string src_mesh_nam(rep + string("h_TH_Trio_src.med"));
+ // string tgt_mesh_nam(rep + string("h_TH_Trio_dst.med"));
+ MUMesh src_mesh=MEDLoader::ReadUMeshFromFile(src_mesh_nam,"SupportOf_",0);
+ MUMesh tgt_mesh=MEDLoader::ReadUMeshFromFile(tgt_mesh_nam,"SupportOf_T_SC_Trio",0);
+ // MUMesh tgt_mesh=MEDLoader::ReadUMeshFromFile(tgt_mesh_nam,"SupportOf_h_TH_Trio",0);
+
+ // **** SOURCE
+ srcField = MEDCouplingFieldDouble::New(ON_CELLS, ONE_TIME);
+ srcField->setMesh(src_mesh);
+ DataArrayDouble * dad = DataArrayDouble::New(); dad->alloc(src_mesh->getNumberOfCells(),1);
+ dad->fillWithValue(1.0);
+ srcField->setArray(dad);
+ srcField->setNature(ConservativeVolumic);
+
+ // **** TARGET
+ tgtField = MEDCouplingFieldDouble::New(ON_CELLS, ONE_TIME);
+ tgtField->setMesh(tgt_mesh);
+ DataArrayDouble * dad2 = DataArrayDouble::New(); dad2->alloc(tgt_mesh->getNumberOfCells(),1);
+ dad2->fillWithValue(-10.0);
+ tgtField->setArray(dad2);
+ tgtField->setNature(ConservativeVolumic);
+ }
+
+ dec.setOrientation(2);
+ dec.setBoundingBoxAdjustmentAbs(1.0e-12);
+ dec.setMaxDistance3DSurfIntersect(1e-6);
+ dec.setPrecision(1e-6);
+ dec.setWorkSharingAlgo(1);
+
+ dec.attachSourceLocalField(srcField);
+ dec.attachTargetLocalField(tgtField);
+ dec.setDefaultValue(-20.0);
+ dec.synchronize();
+ dec.sendRecvData(true);
+ //
+ if(rank==0)
+ {
+ double integ1 = 0.0, integ2 = 0.0;
+
+ srcField->integral(true, &integ1);
+ tgtField->reprQuickOverview(cout);
+ tgtField->integral(true, &integ2);
+ tgtField->setName("result");
+ string out_nam(rep + string("adrien_para.med"));
+ MEDLoader::WriteField(out_nam,tgtField, true);
+ cout << "wrote: " << out_nam << "\n";
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(integ1,integ2,1e-8);
+ }
+
+ MPI_Barrier(MPI_COMM_WORLD);
+}
+
void prepareData1(int rank, NatureOfField nature,
MEDCouplingFieldDouble *& fieldS, MEDCouplingFieldDouble *& fieldT)
{
double *valsS=parafieldS->getField()->getArray()->getPointer();
for(int i=0; i < fieldCompoNum; i++)
{
- valsS[i] = 1. * (10^i);
- valsS[fieldCompoNum+i] = 2. * (10^i);
+ valsS[i] = 1. * pow(10, i);
+ valsS[fieldCompoNum+i] = 2. * pow(10, i);
if (!stripPartOfSource)
{
- valsS[2*fieldCompoNum+i] = 3. * (10^i);
+ valsS[2*fieldCompoNum+i] = 3. * pow(10, i);
}
}
double *valsS=parafieldS->getField()->getArray()->getPointer();
for(int i=0; i < fieldCompoNum; i++)
{
- valsS[i] = 4. * (10^i);
- valsS[fieldCompoNum+i] = 5. * (10^i);
+ valsS[i] = 4. * pow(10, i);
+ valsS[fieldCompoNum+i] = 5. * pow(10, i);
}
//
}
/*! Test case from the official doc of the OverlapDEC.
- * WARNING: bounding boxes might be tweaked here to make the case more interesting (i.e. to avoid an all to all exchange
+ * WARNING: bounding boxes are tweaked here to make the case more interesting (i.e. to avoid an all to all exchange
* between all procs).
*/
-void testOverlapDEC_generic(int workSharingAlgo, double bbAdj)
+void testOverlapDEC_generic(int workSharingAlgo, double bbAdj, double bbAdjAbs)
{
int size, rank;
MPI_Comm_size(MPI_COMM_WORLD,&size);
prepareData1(rank, ConservativeVolumic, mcfieldS, mcfieldT);
// See comment in the caller:
- dec.setBoundingBoxAdjustmentAbs(bbAdj);
+ dec.setDomainBoundingBoxAdjustment(bbAdj);
+ dec.setDomainBoundingBoxAdjustmentAbs(bbAdjAbs);
dec.setWorkSharingAlgo(workSharingAlgo); // just to ease debugging
dec.attachSourceLocalField(mcfieldS);
* Obviously this is NOT a good idea to do this in production code :-)
* !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
*/
- testOverlapDEC_generic(0,-1.0e-12);
+ testOverlapDEC_generic(0,0.0,-1.0e-12);
}
void ParaMEDMEMTest::testOverlapDEC1_bis()
{
// Same BB hack as above
- testOverlapDEC_generic(1,-1.0e-12);
+ testOverlapDEC_generic(1,0.0,-1.0e-12);
}
void ParaMEDMEMTest::testOverlapDEC1_ter()
{
// Same BB hack as above
- testOverlapDEC_generic(2, -1.0e-12);
+ testOverlapDEC_generic(2,0.0,-1.0e-12);
}
/*!
- * Same as testOverlapDEC1() but with regular bounding boxes. If you're looking for a nice debug case,
+ * Same as testOverlapDEC1() but with regular bounding boxes adj values. If you're looking for a nice debug case,
* testOverlapDEC1() is identical in terms of geometry and field values, and more appropriate.
*/
void ParaMEDMEMTest::testOverlapDEC2()
{
- testOverlapDEC_generic(0,1.0e-12);
+ testOverlapDEC_generic(0, 1.0e-4, 0.0);
}
void ParaMEDMEMTest::testOverlapDEC2_bis()
{
- testOverlapDEC_generic(1,1.0e-12);
+ testOverlapDEC_generic(1, 1.0e-4, 0.0);
}
void ParaMEDMEMTest::testOverlapDEC2_ter()
{
- testOverlapDEC_generic(2,1.0e-12);
+ testOverlapDEC_generic(2, 1.0e-4, 0.0);
}
-
/*! Test focused on the mapping of cell IDs.
* (i.e. when only part of the source/target mesh is transmitted)
*/
-void ParaMEDMEMTest::testOverlapDEC3()
+void testOverlapDEC_map_generic(int workSharingAlgo)
{
int size, rank;
MPI_Comm_size(MPI_COMM_WORLD,&size);
CommInterface interface;
OverlapDEC dec(procs);
+ dec.setWorkSharingAlgo(workSharingAlgo);
ProcessorGroup * grp = dec.getGroup();
MEDCouplingUMesh* meshS=0, *meshT=0;
ParaMESH* parameshS=0, *parameshT=0;
MPI_Barrier(MPI_COMM_WORLD);
}
+void ParaMEDMEMTest::testOverlapDEC3()
+{
+ testOverlapDEC_map_generic(0);
+}
+
+void ParaMEDMEMTest::testOverlapDEC3_bis()
+{
+ testOverlapDEC_map_generic(1);
+}
+
+void ParaMEDMEMTest::testOverlapDEC3_ter()
+{
+ testOverlapDEC_map_generic(2);
+}
+
/*!
* Tests:
* - default value
* - multi-component fields
*/
-void ParaMEDMEMTest::testOverlapDEC4()
+void testOverlapDEC_default_multi(int workSharingAlgo)
{
int size, rank;
MPI_Comm_size(MPI_COMM_WORLD,&size);
CommInterface interface;
OverlapDEC dec(procs);
+ dec.setWorkSharingAlgo(workSharingAlgo);
ProcessorGroup * grp = dec.getGroup();
MEDCouplingUMesh* meshS=0, *meshT=0;
ParaMESH* parameshS=0, *parameshT=0;
// As before, except than one of the source cell is removed, and that the field now has 2 components
prepareData2(rank, grp, ConservativeVolumic, meshS, meshT, parameshS, parameshT, parafieldS, parafieldT,
true, 2);
-// if (rank == 1)
+// if (rank == 0)
// {
// int i=1, j=0;
// while (i!=0)
CPPUNIT_ASSERT_EQUAL(8, resField->getNumberOfTuples());
for(int i=0;i<4;i++)
{
- CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,resField->getArray()->getIJ(i*2,0),1e-12);
- CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0,resField->getArray()->getIJ(i*2+1,0),1e-12);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0,resField->getArray()->getIJ(i,0),1e-12);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(10.0,resField->getArray()->getIJ(i,1),1e-12);
}
for(int i=4;i<8;i++)
{
- CPPUNIT_ASSERT_DOUBLES_EQUAL(4.0,resField->getArray()->getIJ(i*2,0),1e-12);
- CPPUNIT_ASSERT_DOUBLES_EQUAL(40.0,resField->getArray()->getIJ(i*2+1,0),1e-12);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(4.0,resField->getArray()->getIJ(i,0),1e-12);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(40.0,resField->getArray()->getIJ(i,1),1e-12);
}
}
if(rank==1)
CPPUNIT_ASSERT_EQUAL(12, resField->getNumberOfTuples());
for(int i=0;i<4;i++)
{
- CPPUNIT_ASSERT_DOUBLES_EQUAL(2.0,resField->getArray()->getIJ(i*2,0),1e-12);
- CPPUNIT_ASSERT_DOUBLES_EQUAL(20.0,resField->getArray()->getIJ(i*2+1,0),1e-12);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(2.0,resField->getArray()->getIJ(i,0),1e-12);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(20.0,resField->getArray()->getIJ(i,1),1e-12);
}
// Default value should be here:
for(int i=4;i<8;i++)
{
- CPPUNIT_ASSERT_DOUBLES_EQUAL(defVal,resField->getArray()->getIJ(i*2,0),1e-12);
- CPPUNIT_ASSERT_DOUBLES_EQUAL(defVal,resField->getArray()->getIJ(i*2+1,0),1e-12);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(defVal,resField->getArray()->getIJ(i,0),1e-12);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(defVal,resField->getArray()->getIJ(i,1),1e-12);
}
for(int i=8;i<12;i++)
{
- CPPUNIT_ASSERT_DOUBLES_EQUAL(5.0,resField->getArray()->getIJ(i*2,0),1e-12);
- CPPUNIT_ASSERT_DOUBLES_EQUAL(50.0,resField->getArray()->getIJ(i*2+1,0),1e-12);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(5.0,resField->getArray()->getIJ(i,0),1e-12);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(50.0,resField->getArray()->getIJ(i,1),1e-12);
}
}
delete parafieldS;
MPI_Barrier(MPI_COMM_WORLD);
}
+void ParaMEDMEMTest::testOverlapDEC4()
+{
+ testOverlapDEC_default_multi(0);
+}
+
+void ParaMEDMEMTest::testOverlapDEC4_bis()
+{
+ testOverlapDEC_default_multi(1);
+}
+
+void ParaMEDMEMTest::testOverlapDEC4_ter()
+{
+ testOverlapDEC_default_multi(2);
+}
+
+
