[MOAB-dev] r5571 - in MOAB/trunk: itaps/imesh src/io src/parallel src/parallel/moab test/parallel tools/mbcoupler tools/refiner

tautges at mcs.anl.gov tautges at mcs.anl.gov
Tue Jun 12 16:06:17 CDT 2012


Author: tautges
Date: 2012-06-12 16:06:16 -0500 (Tue, 12 Jun 2012)
New Revision: 5571

Modified:
   MOAB/trunk/itaps/imesh/MOAB_iMeshP_unit_tests.cpp
   MOAB/trunk/src/io/ReadHDF5.cpp
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/parallel/ReadParallel.cpp
   MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp
   MOAB/trunk/src/parallel/moab/ParallelComm.hpp
   MOAB/trunk/src/parallel/moab/ProcConfig.hpp
   MOAB/trunk/test/parallel/mbparallelcomm_test.cpp
   MOAB/trunk/test/parallel/parallel_unit_tests.cpp
   MOAB/trunk/test/parallel/parallel_write_test.cc
   MOAB/trunk/test/parallel/parmerge.cpp
   MOAB/trunk/test/parallel/pcomm_serial.cpp
   MOAB/trunk/test/parallel/pcomm_unit.cpp
   MOAB/trunk/test/parallel/scdtest.cpp
   MOAB/trunk/test/parallel/structured3.cpp
   MOAB/trunk/tools/mbcoupler/mbcoupler_test.cpp
   MOAB/trunk/tools/mbcoupler/ssn_test.cpp
   MOAB/trunk/tools/refiner/test_mesh_refiner.cpp
Log:
Remove the default argument for communicator to the ParallelComm constructor.
Also remove various compiler warnings.

Passes make check in serial and parallel, openmpi and mpich.



Modified: MOAB/trunk/itaps/imesh/MOAB_iMeshP_unit_tests.cpp
===================================================================
--- MOAB/trunk/itaps/imesh/MOAB_iMeshP_unit_tests.cpp	2012-06-12 20:44:42 UTC (rev 5570)
+++ MOAB/trunk/itaps/imesh/MOAB_iMeshP_unit_tests.cpp	2012-06-12 21:06:16 UTC (rev 5571)
@@ -2217,8 +2217,10 @@
       ierr = vertex_tag( imesh, verts[j], tag );
       if (ierr)
         break;
-      local_data.push_back( (iBase_EntityHandle)tag );
-      local_data.push_back( (iBase_EntityHandle)part_ids[i] );
+      long tmp_h = tag;
+      local_data.push_back((iBase_EntityHandle)tmp_h);
+      tmp_h = part_ids[i];
+      local_data.push_back((iBase_EntityHandle)tmp_h);
       local_data.push_back( verts[j] );
     }
     if (ierr)

Modified: MOAB/trunk/src/io/ReadHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/ReadHDF5.cpp	2012-06-12 20:44:42 UTC (rev 5570)
+++ MOAB/trunk/src/io/ReadHDF5.cpp	2012-06-12 21:06:16 UTC (rev 5571)
@@ -386,7 +386,7 @@
     }
     myPcomm = ParallelComm::get_pcomm(iFace, pcomm_no);
     if (0 == myPcomm) {
-      myPcomm = new ParallelComm(iFace);
+      myPcomm = new ParallelComm(iFace, MPI_COMM_WORLD);
     }
     const int rank = myPcomm->proc_config().proc_rank();
     dbgOut.set_rank(rank);

Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2012-06-12 20:44:42 UTC (rev 5570)
+++ MOAB/trunk/src/io/ReadNC.cpp	2012-06-12 21:06:16 UTC (rev 5571)
@@ -277,7 +277,7 @@
   }
   myPcomm = ParallelComm::get_pcomm(mbImpl, pcomm_no);
   if (0 == myPcomm) {
-    myPcomm = new ParallelComm(mbImpl);
+    myPcomm = new ParallelComm(mbImpl, MPI_COMM_WORLD);
   }
   const int rank = myPcomm->proc_config().proc_rank();
   dbgOut.set_rank(rank);

Modified: MOAB/trunk/src/parallel/ReadParallel.cpp
===================================================================
--- MOAB/trunk/src/parallel/ReadParallel.cpp	2012-06-12 20:44:42 UTC (rev 5570)
+++ MOAB/trunk/src/parallel/ReadParallel.cpp	2012-06-12 21:06:16 UTC (rev 5571)
@@ -50,7 +50,7 @@


More information about the moab-dev mailing list