From: cvw Date: Fri, 16 Mar 2012 15:19:02 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: V6_main_FINAL~781 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e90d39195202d638af46bd52605e2e1566410e56;p=tools%2Fmedcoupling.git *** empty log message *** --- diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx index b3560e5b9..447c908b2 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollection.cxx @@ -293,7 +293,7 @@ void MEDPARTITIONER::MeshCollection::createNodeMapping( MeshCollection& initialC tree=new BBTree<3>(bbox,0,0,nvertices,1e-9); } - for (int inew=0; inew<_topology->nbDomain(); inew++) //cvwat12 + for (int inew=0; inew<_topology->nbDomain(); inew++) { #ifdef HAVE_MPI2 //sending meshes for parallel computation @@ -463,7 +463,7 @@ void MEDPARTITIONER::MeshCollection::castFaceMeshes(MeshCollection& initialColle //creating the splitMeshes from the face ids for (int inew=0;inew<_topology->nbDomain();inew++) { - if (meshesCastFrom[iold]->getNumberOfCells() > 0) //cvw + if (meshesCastFrom[iold]->getNumberOfCells() > 0) { splitMeshes[inew][iold]= (ParaMEDMEM::MEDCouplingUMesh*) @@ -695,7 +695,7 @@ void MEDPARTITIONER::MeshCollection::remapIntField2(int inew, int iold, tmpMesh->decrRef(); } -void MEDPARTITIONER::MeshCollection::castAllFields(MeshCollection& initialCollection, std::string nameArrayTo) //cvwat08 +void MEDPARTITIONER::MeshCollection::castAllFields(MeshCollection& initialCollection, std::string nameArrayTo) { if (nameArrayTo!="cellFieldDouble") throw INTERP_KERNEL::Exception("Error castAllField only on cellFieldDouble"); @@ -891,11 +891,10 @@ MEDPARTITIONER::MeshCollection::MeshCollection(const std::string& filename) * \param filename - name of the master file containing the list of all the MED files * \param domainSelector - selector of domains to load */ -MEDPARTITIONER::MeshCollection::MeshCollection(const std::string& filename, ParaDomainSelector& domainSelector) //cvwat01 +MEDPARTITIONER::MeshCollection::MeshCollection(const std::string& filename, ParaDomainSelector& domainSelector) : _topology(0), _owns_topology(true), _driver(0), - //cvw _domain_selector( domainSelector.nbProcs() > 1 ? & domainSelector : 0 ), _domain_selector( &domainSelector ), _i_non_empty_mesh(-1), _driver_type(MEDPARTITIONER::Undefined), @@ -1405,7 +1404,7 @@ MEDPARTITIONER::Topology* MEDPARTITIONER::MeshCollection::createPartition(int nb MEDPARTITIONER::SkyLineArray* array=0; int* edgeweights=0; buildCellGraph(array,edgeweights); - //MPI_Barrier(MPI_COMM_WORLD); + Graph* cellGraph; switch (split) { diff --git a/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.cxx b/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.cxx index 9089f8530..1b165b5c4 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_ParallelTopology.cxx @@ -273,7 +273,6 @@ ParallelTopology::ParallelTopology(Graph* graph, Topology* oldTopology, int nb_d { _nb_domain=nb_domain; - //cvw !!whatisit! _nb_cells=graph->nbVertices(); _mesh_dimension=mesh_dimension; if (MyGlobals::_Verbose>200)