From ed86adc5bb2fb7c57a84cf1b947282b04a9e5bb8 Mon Sep 17 00:00:00 2001 From: cvw Date: Fri, 16 Mar 2012 15:03:12 +0000 Subject: [PATCH] *** empty log message *** --- .../MEDPARTITIONER_MeshCollectionDriver.cxx | 2 +- .../MEDPARTITIONER_MeshCollectionMedXmlDriver.cxx | 2 +- src/MEDPartitioner/MEDPARTITIONER_MetisGraph.cxx | 12 ++---------- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.cxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.cxx index 0a770e75c..41c66d57d 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionDriver.cxx @@ -375,7 +375,7 @@ void MeshCollectionDriver::writeMedFile(int idomain, const std::string& distfile std::string tmp,newName=distfilename; tmp+="_"+fieldName+"_"+IntToStr(nbfFieldFound)+".med"; newName.replace(newName.find(".med"),4,tmp); - std::cout << "WARNING : writeMedFile : new file name with only one field :" << newName << std::endl; + std::cout << "WARNING : writeMedFile : create a new file name with only one field because MEDLoader::WriteField throw:" << newName << std::endl; MEDLoader::WriteField(newName.c_str(),field,true); } } diff --git a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedXmlDriver.cxx b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedXmlDriver.cxx index 0b3883fe7..4ac1a4cb2 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedXmlDriver.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MeshCollectionMedXmlDriver.cxx @@ -141,7 +141,7 @@ int MeshCollectionMedXmlDriver::read(const char* filename, ParaDomainSelector* d MyGlobals::_Mesh_Names[i]=(const char*)xpathMeshObj->nodesetval->nodeTab[0]->children->content; if ( !domainSelector || domainSelector->isMyDomain(i)) - readSubdomain(i); //cvwat03 + readSubdomain(i); xmlXPathFreeObject(xpathObjfilename); xmlXPathFreeObject(xpathMeshObj); } //loop on domains diff --git a/src/MEDPartitioner/MEDPARTITIONER_MetisGraph.cxx b/src/MEDPartitioner/MEDPARTITIONER_MetisGraph.cxx index b08a31561..50f27a1d6 100644 --- a/src/MEDPartitioner/MEDPARTITIONER_MetisGraph.cxx +++ b/src/MEDPartitioner/MEDPARTITIONER_MetisGraph.cxx @@ -137,16 +137,13 @@ void METISGraph::partGraph(int ndomain, //it was keeped ran=CreateRandomSize(n); RandomizeAdj(&xadj[0],&adjncy[0],ran,vx,va); - ParMETIS_PartKway( //cvwat11 - vtxdist, &vx[0], &va[0], vwgt, + ParMETIS_PartKway(vtxdist, &vx[0], &va[0], vwgt, adjwgt, &wgtflag, &base, &nparts, options, &edgecut, partition, &comm ); } else { - //MPI_Barrier(MPI_COMM_WORLD); - ParMETIS_PartKway( //cvwat11 - vtxdist, xadj, adjncy, vwgt, + ParMETIS_PartKway(vtxdist, xadj, adjncy, vwgt, adjwgt, &wgtflag, &base, &nparts, options, &edgecut, partition, &comm ); } @@ -170,11 +167,6 @@ void METISGraph::partGraph(int ndomain, //shit ParMETIS "Error! Key -2 not found!" not catched... throw INTERP_KERNEL::Exception("Problem in ParMETIS_PartKway"); } - if (n<8 && nparts==3) - { - for (int i=0; i