Allow MPICH compilation without adding -D.

diff --git a/src/ParaMEDMEM/BlockTopology.cxx b/src/ParaMEDMEM/BlockTopology.cxx
index dd9ed17afbad374728b1d9b0eed164b801086128..7a9407a1108c6eedc8c43e9ac39fc2564d1c3073 100644 (file)
--- a/src/ParaMEDMEM/BlockTopology.cxx
+++ b/src/ParaMEDMEM/BlockTopology.cxx
@@ -16,8 +16,8 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#include "MEDMEM_Grid.hxx"
 #include "CommInterface.hxx"
+#include "MEDMEM_Grid.hxx"
 #include "ProcessorGroup.hxx"
 #include "MPIProcessorGroup.hxx"
 #include "Topology.hxx"

diff --git a/src/ParaMEDMEM/ComponentTopology.hxx b/src/ParaMEDMEM/ComponentTopology.hxx
index f5e9416a08601099912b4046a8667e1d67f738a5..b92b780977e9ea3fd306a798734539f4d305f820 100644 (file)
--- a/src/ParaMEDMEM/ComponentTopology.hxx
+++ b/src/ParaMEDMEM/ComponentTopology.hxx
@@ -19,8 +19,8 @@
 #ifndef COMPONENTTOPOLOGY_HXX_
 #define COMPONENTTOPOLOGY_HXX_
 
-#include <vector>
 #include "ProcessorGroup.hxx"
+#include <vector>
 #include "Topology.hxx"
 
 

diff --git a/src/ParaMEDMEM/ExplicitCoincidentDEC.cxx b/src/ParaMEDMEM/ExplicitCoincidentDEC.cxx
index 9bf445f34dda307a61d9eb99dd60a4841f7775c6..29c331a9fbe2a490a0d911bc7a9b06b97d95261e 100644 (file)
--- a/src/ParaMEDMEM/ExplicitCoincidentDEC.cxx
+++ b/src/ParaMEDMEM/ExplicitCoincidentDEC.cxx
@@ -251,7 +251,7 @@ void ExplicitCoincidentDEC::broadcastTopology(const ExplicitTopology* toposend,
                        }
                }       
        }       
-       MESSAGE (" rank "<<group->myRank()<< " broadcastTopology is over");
+       MESSAGE_MED (" rank "<<group->myRank()<< " broadcastTopology is over");
 }
 
 void ExplicitCoincidentDEC::transferMappingToSource()
