From: vbd <vbd>
Date: Fri, 2 Feb 2007 08:31:59 +0000 (+0000)
Subject: improvement of base classes
X-Git-Tag: trio_trio_coupling~108
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e955d5a8e8c09e366c5f1ea717f24f64d6b07ac6;p=tools%2Fmedcoupling.git

improvement of base classes
---

diff --git a/src/ParaMEDMEM/ExplicitCoincidentDEC.cxx b/src/ParaMEDMEM/ExplicitCoincidentDEC.cxx
index c1f2bb7cc..aa9309029 100644
--- a/src/ParaMEDMEM/ExplicitCoincidentDEC.cxx
+++ b/src/ParaMEDMEM/ExplicitCoincidentDEC.cxx
@@ -190,16 +190,16 @@ void ExplicitCoincidentDEC::broadcastTopology(const ExplicitTopology& toposend,
 	else
 	{
 		vector <int> size (group->size());
-		
+		int myrank=toporecv.getProcGroup()->myRank();
 		for (int iproc=0; iproc<group->size();iproc++)
 		{
 			int isource = iproc;
 			if (!toporecv.getProcGroup()->contains(isource))
 			{
 				int nbelem;
-				_comm_interface->recv(&nbelem, 1, MPI_INTEGER, isource, tag+isource, *(group->getComm()), &status);
+				_comm_interface->recv(&nbelem, 1, MPI_INTEGER, isource, tag+myrank, *(group->getComm()), &status);
 				int* buffer = new int[nbelem];
-				_comm_interface->recv(buffer, nbelem, MPI_INTEGER, isource,tag+isource, *(group->getComm()), &status);				
+				_comm_interface->recv(buffer, nbelem, MPI_INTEGER, isource,tag+myrank, *(group->getComm()), &status);				
 			
 				ExplicitTopology* topotemp=new ExplicitTopology();
 				topotemp->unserialize(buffer, *_comm_interface);
diff --git a/src/ParaMEDMEM/MPIProcessorGroup.cxx b/src/ParaMEDMEM/MPIProcessorGroup.cxx
index 84a176fa4..34a84019e 100644
--- a/src/ParaMEDMEM/MPIProcessorGroup.cxx
+++ b/src/ParaMEDMEM/MPIProcessorGroup.cxx
@@ -38,7 +38,9 @@ ProcessorGroup(interface, proc_ids)
    
   // copying proc_ids in ranks
   copy<set<int>::const_iterator,int*> (proc_ids.begin(), proc_ids.end(), ranks);
-  
+  for (int i=0; i<proc_ids.size();i++)
+    cout << "proc id " << ranks[i]<<endl;
+
   _comm_interface.groupIncl(group_world, proc_ids.size(), ranks, &_group);
   
   _comm_interface.commCreate(MPI_COMM_WORLD, _group, &_comm);
diff --git a/src/ParaMEDMEM/ParaFIELD.hxx b/src/ParaMEDMEM/ParaFIELD.hxx
index dcb6c288e..88348e59d 100644
--- a/src/ParaMEDMEM/ParaFIELD.hxx
+++ b/src/ParaMEDMEM/ParaFIELD.hxx
@@ -19,7 +19,6 @@ class ParaFIELD
 {
 public:
 	ParaFIELD(ParaSUPPORT* support, const ComponentTopology& component_topology); 
-	ParaFIELD(ParaSUPPORT* support);
 	ParaFIELD(MEDMEM::driverTypes driver_type, const string& file_name, 
 		const string& driver_name, const ComponentTopology& component_topology) 
 		throw (MEDMEM::MEDEXCEPTION);
diff --git a/src/ParaMEDMEM/ParaGRID.cxx b/src/ParaMEDMEM/ParaGRID.cxx
index b60c63f47..5649bb453 100644
--- a/src/ParaMEDMEM/ParaGRID.cxx
+++ b/src/ParaMEDMEM/ParaGRID.cxx
@@ -19,7 +19,7 @@ _name(global_grid->getName())
 	if (!_block_topology->getProcGroup()->containsMyRank()) return;
 	
 	int dimension=_block_topology->getDimension() ;
-	if (dimension != global_grid->getMeshDimension())
+	if (dimension != global_grid->getSpaceDimension())
 		throw MEDEXCEPTION(LOCALIZED("ParaGrid::ParaGrid incompatible topology"));
 	
 	vector<vector<double> > xyz_array(dimension);
diff --git a/src/ParaMEDMEM/ParaSUPPORT.hxx b/src/ParaMEDMEM/ParaSUPPORT.hxx
index 7ff301a6f..73a22cb19 100644
--- a/src/ParaMEDMEM/ParaSUPPORT.hxx
+++ b/src/ParaMEDMEM/ParaSUPPORT.hxx
@@ -18,7 +18,7 @@ namespace ParaMEDMEM
     virtual const Topology* getTopology() const {};
     virtual const MEDMEM::SUPPORT* getSupport() const {return _support;}
     virtual const ParaMESH* getMesh() const {return _mesh;}
-  private :
+  protected :
     const MEDMEM::SUPPORT* _support;
     const ParaMESH* _mesh;
   };
diff --git a/src/ParaMEDMEM/StructuredParaSUPPORT.cxx b/src/ParaMEDMEM/StructuredParaSUPPORT.cxx
index 3af5bca0b..b431efeb7 100644
--- a/src/ParaMEDMEM/StructuredParaSUPPORT.cxx
+++ b/src/ParaMEDMEM/StructuredParaSUPPORT.cxx
@@ -12,22 +12,20 @@ namespace ParaMEDMEM
 StructuredParaSUPPORT::StructuredParaSUPPORT(const ParaGRID* const grid, const MED_EN::medEntityMesh entity):
 _block_topology(grid->getBlockTopology()),
 _grid(grid), 
-_mesh(0),
-_entity(entity),
-_support(new SUPPORT(grid->getGrid(), "support on all entities", entity))
+_entity(entity)
 {
-	
+  _support=new SUPPORT(grid->getGrid(), "support on all entities", entity);
 }
 /*! Constructor on all elements from a GRID */
 StructuredParaSUPPORT::StructuredParaSUPPORT(const ParaMESH* const mesh, const MED_EN::medEntityMesh entity):
 _block_topology(mesh->getBlockTopology()),
 _grid(0),
-_mesh(mesh), 
-_entity(entity),
-_support(new SUPPORT(mesh->getMesh(), "support on all entities", entity))
+_entity(entity)
 {
-	
+  _mesh=mesh;
+  _support=new SUPPORT(mesh->getMesh(), "support on all entities", entity);
 }
+
 StructuredParaSUPPORT::~StructuredParaSUPPORT()
 {
 	delete _support;
diff --git a/src/ParaMEDMEM/StructuredParaSUPPORT.hxx b/src/ParaMEDMEM/StructuredParaSUPPORT.hxx
index 8072cc2b6..a9008f816 100644
--- a/src/ParaMEDMEM/StructuredParaSUPPORT.hxx
+++ b/src/ParaMEDMEM/StructuredParaSUPPORT.hxx
@@ -31,9 +31,9 @@ public:
 private:
 	const BlockTopology* const  _block_topology;
 	const ParaGRID* const _grid;
-	const ParaMESH* const _mesh;
+  //	const ParaMESH* const _mesh;
 	const MED_EN::medEntityMesh _entity;
-	const MEDMEM::SUPPORT* _support;
+  //	const MEDMEM::SUPPORT* _support;
 	
 };
 
diff --git a/src/ParaMEDMEM/UnstructuredParaSUPPORT.hxx b/src/ParaMEDMEM/UnstructuredParaSUPPORT.hxx
index 4f663f255..7d30c5de4 100644
--- a/src/ParaMEDMEM/UnstructuredParaSUPPORT.hxx
+++ b/src/ParaMEDMEM/UnstructuredParaSUPPORT.hxx
@@ -22,12 +22,11 @@ public:
 	UnstructuredParaSUPPORT(const ParaMESH* const mesh, SUPPORT* support );
 	virtual ~UnstructuredParaSUPPORT();
 	const Topology* getTopology() const {return _block_topology;}
-	const MEDMEM::SUPPORT* getSupport() {return _support;}
+   
 private:
 	const BlockTopology* const  _block_topology;
-	const ParaMESH* const _mesh;
 	const MED_EN::medEntityMesh _entity;
-	const MEDMEM::SUPPORT* _support;
+	
 	
 };
 
diff --git a/src/ParaMEDMEM/test_ParaField.cxx b/src/ParaMEDMEM/test_ParaField.cxx
index 42f4b482b..2c4be32b8 100644
--- a/src/ParaMEDMEM/test_ParaField.cxx
+++ b/src/ParaMEDMEM/test_ParaField.cxx
@@ -23,54 +23,57 @@ using namespace ParaMEDMEM;
 using namespace MEDMEM;
 int main(int argc, char** argv)
 {
-	string testname="ParaMEDMEM - test #1 -";
-	MPI_Init(&argc, &argv); 
-	int size;
-	int rank;
-	MPI_Comm_size(MPI_COMM_WORLD,&size);
-	MPI_Comm_rank(MPI_COMM_WORLD,&rank);
-	
-	set<int> self_procs;
-	set<int> procs;
-	for (int i=0; i<size-1; i++)
-		procs.insert(i);
-	self_procs.insert(rank);
-	
-	ParaMEDMEM::CommInterface interface;
-		
-	ParaMEDMEM::ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs);
-	ParaMEDMEM::ProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface,procs);
-	
-	
-	double xmin=0.0, xmax=1.0, ymin=0.0, ymax=1.0;
-	int nx=10, ny=10;
-	std::vector<std::vector<double> > axes(2);
-	axes[0].resize(nx);
-	axes[1].resize(ny);
-	for (int i=0; i<nx; i++)
-		axes[0][i]=xmin+((xmax-xmin)*i)/(nx-1);
-	for (int i=0; i<ny; i++)
-		axes[1][i]=ymin+((ymax-ymin)*i)/(ny-1);
-	vector <string> coord_name;
-	vector <string> coord_unit;
-	coord_name.push_back("x");coord_name.push_back("y");
-	coord_unit.push_back("m");coord_unit.push_back("m");
-	
-	MEDMEM::GRID grid(axes, coord_name,coord_unit);
-	
-	grid.setName("grid_10_10");
-	grid.setDescription("10 by 10 square grid");
-	Topology* topo = new BlockTopology(*self_group, grid);
+  string testname="ParaMEDMEM - test #1 -";
+  MPI_Init(&argc, &argv); 
+  int size;
+  int rank;
+  MPI_Comm_size(MPI_COMM_WORLD,&size);
+  MPI_Comm_rank(MPI_COMM_WORLD,&rank);
+  
+  set<int> self_procs;
+  set<int> procs;
+  for (int i=0; i<size-1; i++)
+    procs.insert(i);
+  self_procs.insert(rank);
+  
+  ParaMEDMEM::CommInterface interface;
+  
+  ParaMEDMEM::ProcessorGroup* self_group = new ParaMEDMEM::MPIProcessorGroup(interface,self_procs);
+  ParaMEDMEM::ProcessorGroup* group = new ParaMEDMEM::MPIProcessorGroup(interface,procs);
+  
+  if (group->containsMyRank())
+    {
+      double xmin=0.0, xmax=1.0, ymin=0.0, ymax=1.0;
+      int nx=10, ny=10;
+      std::vector<std::vector<double> > axes(2);
+      axes[0].resize(nx);
+      axes[1].resize(ny);
+      for (int i=0; i<nx; i++)
+	axes[0][i]=xmin+((xmax-xmin)*i)/(nx-1);
+      for (int i=0; i<ny; i++)
+	axes[1][i]=ymin+((ymax-ymin)*i)/(ny-1);
+      vector <string> coord_name;
+      vector <string> coord_unit;
+      coord_name.push_back("x");coord_name.push_back("y");
+      coord_unit.push_back("m");coord_unit.push_back("m");
+      
+      MEDMEM::GRID grid(axes, coord_name,coord_unit);
+      
+      grid.setName("grid_10_10");
+      grid.setDescription("10 by 10 square grid");
+      Topology* topo = new BlockTopology(*self_group, grid);
+      
+      ParaGRID local_grid(&grid, topo);
+      StructuredParaSUPPORT support(&local_grid,MED_EN::MED_CELL);
+      //	local_grid.write (MED_DRIVER, "/tmp/toto");
+      
+      ComponentTopology comp_topo(5, group);
+      ParaFIELD field(&support, comp_topo);
 
-	ParaGRID local_grid(&grid, topo);
-	StructuredParaSUPPORT support(&local_grid,MED_EN::MED_CELL);
-	local_grid.write (MED_DRIVER, "/tmp/toto");
-	
-	ComponentTopology comp_topo(5, group);
-	ParaFIELD field(&support, comp_topo);
-	
-	MPI_Finalize();
-	return 0;
+      delete topo;
+    }	
+  MPI_Finalize();
+  return 0;
 }