From: ageay <ageay>
Date: Mon, 8 Dec 2008 17:01:57 +0000 (+0000)
Subject: Allow MPICH compilation without adding -D.
X-Git-Tag: ONERALIV081208
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ed99c543bb5a4ac7231e030099d51cb7e5958bcb;p=tools%2Fmedcoupling.git

Allow MPICH compilation without adding -D.
---

diff --git a/src/ParaMEDMEM/BlockTopology.cxx b/src/ParaMEDMEM/BlockTopology.cxx
index dd9ed17af..7a9407a11 100644
--- 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 f5e9416a0..b92b78097 100644
--- 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 9bf445f34..29c331a9f 100644
--- 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 308f3ed92..e92d6b9c8 100644
--- 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 801ee9d94..da5ede4f8 100644
--- 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 c030cd8d4..e143482ef 100644
--- 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 090370876..48d9085a3 100644
--- 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 462f7307d..be85461ae 100644
--- 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 e2ae46746..84a7cabf2 100644
--- 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 354d7e8c4..0ad848230 100644
--- 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 e69281b70..e4d5ef558 100644
--- 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 ac51a3871..8cea5da07 100644
--- 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 8e75bc2f7..379028215 100644
--- 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 b64f5e9ad..2d425e2b1 100644
--- 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 0d273a984..cdf6385d9 100644
--- 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 7e4c3bf37..211647363 100644
--- 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 badb4798a..f91d95223 100644
--- 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 cc6585730..b3adf0660 100644
--- 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 889469975..fe1faf8e0 100644
--- 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 308e6d2af..5af9ad629 100644
--- 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 8a6bbfb41..b9c7808d7 100644
--- 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 2dfb5e6a6..d752fb52b 100644
--- 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 d627a742b..feed0b267 100644
--- 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 5d792729f..79dd264a7 100644
--- 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 0cb174abf..664188b26 100644
--- 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 b15fea718..3a3e6a6d2 100644
--- 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 81dd69e26..8258870aa 100644
--- 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 e1e7b2ab9..c6826bddb 100644
--- 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 3c8879664..0ad203bc6 100644
--- 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 916f2b23d..53abe7f5e 100644
--- 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 937baca97..0af17e251 100644
--- 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 70d36f064..58bdcd1c0 100644
--- 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 40b149799..826c46411 100644
--- 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 9ed65cc88..b61112100 100644
--- 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 82379b265..28c0e42f6 100644
--- 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 f630d6ec5..33ba472d4 100644
--- 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 d8d129052..f22f1e000 100644
--- 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 1f165a87f..56c23a6bd 100644
--- 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 a648d0a4b..2e08c21f7 100644
--- 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 d550a4888..5aed2b2e0 100644
--- 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 bc578beaa..aa8c3bb2f 100644
--- 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 f853d80d0..21fb2880d 100644
--- 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 7aba162a0..43e2dc882 100644
--- 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"