From 23d85454bcce63edba0b65d4375eb6fa34bac6d1 Mon Sep 17 00:00:00 2001
From: geay <anthony.geay@cea.fr>
Date: Fri, 6 Jun 2014 09:56:04 +0200
Subject: [PATCH] All trio tests ported. Ready to remove tioufied.h.

---
 src/ParaMEDMEMTest/CMakeLists.txt             |   2 +-
 src/ParaMEDMEMTest/ParaMEDMEMTest.hxx         |   4 +-
 src/ParaMEDMEMTest/ParaMEDMEMTest_ICoco.cxx   | 194 +++++++++++++
 .../ParaMEDMEMTest_ICocoTrio.cxx              | 271 ------------------
 4 files changed, 197 insertions(+), 274 deletions(-)
 create mode 100644 src/ParaMEDMEMTest/ParaMEDMEMTest_ICoco.cxx
 delete mode 100644 src/ParaMEDMEMTest/ParaMEDMEMTest_ICocoTrio.cxx

diff --git a/src/ParaMEDMEMTest/CMakeLists.txt b/src/ParaMEDMEMTest/CMakeLists.txt
index c8b7c6352..b8aee15c4 100644
--- a/src/ParaMEDMEMTest/CMakeLists.txt
+++ b/src/ParaMEDMEMTest/CMakeLists.txt
@@ -37,7 +37,7 @@ SET(ParaMEDMEMTest_SOURCES
   ParaMEDMEMTest_InterpKernelDEC.cxx
   ParaMEDMEMTest_StructuredCoincidentDEC.cxx
   ParaMEDMEMTest_MEDLoader.cxx
-  ParaMEDMEMTest_ICocoTrio.cxx
+  ParaMEDMEMTest_ICoco.cxx
   ParaMEDMEMTest_Gauthier1.cxx
   ParaMEDMEMTest_FabienAPI.cxx
   ParaMEDMEMTest_NonCoincidentDEC.cxx
diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx b/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx
index 6b8ac5036..15821ca59 100644
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx
+++ b/src/ParaMEDMEMTest/ParaMEDMEMTest.hxx
@@ -68,7 +68,7 @@ class ParaMEDMEMTest : public CppUnit::TestFixture
 #endif
   CPPUNIT_TEST(testStructuredCoincidentDEC);
   CPPUNIT_TEST(testStructuredCoincidentDEC);
-  CPPUNIT_TEST(testICocoTrio1);
+  CPPUNIT_TEST(testICoco1);
   CPPUNIT_TEST(testGauthier1);
   CPPUNIT_TEST(testGauthier2);
   CPPUNIT_TEST(testGauthier3);
@@ -123,7 +123,7 @@ public:
   void testAsynchronousSlowSourceInterpKernelDEC_2D();
   void testAsynchronousFastSourceInterpKernelDEC_2D();
   //
-  void testICocoTrio1();
+  void testICoco1();
   void testGauthier1();
   void testGauthier2();
   void testGauthier3();
diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_ICoco.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_ICoco.cxx
new file mode 100644
index 000000000..6e42c8416
--- /dev/null
+++ b/src/ParaMEDMEMTest/ParaMEDMEMTest_ICoco.cxx
@@ -0,0 +1,194 @@
+// Copyright (C) 2007-2014  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, 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#include "ParaMEDMEMTest.hxx"
+#include "CommInterface.hxx"
+#include "ProcessorGroup.hxx"
+#include "MPIProcessorGroup.hxx"
+#include "ComponentTopology.hxx"
+#include "ParaMESH.hxx"
+#include "ParaFIELD.hxx"
+#include "InterpKernelDEC.hxx"
+
+#include "MEDCouplingUMesh.hxx"
+
+#include <set>
+#include <string>
+#include <time.h>
+#include <iostream>
+#include <assert.h>
+
+using namespace std;
+using namespace ParaMEDMEM;
+using namespace ICoCo;
+
+typedef enum {sync_and,sync_or} synctype;
+void synchronize_bool(bool& stop, synctype s)
+{
+  int my_stop;
+  int my_stop_temp = stop?1:0;
+  if (s==sync_and)
+    MPI_Allreduce(&my_stop_temp,&my_stop,1,MPI_INTEGER,MPI_MIN,MPI_COMM_WORLD);
+  else if (s==sync_or)
+    MPI_Allreduce(&my_stop_temp,&my_stop,1,MPI_INTEGER,MPI_MAX,MPI_COMM_WORLD);
+  stop =(my_stop==1);
+}
+
+void synchronize_dt(double& dt)
+{
+  double dttemp=dt;
+  MPI_Allreduce(&dttemp,&dt,1,MPI_DOUBLE,MPI_MIN,MPI_COMM_WORLD);
+}
+
+
+void affiche(const ParaFIELD& field)
+{
+  cout <<field.getField()->getName()<<endl;
+  const double *vals(field.getField()->getArray()->begin());
+  for(int ele=0;ele<field.getField()->getNumberOfTuples();ele++)
+    cout << ele <<": "<< vals[ele] << endl;
+}
+
+MEDCouplingUMesh *init_quad()
+{
+  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> m(MEDCouplingUMesh::New("champ_quad",2));
+  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coo(DataArrayDouble::New());
+  const double dataCoo[24]={0.,0.,0.,1.,0.,0.,0.,0.,1.,1.,0.,1.,0.,1e-05,0.,1.,1e-05,0.,0.,1e-05,1.,1.,1e-05,1.};
+  coo->alloc(8,3);
+  std::copy(dataCoo,dataCoo+24,coo->getPointer());
+  const int conn[8]={0,1,3,2,4,5,7,6};
+  m->allocateCells(2);
+  m->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn);
+  m->insertNextCell(INTERP_KERNEL::NORM_QUAD4,4,conn+4);
+  m->setCoords(coo);
+  return m.retn();
+}
+
+MEDCouplingUMesh *init_triangle()
+{
+  MEDCouplingAutoRefCountObjectPtr<MEDCouplingUMesh> m(MEDCouplingUMesh::New("champ_triangle",2));
+  MEDCouplingAutoRefCountObjectPtr<DataArrayDouble> coo(DataArrayDouble::New());
+  const double dataCoo[24]={0.,0.,0.,1.,0.,0.,0.,0.,1.,1.,0.,1.,0.,1e-05,0.,1.,1e-05,0.,0.,1e-05,1.,1.,1e-05,1.};
+  coo->alloc(8,3);
+  std::copy(dataCoo,dataCoo+24,coo->getPointer());
+  const int conn[12]={0,1,2,1,2,3,4,5,7,4,6,7};
+  m->allocateCells(4);
+  for(int i=0;i<4;i++)
+    m->insertNextCell(INTERP_KERNEL::NORM_TRI3,3,conn+3*i);
+  m->setCoords(coo);
+  return m.retn();
+}
+
+void ParaMEDMEMTest::testICoco1()
+{
+  int size;
+  int rank;
+  MPI_Comm_size(MPI_COMM_WORLD,&size);
+  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
+
+  //the test is meant to run on five processors
+  if (size !=2) return ;
+  
+  CommInterface comm;
+  set<int> emetteur_ids;
+  set<int> recepteur_ids;
+  emetteur_ids.insert(0);
+  recepteur_ids.insert(1);
+
+  MPIProcessorGroup recepteur_group(comm,recepteur_ids);
+  MPIProcessorGroup emetteur_group(comm,emetteur_ids);
+
+  string cas;
+  if (recepteur_group.containsMyRank())
+    cas="recepteur";
+  else
+    cas="emetteur";
+
+  InterpKernelDEC dec_emetteur(emetteur_group,recepteur_group);
+  dec_emetteur.setOrientation(2);
+  ParaMEDMEM::ParaFIELD *champ_emetteur(0),*champ_recepteur(0);
+  ParaMEDMEM::ParaMESH *paramesh(0);
+  if (cas=="emetteur") 
+    {
+      MEDCouplingAutoRefCountObjectPtr<ParaMEDMEM::MEDCouplingUMesh> mesh_emetteur(init_triangle());
+      paramesh=new ParaMEDMEM::ParaMESH(mesh_emetteur,emetteur_group,"emetteur mesh");
+      ParaMEDMEM::ComponentTopology comptopo;
+      champ_emetteur=new ParaMEDMEM::ParaFIELD(ON_CELLS,ONE_TIME,paramesh,comptopo);
+      champ_emetteur->getField()->setNature(ConservativeVolumic);
+      champ_emetteur->setOwnSupport(true);
+      champ_emetteur->getField()->getArray()->fillWithValue(1.);
+    }
+  else
+    {
+      MEDCouplingAutoRefCountObjectPtr<ParaMEDMEM::MEDCouplingUMesh> mesh_recepteur(init_quad());
+      paramesh=new ParaMEDMEM::ParaMESH(mesh_recepteur,recepteur_group,"recepteur mesh");
+      ParaMEDMEM::ComponentTopology comptopo;
+      champ_recepteur=new ParaMEDMEM::ParaFIELD(ON_CELLS,ONE_TIME,paramesh,comptopo);
+      champ_recepteur->getField()->setNature(ConservativeVolumic);
+      champ_recepteur->setOwnSupport(true);
+    }
+  
+  
+  MPI_Barrier(MPI_COMM_WORLD);
+
+  clock_t clock0(clock());
+  int compti=0;
+
+  bool init(true),stop(false);
+  //boucle sur les pas de quads
+  while(!stop)
+    {
+      compti++;
+      clock_t clocki= clock ();
+      cout << compti << " CLOCK " << (clocki-clock0)*1.e-6 << endl; 
+      for (int non_unif=0;non_unif<2;non_unif++)
+        {
+          if (cas=="emetteur") 
+            if (non_unif)
+              champ_emetteur->getField()->getArray()->setIJ(0,0,40.);
+          //bool ok=false; // Is the time interval successfully solved ?
+    
+          // Loop on the time interval tries
+          if (cas=="emetteur")
+            dec_emetteur.attachLocalField(champ_emetteur);
+          else
+            dec_emetteur.attachLocalField(champ_recepteur);
+            
+          if(init)
+            dec_emetteur.synchronize();
+          init=false;
+            
+          if (cas=="emetteur")
+            {
+              dec_emetteur.sendData();
+              affiche(*champ_emetteur);
+            }
+          else if (cas=="recepteur")
+            {
+              dec_emetteur.recvData();
+              affiche(*champ_recepteur);
+            }
+          else
+            throw 0;
+        }
+      stop=true;
+    }
+  delete champ_recepteur;
+  delete champ_emetteur;
+}
diff --git a/src/ParaMEDMEMTest/ParaMEDMEMTest_ICocoTrio.cxx b/src/ParaMEDMEMTest/ParaMEDMEMTest_ICocoTrio.cxx
deleted file mode 100644
index fc334c77e..000000000
--- a/src/ParaMEDMEMTest/ParaMEDMEMTest_ICocoTrio.cxx
+++ /dev/null
@@ -1,271 +0,0 @@
-// Copyright (C) 2007-2014  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, 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
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public
-// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-#include "ParaMEDMEMTest.hxx"
-#include <string>
-#include "CommInterface.hxx"
-#include "ProcessorGroup.hxx"
-#include "MPIProcessorGroup.hxx"
-#include "DEC.hxx"
-#include "InterpKernelDEC.hxx"
-#include <set>
-#include <time.h>
-#include "ICoCoTrioField.hxx"
-#include <iostream>
-#include <assert.h>
-
-using namespace std;
-using namespace ParaMEDMEM;
-using namespace ICoCo;
-
-typedef enum {sync_and,sync_or} synctype;
-void synchronize_bool(bool& stop, synctype s)
-{
-  int my_stop;
-  int my_stop_temp = stop?1:0;
-  if (s==sync_and)
-    MPI_Allreduce(&my_stop_temp,&my_stop,1,MPI_INTEGER,MPI_MIN,MPI_COMM_WORLD);
-  else if (s==sync_or)
-    MPI_Allreduce(&my_stop_temp,&my_stop,1,MPI_INTEGER,MPI_MAX,MPI_COMM_WORLD);
-  stop =(my_stop==1);
-}
-
-void synchronize_dt(double& dt)
-{
-  double dttemp=dt;
-  MPI_Allreduce(&dttemp,&dt,1,MPI_DOUBLE,MPI_MIN,MPI_COMM_WORLD);
-}
-
-
-void affiche( const TrioField&   field)
-{
-  cout <<field.getName()<<endl;
-  for (int ele=0;ele<field._nb_elems;ele++)
-    cout <<ele <<": "<<field._field[ele]<<endl;;
-  
-}
-
-void remplit_coord(double* coords)
-{
-  coords[0*3+0]=0.;
-  coords[0*3+1]=0.;
-  coords[0*3+2]=0.;
-  
-  coords[1*3+0]=1.;
-  coords[1*3+1]=0.;
-  coords[1*3+2]=0.;
-  
-    
-  coords[2*3+0]=0.;
-  coords[2*3+1]=0.;
-  coords[2*3+2]=1.;
-  
-  coords[3*3+0]=1.;
-  coords[3*3+1]=0.;
-  coords[3*3+2]=1.;
-  
-  for (int i=4;i<8;i++)
-    {
-      for (int d=0;d<3;d++)
-        coords[i*3+d]=coords[(i-4)*3+d];
-      coords[i*3+1]+=1e-5;
-    }
-
-}
-
-void init_quad(TrioField& champ_quad)
-{
-  
-  champ_quad.setName("champ_quad");
-  champ_quad._space_dim=3;
-  champ_quad._mesh_dim=2;
-  champ_quad._nbnodes=8;
-  champ_quad._nodes_per_elem=4;
-  champ_quad._nb_elems=2;
-  champ_quad._itnumber=0;
-  champ_quad._time1=0;
-  champ_quad._time2=1;
-  champ_quad._nb_field_components=1;
-  
-  champ_quad._coords=new double[champ_quad._nbnodes*champ_quad._space_dim];
-  //memcpy(afield._coords,sommets.addr(),champ_quad._nbnodes*champ_quad._space_dim*sizeof(double));
-  
-  remplit_coord(champ_quad._coords);
-  
-  
-  champ_quad._connectivity=new int[champ_quad._nb_elems*champ_quad._nodes_per_elem];
-  champ_quad._connectivity[0*champ_quad._nodes_per_elem+0]=0;
-  champ_quad._connectivity[0*champ_quad._nodes_per_elem+1]=1;
-  champ_quad._connectivity[0*champ_quad._nodes_per_elem+2]=3;
-  champ_quad._connectivity[0*champ_quad._nodes_per_elem+3]=2;
-  champ_quad._connectivity[1*champ_quad._nodes_per_elem+0]=4;
-  champ_quad._connectivity[1*champ_quad._nodes_per_elem+1]=5;
-  champ_quad._connectivity[1*champ_quad._nodes_per_elem+2]=7;
-  champ_quad._connectivity[1*champ_quad._nodes_per_elem+3]=6;
-  
-  
-  champ_quad._has_field_ownership=false;
-  champ_quad._field=0;
-  //champ_quad._field=new double[champ_quad._nb_elems];
-  //  assert(champ_quad._nb_field_components==1);
-}
-void init_triangle(TrioField& champ_triangle)
-{
-   
-  champ_triangle.setName("champ_triangle");
-  champ_triangle._space_dim=3;
-  champ_triangle._mesh_dim=2;
-  champ_triangle._nbnodes=8;
-  champ_triangle._nodes_per_elem=3;
-  champ_triangle._nb_elems=4;
-  champ_triangle._itnumber=0;
-  champ_triangle._time1=0;
-  champ_triangle._time2=1;
-  champ_triangle._nb_field_components=1;
-    
-  champ_triangle._coords=new double[champ_triangle._nbnodes*champ_triangle._space_dim];
-  //memcpy(afield._coords,sommets.addr(),champ_triangle._nbnodes*champ_triangle._space_dim*sizeof(double));
-  remplit_coord(champ_triangle._coords);
-
-  champ_triangle._connectivity=new int[champ_triangle._nb_elems*champ_triangle._nodes_per_elem];
-  champ_triangle._connectivity[0*champ_triangle._nodes_per_elem+0]=0;
-  champ_triangle._connectivity[0*champ_triangle._nodes_per_elem+1]=1;
-  champ_triangle._connectivity[0*champ_triangle._nodes_per_elem+2]=2;
-  champ_triangle._connectivity[1*champ_triangle._nodes_per_elem+0]=1;
-  champ_triangle._connectivity[1*champ_triangle._nodes_per_elem+1]=3;
-  champ_triangle._connectivity[1*champ_triangle._nodes_per_elem+2]=2;
-  
-  champ_triangle._connectivity[2*champ_triangle._nodes_per_elem+0]=4;
-  champ_triangle._connectivity[2*champ_triangle._nodes_per_elem+1]=5;
-  champ_triangle._connectivity[2*champ_triangle._nodes_per_elem+2]=7;
-  champ_triangle._connectivity[3*champ_triangle._nodes_per_elem+0]=4;
-  champ_triangle._connectivity[3*champ_triangle._nodes_per_elem+1]=7;
-  champ_triangle._connectivity[3*champ_triangle._nodes_per_elem+2]=6;
-  
-  champ_triangle._has_field_ownership=false;
-  // champ_triangle._field=new double[champ_triangle._nb_elems];
-  champ_triangle._field=0;
-}
-
-void ParaMEDMEMTest::testICocoTrio1()
-{
-  int size;
-  int rank;
-  MPI_Comm_size(MPI_COMM_WORLD,&size);
-  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-
-  //the test is meant to run on five processors
-  if (size !=2) return ;
-  
-  CommInterface comm;
-  set<int> emetteur_ids;
-  set<int> recepteur_ids;
-  emetteur_ids.insert(0);
-  recepteur_ids.insert(1);
-
-  MPIProcessorGroup recepteur_group(comm,recepteur_ids);
-  MPIProcessorGroup emetteur_group(comm,emetteur_ids);
-
-
-  string cas;
-  if (recepteur_group.containsMyRank())
-    {
-      cas="recepteur";
-      
-    }
-  else
-    cas="emetteur";
-
-  InterpKernelDEC dec_emetteur(emetteur_group, recepteur_group);
-
-  TrioField champ_emetteur, champ_recepteur;
-   
-  init_triangle(champ_emetteur);
-  //init_triangle(champ_emetteur);
-  init_quad(champ_recepteur);
-  //init_emetteur(champ_recepteur);
-  
-  if (cas=="emetteur") 
-    {
-      champ_emetteur._field=new double[champ_emetteur._nb_elems];
-      for (int ele=0;ele<champ_emetteur._nb_elems;ele++)
-        champ_emetteur._field[ele]=1;
-      
-      champ_emetteur._has_field_ownership=true;
-    }
-  
-  
-  MPI_Barrier(MPI_COMM_WORLD);
-
-  clock_t clock0= clock ();
-  int compti=0;
-
-  bool init=true; // first time step ??
-  bool stop=false;
-  //boucle sur les pas de quads
-  while (!stop) {
-  
-    compti++;
-    clock_t clocki= clock ();
-    cout << compti << " CLOCK " << (clocki-clock0)*1.e-6 << endl; 
-    for (int non_unif=0;non_unif<2;non_unif++)
-      {
-        // if (champ_recepteur._field)
-        //   delete [] champ_recepteur._field;
-        champ_recepteur._field=0;
-        // champ_recepteur._has_field_ownership=false;
-  
-
-  
-        if (cas=="emetteur") 
-          if (non_unif)
-            champ_emetteur._field[0]=40;
-        //bool ok=false; // Is the time interval successfully solved ?
-    
-        // Loop on the time interval tries
-        if(1)
-          {
-            if (cas=="emetteur")
-              dec_emetteur.attachLocalField((ICoCo::Field*) &champ_emetteur);
-            else
-              dec_emetteur.attachLocalField((ICoCo::Field*) &champ_recepteur);
-            
-            dec_emetteur.setNature(ConservativeVolumic);
-            
-            if(init)
-              dec_emetteur.synchronize();
-            init=false;
-            
-            if (cas=="emetteur")
-              {
-                dec_emetteur.sendData();
-                affiche(champ_emetteur);
-              }
-            else if (cas=="recepteur")
-              {
-                dec_emetteur.recvData();
-                affiche(champ_recepteur);
-              }
-            else
-              throw 0;
-          }
-        stop=true;
-      }
-  }
-}
-- 
2.39.2