MEDMEM Industrialization 2008

diff --git a/src/ParaMEDMEM/ParaFIELD.cxx b/src/ParaMEDMEM/ParaFIELD.cxx
index 94450a82fce9a673ec2518e92216d1cf618d50d8..86e45f030e0cc91173e0c55e0dbfbbebe773276c 100644 (file)
--- a/src/ParaMEDMEM/ParaFIELD.cxx
+++ b/src/ParaMEDMEM/ParaFIELD.cxx
@@ -143,7 +143,8 @@ attached and it therefore recreates one. It therefore takes ownership over _supp
 ParaFIELD::ParaFIELD(MEDMEM::FIELD<double>* subdomain_field, const ProcessorGroup& proc_group):
 _field(subdomain_field),
 _support(new UnstructuredParaSUPPORT(subdomain_field->getSupport(), proc_group)),
-_component_topology(ComponentTopology(_field->getNumberOfComponents())),
+_component_topology(_field->getNumberOfComponents()),
+// _component_topology(ComponentTopology(_field->getNumberOfComponents())),
 _has_field_ownership(false),
 _has_support_ownership(true)
 {

diff --git a/src/ParaMEDMEM/ParaFIELD.hxx b/src/ParaMEDMEM/ParaFIELD.hxx
index 2fcd5356bbcef0e848019bd34d967af94fab2d40..7141e51b8d337514b5b2a77d836c366e0a1ea605 100644 (file)
--- a/src/ParaMEDMEM/ParaFIELD.hxx
+++ b/src/ParaMEDMEM/ParaFIELD.hxx
@@ -42,7 +42,8 @@ public:
 private:
        MEDMEM::FIELD<double>* getSupportVolumes(const MEDMEM::SUPPORT& support) const;
        MEDMEM::FIELD<double>* _field;
-       const  ParaMEDMEM::ComponentTopology& _component_topology;
+       ParaMEDMEM::ComponentTopology _component_topology;
+//     const  ParaMEDMEM::ComponentTopology& _component_topology;
         ParaMEDMEM::Topology* _topology; 
 
        const  ParaMEDMEM::ParaSUPPORT* _support;

diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx
index 4972bd510109624c94ee2e6d383ff27ed18cd099..91dc11521d351624e0ed59c0a41153f77bf2d0a2 100644 (file)
--- a/src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx
+++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx
@@ -32,40 +32,40 @@
 class ParaMEDMEMTest : public CppUnit::TestFixture
 {
   CPPUNIT_TEST_SUITE( ParaMEDMEMTest );
-  CPPUNIT_TEST(testMPIProcessorGroup_constructor);
-  CPPUNIT_TEST(testMPIProcessorGroup_boolean);
-  CPPUNIT_TEST(testMPIProcessorGroup_rank);
-  CPPUNIT_TEST(testBlockTopology_constructor);
-  CPPUNIT_TEST(testBlockTopology_serialize);
-  CPPUNIT_TEST(testIntersectionDEC_2D);
-  CPPUNIT_TEST(testIntersectionDEC_2D_P0P1);
-  CPPUNIT_TEST(testIntersectionDEC_2D_P1P0);
-  CPPUNIT_TEST(testIntersectionDEC_2D_P1dP0);
-
-  CPPUNIT_TEST(testIntersectionDEC_3D);
-  CPPUNIT_TEST(testIntersectionDEC_3D_P0P1);
-  CPPUNIT_TEST(testIntersectionDEC_3D_P1P0);
-  CPPUNIT_TEST(testIntersectionDEC_3D_P1dP0);
-
-       CPPUNIT_TEST(testSynchronousEqualIntersectionWithoutInterpNativeDEC_2D);
-       CPPUNIT_TEST(testSynchronousEqualIntersectionWithoutInterpDEC_2D);
-       CPPUNIT_TEST(testSynchronousEqualIntersectionDEC_2D);
-       CPPUNIT_TEST(testSynchronousFasterSourceIntersectionDEC_2D);
-       CPPUNIT_TEST(testSynchronousSlowerSourceIntersectionDEC_2D);
-       CPPUNIT_TEST(testSynchronousSlowSourceIntersectionDEC_2D);
-       CPPUNIT_TEST(testSynchronousFastSourceIntersectionDEC_2D);
-  CPPUNIT_TEST(testAsynchronousEqualIntersectionDEC_2D);
-       CPPUNIT_TEST(testAsynchronousFasterSourceIntersectionDEC_2D);
-       CPPUNIT_TEST(testAsynchronousSlowerSourceIntersectionDEC_2D);
-       CPPUNIT_TEST(testAsynchronousSlowSourceIntersectionDEC_2D);
-       CPPUNIT_TEST(testAsynchronousFastSourceIntersectionDEC_2D);
-#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);
-  CPPUNIT_TEST(testAsynchronousEqualIntersectionDEC_2D_P0P1);
+//   CPPUNIT_TEST(testMPIProcessorGroup_constructor);
+//   CPPUNIT_TEST(testMPIProcessorGroup_boolean);
+//   CPPUNIT_TEST(testMPIProcessorGroup_rank);
+//   CPPUNIT_TEST(testBlockTopology_constructor);
+//   CPPUNIT_TEST(testBlockTopology_serialize);
+//   CPPUNIT_TEST(testIntersectionDEC_2D);
+//   CPPUNIT_TEST(testIntersectionDEC_2D_P0P1);
+//   CPPUNIT_TEST(testIntersectionDEC_2D_P1P0);
+//   CPPUNIT_TEST(testIntersectionDEC_2D_P1dP0);
+
+//   CPPUNIT_TEST(testIntersectionDEC_3D);
+//   CPPUNIT_TEST(testIntersectionDEC_3D_P0P1);
+//   CPPUNIT_TEST(testIntersectionDEC_3D_P1P0);
+//   CPPUNIT_TEST(testIntersectionDEC_3D_P1dP0);
+
+//     CPPUNIT_TEST(testSynchronousEqualIntersectionWithoutInterpNativeDEC_2D);
+//     CPPUNIT_TEST(testSynchronousEqualIntersectionWithoutInterpDEC_2D);
+//     CPPUNIT_TEST(testSynchronousEqualIntersectionDEC_2D);
+//     CPPUNIT_TEST(testSynchronousFasterSourceIntersectionDEC_2D);
+//     CPPUNIT_TEST(testSynchronousSlowerSourceIntersectionDEC_2D);
+//     CPPUNIT_TEST(testSynchronousSlowSourceIntersectionDEC_2D);
+//     CPPUNIT_TEST(testSynchronousFastSourceIntersectionDEC_2D);
+//   CPPUNIT_TEST(testAsynchronousEqualIntersectionDEC_2D);
+//     CPPUNIT_TEST(testAsynchronousFasterSourceIntersectionDEC_2D);
+//     CPPUNIT_TEST(testAsynchronousSlowerSourceIntersectionDEC_2D);
+//     CPPUNIT_TEST(testAsynchronousSlowSourceIntersectionDEC_2D);
+//     CPPUNIT_TEST(testAsynchronousFastSourceIntersectionDEC_2D);
+// #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);
+//   CPPUNIT_TEST(testAsynchronousEqualIntersectionDEC_2D_P0P1);
   CPPUNIT_TEST(testAsynchronousFasterSourceIntersectionDEC_2D_P1P0);
   CPPUNIT_TEST(testAsynchronousSlowerSourceIntersectionDEC_2D_P1dP0);
   CPPUNIT_TEST_SUITE_END();

diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx
index 75bc9cbb42a1983d68a60739b0c8ea396e77a62a..fd4cf270e9ede9fed19e0e7c8fee7edeb5ea7bbc 100644 (file)
--- a/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx
+++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest_IntersectionDEC.cxx
@@ -602,15 +602,15 @@ void ParaMEDMEMTest::testAsynchronousFastSourceIntersectionDEC_2D()
 }
 void ParaMEDMEMTest::testAsynchronousEqualIntersectionDEC_2D_P0P1()
 {
-  //testAsynchronousIntersectionDEC_2D(0.1,1,0.1,1,true,true,true, "P0","P1");
+  testAsynchronousIntersectionDEC_2D(0.1,1,0.1,1,true,true,true, "P0","P1");
 }
 void ParaMEDMEMTest::testAsynchronousFasterSourceIntersectionDEC_2D_P1P0()
 {
-  //testAsynchronousIntersectionDEC_2D(0.09,1,0.1,1,true,true,true, "P1","P0");
+  testAsynchronousIntersectionDEC_2D(0.09,1,0.1,1,true,true,true, "P1","P0");
 }
 void ParaMEDMEMTest::testAsynchronousSlowerSourceIntersectionDEC_2D_P1dP0()
 {
-  //testAsynchronousIntersectionDEC_2D(0.11,1,0.1,1,true,true,true, "P1d","P0");
+  testAsynchronousIntersectionDEC_2D(0.11,1,0.1,1,true,true,true, "P1d","P0");
 }
 
 /*!
@@ -660,7 +660,7 @@ void ParaMEDMEMTest::testAsynchronousIntersectionDEC_2D(double dtA, double tmaxA
 //  MEDMEM::FIELD<double>* field;
   ParaMEDMEM::ParaMESH* paramesh;
   ParaMEDMEM::ParaFIELD* parafield;
-  ParaMEDMEM::ParaSUPPORT* parasupport ;
+  ParaMEDMEM::ParaSUPPORT* parasupport = 0;
   
   double * value ;
   ICoCo::Field* icocofield ;
@@ -787,6 +787,8 @@ void ParaMEDMEMTest::testAsynchronousIntersectionDEC_2D(double dtA, double tmaxA
         }
         double* value = const_cast<double*> (parafield->getField()->getValue());
         int nb_local=parafield->getField()->getSupport()->getNumberOfElements(MED_EN::MED_ALL_ELEMENTS);
+        if ( srcMethod == "P1d" )
+          nb_local *= support->getTypes()[0] % 100;
         for (int i=0; i<nb_local;i++)
           value[i]= time+dtA;
       }
@@ -818,8 +820,9 @@ void ParaMEDMEMTest::testAsynchronousIntersectionDEC_2D(double dtA, double tmaxA
         cout << "testAsynchronousIntersectionDEC_2D" << rank << " time " << time
              << " VolumeIntegral " << vi
              << " time*10000 " << time*10000 << endl ;
-        
-        CPPUNIT_ASSERT_DOUBLES_EQUAL(vi,time*10000,0.001);
+
+        if ( support->getEntity() != MED_EN::MED_NODE ) // getVolumeIntegral() is not defined on nodes
+          CPPUNIT_ASSERT_DOUBLES_EQUAL(vi,time*10000,0.001);
       }
       
     }
@@ -830,7 +833,7 @@ void ParaMEDMEMTest::testAsynchronousIntersectionDEC_2D(double dtA, double tmaxA
   delete mesh ;
   delete paramesh ;
   delete parafield ;
-  delete parasupport ;
+  //delete parasupport ;
   delete [] value ;
   delete icocofield ;
   delete support ;