@@ -349,7 +349,7 @@ void ExplicitCoincidentDEC::recvData()
 {
        //MPI_COMM_WORLD is used instead of group because there is no
        //mechanism for creating the union group yet
-       MESSAGE("recvData");
+       MESSAGE_MED("recvData");
 
        
        cout<<"start AllToAll"<<endl;
@@ -382,7 +382,7 @@ void ExplicitCoincidentDEC::recvData()
 
 void ExplicitCoincidentDEC::sendData()
 {
-       MESSAGE ("sendData");
+       MESSAGE_MED ("sendData");
        for (int i=0; i< 4; i++)
                cout << _sendcounts[i]<<" ";
        cout <<endl;

diff --git a/src/ParaMEDMEM/ExplicitTopology.cxx b/src/ParaMEDMEM/ExplicitTopology.cxx
index 308f3ed92efff287fde92bfea5e6eb573d6629f3..e92d6b9c89f20a95d840e1fcee07e43fb9f17b79 100644 (file)
--- a/src/ParaMEDMEM/ExplicitTopology.cxx
+++ b/src/ParaMEDMEM/ExplicitTopology.cxx
@@ -16,9 +16,9 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include "CommInterface.hxx"
 #include "MEDMEM_Mesh.hxx"
 #include "MEDMEM_Support.hxx"
-#include "CommInterface.hxx"
 #include "ProcessorGroup.hxx"
 #include "MPIProcessorGroup.hxx"
 #include "ParaSUPPORT.hxx"

diff --git a/src/ParaMEDMEM/ICoCoMEDField.cxx b/src/ParaMEDMEM/ICoCoMEDField.cxx
index 801ee9d94d5af6a2686793b802083cf00fbe3680..da5ede4f8ee420a6b83eee3f8bc05577883b00d1 100644 (file)
--- a/src/ParaMEDMEM/ICoCoMEDField.cxx
+++ b/src/ParaMEDMEM/ICoCoMEDField.cxx
@@ -16,10 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include "ParaMESH.hxx"
 #include "ICoCoMEDField.hxx"
 #include "ICoCoTrioField.hxx"
 #include "ProcessorGroup.hxx"
-#include "ParaMESH.hxx"
 #include "UnstructuredParaSUPPORT.hxx"
 #include "ParaFIELD.hxx"
 #include "MEDMEM_Mesh.hxx"

diff --git a/src/ParaMEDMEM/LinearTimeInterpolator.hxx b/src/ParaMEDMEM/LinearTimeInterpolator.hxx
index c030cd8d46cb0b7d8d5d63e520705753be22cd4b..e143482ef28633d8dcaa26b60740e5f210448ef9 100644 (file)
--- a/src/ParaMEDMEM/LinearTimeInterpolator.hxx
+++ b/src/ParaMEDMEM/LinearTimeInterpolator.hxx
@@ -19,11 +19,10 @@
 #ifndef LINEARTIMEINTERPOLATOR_HXX_
 #define LINEARTIMEINTERPOLATOR_HXX_
 
+#include "TimeInterpolator.hxx"
 #include <map>
 #include <iostream>
 
-#include "TimeInterpolator.hxx"
-
 namespace ParaMEDMEM {
 
   class DEC;

diff --git a/src/ParaMEDMEM/MPI_Access.cxx b/src/ParaMEDMEM/MPI_Access.cxx
index 090370876bf666cbd652eae36d6cd0938dde33b6..48d9085a36ae1f80cf2c4db8d50067c8f068d4a4 100644 (file)
--- a/src/ParaMEDMEM/MPI_Access.cxx
+++ b/src/ParaMEDMEM/MPI_Access.cxx
@@ -16,9 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include "MPI_Access.hxx"
+
 #include <iostream>
 
-#include "MPI_Access.hxx"
 #include "MEDMEM_Exception.hxx"
 
 using namespace std;

diff --git a/src/ParaMEDMEM/MPI_Access.hxx b/src/ParaMEDMEM/MPI_Access.hxx
index 462f7307d027e29367e436dce90ba8751b39df23..be85461aea3a27b881f3b795924e69dc01ee6b91 100644 (file)
--- a/src/ParaMEDMEM/MPI_Access.hxx
+++ b/src/ParaMEDMEM/MPI_Access.hxx
@@ -26,6 +26,7 @@
 #include <map>
 #include <list>
 #include <vector>
+#include <iostream>
 
 namespace ParaMEDMEM
 {
@@ -187,9 +188,9 @@ class MPI_Access {
          struct RequestStruct *aRequestStruct = _MapOfRequestStruct[ RequestId ] ;
          if ( aRequestStruct ) {
            if ( _Trace )
-             cout << "MPI_Access::DeleteRequest" << _MyRank << "( " << RequestId << " ) "
+             std::cout << "MPI_Access::DeleteRequest" << _MyRank << "( " << RequestId << " ) "
                   << aRequestStruct << " MPIRequest " << aRequestStruct->MPIRequest
-                  << " MPIIsRecv " << aRequestStruct->MPIIsRecv << endl ;
+                       << " MPIIsRecv " << aRequestStruct->MPIIsRecv << std::endl ;
            if ( _MapOfRequestStruct[RequestId]->MPIRequest != MPI_REQUEST_NULL ) {
              Request_Free( &_MapOfRequestStruct[RequestId]->MPIRequest ) ;
            }
@@ -200,8 +201,8 @@ class MPI_Access {
          }
          else {
            if ( _Trace )
-             cout << "MPI_Access::DeleteRequest" << _MyRank << "( " << RequestId
-                  << " ) Request not found" << endl ;
+             std::cout << "MPI_Access::DeleteRequest" << _MyRank << "( " << RequestId
+                       << " ) Request not found" << std::endl ;
          }
   }
 // Delete all requests of the array ArrayOfSendRequests
@@ -350,8 +351,8 @@ class MPI_Access {
 // the corresponding target.
   inline void MPI_Access::DeleteSendRecvRequest( int RequestId ) {
          if ( _Trace )
-           cout << "MPI_Access::DeleteSendRecvRequest" << _MyRank
-                << "( " << RequestId << " ) " << endl ;
+           std::cout << "MPI_Access::DeleteSendRecvRequest" << _MyRank
+                     << "( " << RequestId << " ) " << std::endl ;
          if ( MPIIsRecv( RequestId ) ) {
            _RecvRequests[ MPITarget( RequestId ) ].remove( RequestId ) ;
          }

diff --git a/src/ParaMEDMEM/MPI_AccessDEC.hxx b/src/ParaMEDMEM/MPI_AccessDEC.hxx
index e2ae4674650f84401b6c9f9645b01eb2e4ef3d6f..84a7cabf2db594bbfabdb5bd3cf2c92676908359 100644 (file)
--- a/src/ParaMEDMEM/MPI_AccessDEC.hxx
+++ b/src/ParaMEDMEM/MPI_AccessDEC.hxx
@@ -19,13 +19,13 @@
 #ifndef MPI_ACESSDEC_HXX_
 #define MPI_ACESSDEC_HXX_
 
-#include <map>
-#include <iostream>
-
 #include "MPI_Access.hxx"
 #include "DEC.hxx"
 #include "LinearTimeInterpolator.hxx"
 
+#include <map>
+#include <iostream>
+
 namespace ParaMEDMEM {
 
        //  typedef enum{WithoutTimeInterp,LinearTimeInterp} TimeInterpolationMethod;

diff --git a/src/ParaMEDMEM/ParaFIELD.cxx b/src/ParaMEDMEM/ParaFIELD.cxx
index 354d7e8c49de3b598fc4c4ce1f8111dcc9b83ec9..0ad848230b398878735c6fed2af888fe42444781 100644 (file)
--- a/src/ParaMEDMEM/ParaFIELD.cxx
+++ b/src/ParaMEDMEM/ParaFIELD.cxx
@@ -16,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include "CommInterface.hxx"
 #include "MEDMEM_Exception.hxx"
 #include "Topology.hxx"
 #include "BlockTopology.hxx"
@@ -25,7 +26,6 @@
 #include "UnstructuredParaSUPPORT.hxx"
 #include "ExplicitCoincidentDEC.hxx"
 #include "StructuredCoincidentDEC.hxx"
-#include "CommInterface.hxx"
 #include "ProcessorGroup.hxx"
 #include "MPIProcessorGroup.hxx"
 #include "ParaFIELD.hxx"

diff --git a/src/ParaMEDMEM/ParaGRID.cxx b/src/ParaMEDMEM/ParaGRID.cxx
index e69281b70bf636700e2465a380f22639b61c4d92..e4d5ef558c6ea95505733d3e13ed62c561d41b00 100644 (file)
--- a/src/ParaMEDMEM/ParaGRID.cxx
+++ b/src/ParaMEDMEM/ParaGRID.cxx
@@ -16,11 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include "ParaGRID.hxx"
+
 #include <fstream>
 #include <vector>
 
-#include "ParaGRID.hxx"
-
 using namespace std;
 
 namespace ParaMEDMEM
@@ -77,7 +77,7 @@ void ParaGRID::write(MEDMEM::driverTypes driverType, const string& master_filena
 throw (MEDMEM::MEDEXCEPTION){
        
   const char* LOC = "ParaMEDMEM::ParaGRID::write()";
-  BEGIN_OF(LOC);
+  BEGIN_OF_MED(LOC);
         
        if (!_block_topology->getProcGroup()->containsMyRank()) return;
         
@@ -99,7 +99,7 @@ throw (MEDMEM::MEDEXCEPTION){
                
                strcpy(distfilename,suffix.str().c_str());
                filename[i]=string(distfilename);
-               MESSAGE("File name "<<string(distfilename));
+               MESSAGE_MED("File name "<<string(distfilename));
        }       
        
        //creation of the master file by proc 0 on ProgGroup    
@@ -117,10 +117,10 @@ throw (MEDMEM::MEDEXCEPTION){
                
        int id=_grid->addDriver(MEDMEM::MED_DRIVER,filename[myrank],_name);
                
-       MESSAGE("Start writing");
+       MESSAGE_MED("Start writing");
        _grid->write(id);
                        
-       END_OF("ParaMEDMEM::ParaGRID::write()");
+       END_OF_MED("ParaMEDMEM::ParaGRID::write()");
 };
 
        

diff --git a/src/ParaMEDMEM/ParaGRID.hxx b/src/ParaMEDMEM/ParaGRID.hxx
index ac51a3871732fa510fae3bb90bb94ded8d7bf81c..8cea5da07517504490e004b3bf6197151175dfef 100644 (file)
--- a/src/ParaMEDMEM/ParaGRID.hxx
+++ b/src/ParaMEDMEM/ParaGRID.hxx
@@ -19,6 +19,8 @@
 #ifndef PARAGRID_HXX_
 #define PARAGRID_HXX_
 
+#include "CommInterface.hxx"
+
 #include <vector>
 
 #include "MEDMEM_Exception.hxx"

diff --git a/src/ParaMEDMEM/ParaMESH.cxx b/src/ParaMEDMEM/ParaMESH.cxx
index 8e75bc2f7dae423b13ee71597764d4c8887309b1..379028215579848bea922dd89c64aa35bb531a07 100644 (file)
--- a/src/ParaMEDMEM/ParaMESH.cxx
+++ b/src/ParaMEDMEM/ParaMESH.cxx
@@ -16,10 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include "ParaMESH.hxx"
+
 #include <fstream>
 #include <vector>
 
-#include "ParaMESH.hxx"
 #include "ProcessorGroup.hxx"
 #include "MPIProcessorGroup.hxx"
 #include "Topology.hxx"
@@ -39,7 +40,7 @@ ParaMESH::ParaMESH(MEDMEM::driverTypes driver_type, const string& filename,
 throw (MEDMEM::MEDEXCEPTION) :_has_mesh_ownership(true) {
 
   const char* LOC = "MEDSPLITTER::MESHCollectionDriver::read()";
-  BEGIN_OF(LOC);
+  BEGIN_OF_MED(LOC);
   
  
   string meshstring;
@@ -49,7 +50,7 @@ throw (MEDMEM::MEDEXCEPTION) :_has_mesh_ownership(true) {
   
   // reading ascii master file
   try{
-       MESSAGE("Start reading");
+       MESSAGE_MED("Start reading");
     ifstream asciiinput(filename.c_str());
     char charbuffer[512];
     asciiinput.getline(charbuffer,512);
@@ -149,7 +150,7 @@ throw (MEDMEM::MEDEXCEPTION) :_has_mesh_ownership(true) {
        int ncell=_mesh->getNumberOfElements(MED_EN::MED_CELL,MED_EN::MED_ALL_ELEMENTS);
        int * array=new int[ncell];
        int offset=0;
-       MESSAGE("Reading cell global numbering for mesh "<< domain_id);
+       MESSAGE_MED("Reading cell global numbering for mesh "<< domain_id);
        MED_EN::MESH_ENTITIES::const_iterator currentEntity;
        list<MED_EN::medGeometryElement>::const_iterator iter;
        currentEntity  = MED_EN::meshEntities.find(MED_EN::MED_CELL);
@@ -167,14 +168,14 @@ throw (MEDMEM::MEDEXCEPTION) :_has_mesh_ownership(true) {
        }
        _cellglobal=array;
        
-       MESSAGE("Reading node global numbering");
+       MESSAGE_MED("Reading node global numbering");
        int nnode= _mesh->getNumberOfNodes();
        array=new int[nnode];
        med_2_3::MEDglobalNumLire(fid,meshname, array, nnode,
                        med_2_3::MED_NOEUD, med_2_3::MED_POINT1); 
        _nodeglobal=array;
        
-       MESSAGE("Reading face global numbering for mesh "<<domain_id);
+       MESSAGE_MED("Reading face global numbering for mesh "<<domain_id);
        int nbface=_mesh->getNumberOfElements(MED_EN::MED_FACE,MED_EN::MED_ALL_ELEMENTS);
        array=new int[nbface];
        currentEntity  = MED_EN::meshEntities.find(MED_EN::MED_FACE);
@@ -195,7 +196,7 @@ throw (MEDMEM::MEDEXCEPTION) :_has_mesh_ownership(true) {
        
     _block_topology=new BlockTopology(group,ncell); 
   
-     MESSAGE("end of read");
+     MESSAGE_MED("end of read");
       
   }//of try
   catch(...)
@@ -210,7 +211,7 @@ throw (MEDMEM::MEDEXCEPTION) :_has_mesh_ownership(true) {
   //   new ParallelTopology((m_collection->getMesh()),(m_collection->getCZ()),cellglobal,nodeglobal,faceglobal)
    // );
     
-    END_OF("MEDSPLITTER::MESHCollectionDriver::read()")
+    END_OF_MED("MEDSPLITTER::MESHCollectionDriver::read()")
 };
 
 /*! Constructor for creating a ParaMESH from a local mesh and
@@ -254,7 +255,7 @@ void ParaMESH::write(MEDMEM::driverTypes driverType, const string& master_filena
 throw (MEDMEM::MEDEXCEPTION){
        
   const char* LOC = "ParaMEDMEM::ParaMESH::write()";
-  BEGIN_OF(LOC);
+  BEGIN_OF_MED(LOC);
         
        if (!_block_topology->getProcGroup()->containsMyRank()) return;
         
@@ -275,13 +276,13 @@ throw (MEDMEM::MEDEXCEPTION){
                
                strcpy(distfilename,suffix.str().c_str());
                filename[i]=string(distfilename);
-               MESSAGE("File name "<<string(distfilename));
+               MESSAGE_MED("File name "<<string(distfilename));
        }       
        
        //creation of the master file by proc 0 on ProgGroup    
        if (myrank==0)
        {
-               MESSAGE("Master File Name "<<master_filename);
+               MESSAGE_MED("Master File Name "<<master_filename);
                ofstream file(master_filename.c_str());
                if (!file) throw (MEDEXCEPTION("Unable to create master file"));
                file <<"#MED Fichier V 2.3"<<" "<<endl;
@@ -297,10 +298,10 @@ throw (MEDMEM::MEDEXCEPTION){
                
        int id=_mesh->addDriver(MEDMEM::MED_DRIVER,filename[myrank],_name);
                
-       MESSAGE("Start writing");
+       MESSAGE_MED("Start writing");
        _mesh->write(id);
        _mesh->rmDriver(id);            
-       END_OF("ParaMEDMEM::ParaMESH::write()");
+       END_OF_MED("ParaMEDMEM::ParaMESH::write()");
 };
 
 const int* ParaMESH::getGlobalNumbering(const MED_EN::medEntityMesh entity)const

diff --git a/src/ParaMEDMEM/ParaMESH.hxx b/src/ParaMEDMEM/ParaMESH.hxx
index b64f5e9ad5649ebf7df4d3131ecf264033d48b58..2d425e2b1f57ab526baa24c619522a512847f1e9 100644 (file)
--- a/src/ParaMEDMEM/ParaMESH.hxx
+++ b/src/ParaMEDMEM/ParaMESH.hxx
@@ -18,6 +18,9 @@
 //
 #ifndef PARAMESH_HXX_
 #define PARAMESH_HXX_
+
+#include "CommInterface.hxx"
+
 #include <string>
 #include <vector>
 

diff --git a/src/ParaMEDMEM/ParaSUPPORT.cxx b/src/ParaMEDMEM/ParaSUPPORT.cxx
index 0d273a984a7232b4716344408add8448f685389b..cdf6385d93edad791e713524f11ea9c93c56a9aa 100644 (file)
--- a/src/ParaMEDMEM/ParaSUPPORT.cxx
+++ b/src/ParaMEDMEM/ParaSUPPORT.cxx
@@ -16,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include "ParaMESH.hxx"
 #include "ParaSUPPORT.hxx"
 #include "ParaMESH.hxx"
 #include "MEDMEM_Support.hxx"

diff --git a/src/ParaMEDMEM/ProcessorGroup.hxx b/src/ParaMEDMEM/ProcessorGroup.hxx
index 7e4c3bf379e9b2815e582764c210dfd86dad8a23..21164736354f19ee6ac093759d7b7679556b4664 100644 (file)
--- a/src/ParaMEDMEM/ProcessorGroup.hxx
+++ b/src/ParaMEDMEM/ProcessorGroup.hxx
@@ -18,9 +18,9 @@
 //
 #ifndef PROCESSORGROUP_HXX_
 #define PROCESSORGROUP_HXX_
-#include <set>
-#include "CommInterface.hxx"
 
+#include "CommInterface.hxx"
+#include <set>
 
 namespace ParaMEDMEM
 {

diff --git a/src/ParaMEDMEM/StructuredCoincidentDEC.cxx b/src/ParaMEDMEM/StructuredCoincidentDEC.cxx
index badb4798aac1d36e02f4da02bf2d308de890d323..f91d952235c961668f36d402e3c481f3b7b28009 100644 (file)
--- a/src/ParaMEDMEM/StructuredCoincidentDEC.cxx
+++ b/src/ParaMEDMEM/StructuredCoincidentDEC.cxx
@@ -273,11 +273,11 @@ void StructuredCoincidentDEC::broadcastTopology(BlockTopology*& topo, int tag)
        
        if (topo!=0 && topo->getProcGroup()->myRank()==0)
        {
-               MESSAGE ("Master rank");
+               MESSAGE_MED ("Master rank");
                topo->serialize(serializer, size);
                rank_master = group->translateRank(topo->getProcGroup(),0);
-               MESSAGE("Master rank world number is "<<rank_master);
-               MESSAGE("World Size is "<<group->size());
+               MESSAGE_MED("Master rank world number is "<<rank_master);
+               MESSAGE_MED("World Size is "<<group->size());
                for (int i=0; i< group->size(); i++)
                {
                        if (i!= rank_master)
@@ -286,9 +286,9 @@ void StructuredCoincidentDEC::broadcastTopology(BlockTopology*& topo, int tag)
        }
        else
        {
-               MESSAGE(" rank "<<group->myRank()<< " waiting ...");
+               MESSAGE_MED(" rank "<<group->myRank()<< " waiting ...");
                _comm_interface->recv(&rank_master, 1,MPI_INT, MPI_ANY_SOURCE, tag+group->myRank(), *(group->getComm()),&status);
-               MESSAGE(" rank "<<group->myRank()<< "received master rank"<<rank_master);
+               MESSAGE_MED(" rank "<<group->myRank()<< "received master rank"<<rank_master);
        }
        // The topology is broadcasted to all processsors in the group
        _comm_interface->broadcast(&size, 1,MPI_INT,rank_master,*(group->getComm()));
@@ -313,7 +313,7 @@ void StructuredCoincidentDEC::broadcastTopology(BlockTopology*& topo, int tag)
        delete[] buffer;
        if (serializer!=0)
                delete[] serializer;
-       MESSAGE (" rank "<<group->myRank()<< " unserialize is over");
+       MESSAGE_MED (" rank "<<group->myRank()<< " unserialize is over");
        delete group;
 }
 
@@ -323,7 +323,7 @@ void StructuredCoincidentDEC::recvData()
 {
        //MPI_COMM_WORLD is used instead of group because there is no
        //mechanism for creating the union group yet
-       MESSAGE("recvData");
+       MESSAGE_MED("recvData");
        for (int i=0; i< 4; i++)
                cout << _recvcounts[i]<<" ";
        cout <<endl;
@@ -365,7 +365,7 @@ void StructuredCoincidentDEC::recvData()
 
 void StructuredCoincidentDEC::sendData()
 {
-       MESSAGE ("sendData");
+       MESSAGE_MED("sendData");
        for (int i=0; i< 4; i++)
                cout << _sendcounts[i]<<" ";
        cout <<endl;

diff --git a/src/ParaMEDMEM/StructuredParaSUPPORT.cxx b/src/ParaMEDMEM/StructuredParaSUPPORT.cxx
index cc65857306786bf5a2e95f6456beb981b2b4e7b7..b3adf0660c5601aedcf9ef9387e17e3596f22ee3 100644 (file)
--- a/src/ParaMEDMEM/StructuredParaSUPPORT.cxx
+++ b/src/ParaMEDMEM/StructuredParaSUPPORT.cxx
@@ -16,10 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include "ParaMESH.hxx"
 #include "Topology.hxx"
 #include "BlockTopology.hxx"
 #include "ParaGRID.hxx"
-#include "ParaMESH.hxx"
 #include "StructuredParaSUPPORT.hxx"
 #include "MEDMEM_Support.hxx"
 

diff --git a/src/ParaMEDMEM/Test/MPIAccessDECTest.hxx b/src/ParaMEDMEM/Test/MPIAccessDECTest.hxx
index 889469975d939ae37741460a5f9f3eff40f8c267..fe1faf8e0ee6c354d2b32251866a4246751a7fa8 100644 (file)
--- a/src/ParaMEDMEM/Test/MPIAccessDECTest.hxx
+++ b/src/ParaMEDMEM/Test/MPIAccessDECTest.hxx
@@ -19,12 +19,13 @@
 #ifndef _MPIACCESSDECTEST_HXX_
 #define _MPIACCESSDECTEST_HXX_
 
+#include "mpi.h"
+
 #include <cppunit/extensions/HelperMacros.h>
 
 #include <set>
 #include <string>
 #include <iostream>
-#include "mpi.h"
 
 
 class MPIAccessDECTest : public CppUnit::TestFixture

diff --git a/src/ParaMEDMEM/Test/MPIAccessTest.hxx b/src/ParaMEDMEM/Test/MPIAccessTest.hxx
index 308e6d2af34ba2bebe94a2b4394eb9ab8c50fc93..5af9ad62939a8c4d3e6d8c5682bba612a90790c4 100644 (file)
--- a/src/ParaMEDMEM/Test/MPIAccessTest.hxx
+++ b/src/ParaMEDMEM/Test/MPIAccessTest.hxx
@@ -19,12 +19,12 @@
 #ifndef _MPIACCESSTEST_HXX_
 #define _MPIACCESSTEST_HXX_
 
+#include "mpi.h"
 #include <cppunit/extensions/HelperMacros.h>
 
 #include <set>
 #include <string>
 #include <iostream>
-#include "mpi.h"
 
 
 class MPIAccessTest : public CppUnit::TestFixture

diff --git a/src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx b/src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx
index 8a6bbfb4171f1f9f443e696fb3c4958920900d05..b9c7808d78f3930b428f70aa015910b02d35f5fb 100644 (file)
--- a/src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx
+++ b/src/ParaMEDMEM/Test/ParaMEDMEMTest.hxx
@@ -19,12 +19,12 @@
 #ifndef _ParaMEDMEMTEST_HXX_
 #define _ParaMEDMEMTEST_HXX_
 
+#include "mpi.h"
 #include <cppunit/extensions/HelperMacros.h>
 
 #include <set>
 #include <string>
 #include <iostream>
-#include "mpi.h"
 
 
 class ParaMEDMEMTest : public CppUnit::TestFixture

diff --git a/src/ParaMEDMEM/Test/test_AllToAllDEC.cxx b/src/ParaMEDMEM/Test/test_AllToAllDEC.cxx
index 2dfb5e6a6a0718c2b395ea335ea7981e2a35df3f..d752fb52b2e083a131cc92dd4f71edb2904f4ce6 100644 (file)
--- a/src/ParaMEDMEM/Test/test_AllToAllDEC.cxx
+++ b/src/ParaMEDMEM/Test/test_AllToAllDEC.cxx
@@ -16,11 +16,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
+
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 
 #include "MPIAccessDECTest.hxx"
 #include <cppunit/TestAssert.h>

diff --git a/src/ParaMEDMEM/Test/test_AllToAllTimeDEC.cxx b/src/ParaMEDMEM/Test/test_AllToAllTimeDEC.cxx
index d627a742ba845b7df12fd605d499dd7434eeaff4..feed0b26716331bc3993c83756a724b6b997ad41 100644 (file)
--- a/src/ParaMEDMEM/Test/test_AllToAllTimeDEC.cxx
+++ b/src/ParaMEDMEM/Test/test_AllToAllTimeDEC.cxx
@@ -16,11 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 
 #include "MPIAccessDECTest.hxx"
 #include <cppunit/TestAssert.h>

diff --git a/src/ParaMEDMEM/Test/test_AllToAllvDEC.cxx b/src/ParaMEDMEM/Test/test_AllToAllvDEC.cxx
index 5d792729f3aace54959860f22204d03089daf4b6..79dd264a7b34754a89581c541a839226b23202f3 100644 (file)
--- a/src/ParaMEDMEM/Test/test_AllToAllvDEC.cxx
+++ b/src/ParaMEDMEM/Test/test_AllToAllvDEC.cxx
@@ -16,11 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 
 #include "MPIAccessDECTest.hxx"
 #include <cppunit/TestAssert.h>

diff --git a/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx b/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx
index 0cb174abfaf3cd71f3512a94a9413f355eaddcb7..664188b26d543b981fe23f4f4ec847f596322a3d 100644 (file)
--- a/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx
+++ b/src/ParaMEDMEM/Test/test_AllToAllvTimeDEC.cxx
@@ -16,11 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 #include <time.h>
 
 #include "MPIAccessDECTest.hxx"

diff --git a/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx b/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx
index b15fea7187c0e521c5ead69b110b87302c63a138..3a3e6a6d22953369a25455f775725dfc7faae137 100644 (file)
--- a/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx
+++ b/src/ParaMEDMEM/Test/test_AllToAllvTimeDoubleDEC.cxx
@@ -16,12 +16,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <math.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 #include <time.h>
 
 #include "MPIAccessDECTest.hxx"

diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_Cancel.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_Cancel.cxx
index 81dd69e261b7ddea882315b05ce6157484cddd4f..8258870aa3d5cfc651963df7c6142201e2354fd3 100644 (file)
--- a/src/ParaMEDMEM/Test/test_MPI_Access_Cancel.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_Cancel.cxx
@@ -16,12 +16,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <time.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 
 #include "MPIAccessTest.hxx"
 #include <cppunit/TestAssert.h>

diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_ISend_IRecv.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_ISend_IRecv.cxx
index e1e7b2ab9fccf5aeb037eb30d1f70529c04e1102..c6826bddb49c902c943527421e9f30aa626f21f6 100644 (file)
--- a/src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_ISend_IRecv.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_ISend_IRecv.cxx
@@ -16,11 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 
 #include "MPIAccessTest.hxx"
 #include <cppunit/TestAssert.h>

diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_Send_Recv.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_Send_Recv.cxx
index 3c8879664853bf700c9ff8b8a048d1de8c739fb2..0ad203bc600d2cfb9ca7bf364c37968015e8beba 100644 (file)
--- a/src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_Send_Recv.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_Cyclic_Send_Recv.cxx
@@ -16,11 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 #include "MPIAccessTest.hxx"
 #include <cppunit/TestAssert.h>
 

diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_IProbe.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_IProbe.cxx
index 916f2b23d7e0f4ff22c2889b70aa27c212f95685..53abe7f5e2657c1a7d6fac360f968bd462bd577c 100644 (file)
--- a/src/ParaMEDMEM/Test/test_MPI_Access_IProbe.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_IProbe.cxx
@@ -16,12 +16,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <time.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 
 #include "MPIAccessTest.hxx"
 #include <cppunit/TestAssert.h>

diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_ISendRecv.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_ISendRecv.cxx
index 937baca97d02882e61d2fe8a53d797d373cec6c3..0af17e251b1fddf7fa919b988214bbc1d3334f3e 100644 (file)
--- a/src/ParaMEDMEM/Test/test_MPI_Access_ISendRecv.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_ISendRecv.cxx
@@ -16,11 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 
 #include "MPIAccessTest.hxx"
 #include <cppunit/TestAssert.h>

diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv.cxx
index 70d36f064f78888d818f19de78f00667629d3b66..58bdcd1c02928f795d8269c6d9e9997bae800dd5 100644 (file)
--- a/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv.cxx
@@ -16,11 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 
 #include "MPIAccessTest.hxx"
 #include <cppunit/TestAssert.h>

diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_BottleNeck.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_BottleNeck.cxx
index 40b149799dd446c5a920d2826500877bcb855e87..826c46411ecf6b00d05a1d678b350398c1a0d9d5 100644 (file)
--- a/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_BottleNeck.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_BottleNeck.cxx
@@ -16,12 +16,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <time.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 
 #include "MPIAccessTest.hxx"
 #include <cppunit/TestAssert.h>

diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length.cxx
index 9ed65cc88bd270fb241de84aa6acfe2ba8b9d91e..b611121007ba6a7885ad5b05ecd5288b8638846c 100644 (file)
--- a/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length.cxx
@@ -16,11 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 
 #include "MPIAccessTest.hxx"
 #include <cppunit/TestAssert.h>

diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length_1.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length_1.cxx
index 82379b265ecf5fe8fd5615f638aab5c84a944158..28c0e42f6664dbf89c8a1d99f174fcadd0f38096 100644 (file)
--- a/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length_1.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_ISend_IRecv_Length_1.cxx
@@ -16,11 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 
 #include "MPIAccessTest.hxx"
 #include <cppunit/TestAssert.h>

diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_Probe.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_Probe.cxx
index f630d6ec587d200dcc45991edbbefeb5e6785008..33ba472d4cf924fab9d3491eb933af6a87508349 100644 (file)
--- a/src/ParaMEDMEM/Test/test_MPI_Access_Probe.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_Probe.cxx
@@ -16,11 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 
 #include "MPIAccessTest.hxx"
 #include <cppunit/TestAssert.h>

diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_SendRecv.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_SendRecv.cxx
index d8d1290528a3a1c6a4896628ab9c43769359f310..f22f1e0000ea15aa509ec83ef35d960c318566c0 100644 (file)
--- a/src/ParaMEDMEM/Test/test_MPI_Access_SendRecv.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_SendRecv.cxx
@@ -16,11 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 
 #include "MPIAccessTest.hxx"
 #include <cppunit/TestAssert.h>

diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv.cxx
index 1f165a87f0aa50356e4fcfb2de3d8891092aa096..56c23a6bd67be9f035f20b347f2dbd37ef5ad899 100644 (file)
--- a/src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv.cxx
@@ -16,11 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 
 #include "MPIAccessTest.hxx"
 #include <cppunit/TestAssert.h>

diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv_Length.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv_Length.cxx
index a648d0a4b803bd03ee40eaf32c33d6b0049bce15..2e08c21f72174315b7c66951bbdcf1a908954277 100644 (file)
--- a/src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv_Length.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_Send_Recv_Length.cxx
@@ -16,11 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 
 #include "MPIAccessTest.hxx"
 #include <cppunit/TestAssert.h>

diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_Time.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_Time.cxx
index d550a48884fb194c700d643314eb1d5f7652a56b..5aed2b2e057edbe65743a2d1d39ec5d9c6d49599 100644 (file)
--- a/src/ParaMEDMEM/Test/test_MPI_Access_Time.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_Time.cxx
@@ -16,11 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 
 #include "MPIAccessTest.hxx"
 #include <cppunit/TestAssert.h>

diff --git a/src/ParaMEDMEM/Test/test_MPI_Access_Time_0.cxx b/src/ParaMEDMEM/Test/test_MPI_Access_Time_0.cxx
index bc578beaa17bc4d66c50cd4bc111fdc44bc9f479..aa8c3bb2ffbd7a925545b32b43fbf3b22ef2cfef 100644 (file)
--- a/src/ParaMEDMEM/Test/test_MPI_Access_Time_0.cxx
+++ b/src/ParaMEDMEM/Test/test_MPI_Access_Time_0.cxx
@@ -16,11 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include <mpi.h>
 #include <string>
 #include <vector>
 #include <map>
 #include <iostream>
-#include <mpi.h>
 
 #include "MPIAccessTest.hxx"
 #include <cppunit/TestAssert.h>

diff --git a/src/ParaMEDMEM/TimeInterpolator.hxx b/src/ParaMEDMEM/TimeInterpolator.hxx
index f853d80d0c7dc70c8cdfe03d0562a114615283d3..21fb2880d942e2b70a01929b39454fa9054603c2 100644 (file)
--- a/src/ParaMEDMEM/TimeInterpolator.hxx
+++ b/src/ParaMEDMEM/TimeInterpolator.hxx
@@ -19,11 +19,10 @@
 #ifndef TIMEINTERPOLATOR_HXX_
 #define TIMEINTERPOLATOR_HXX_
 
+#include "ProcessorGroup.hxx"
 #include <map>
 #include <iostream>
 
-#include "ProcessorGroup.hxx"
-
 namespace ParaMEDMEM {
 
   class TimeInterpolator {

diff --git a/src/ParaMEDMEM/UnstructuredParaSUPPORT.cxx b/src/ParaMEDMEM/UnstructuredParaSUPPORT.cxx
index 7aba162a0bf7f6093033305196704ff5f089ae0f..43e2dc8822a686a40f5ae5771502bafa66504564 100644 (file)
--- a/src/ParaMEDMEM/UnstructuredParaSUPPORT.cxx
+++ b/src/ParaMEDMEM/UnstructuredParaSUPPORT.cxx
@@ -16,10 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+#include "ParaMESH.hxx"
 #include "Topology.hxx"
 #include "ExplicitTopology.hxx"
 #include "BlockTopology.hxx"
-#include "ParaMESH.hxx"
 #include "UnstructuredParaSUPPORT.hxx"
 #include "MEDMEM_Support.hxx"