[MOAB-dev] r5492 - in MOAB/trunk: test/parallel tools/mbcoupler

[iulian at mcs.anl.gov]

Author: iulian
Date: 2012-04-23 16:13:38 -0500 (Mon, 23 Apr 2012)
New Revision: 5492

Modified:
   MOAB/trunk/test/parallel/mbparallelcomm_test.cpp
   MOAB/trunk/tools/mbcoupler/mbcoupler_test.cpp
Log:
remove parallel read dependency on mbcoupler test too (and FileOptions 
is removed too, also from mbparallelcomm)


Modified: MOAB/trunk/test/parallel/mbparallelcomm_test.cpp
===================================================================
--- MOAB/trunk/test/parallel/mbparallelcomm_test.cpp	2012-04-23 19:13:32 UTC (rev 5491)
+++ MOAB/trunk/test/parallel/mbparallelcomm_test.cpp	2012-04-23 21:13:38 UTC (rev 5492)
@@ -8,7 +8,6 @@
 
 #include "moab/ParallelComm.hpp"
 #include "MBParallelConventions.h"
-#include "FileOptions.hpp"
 #include "MBTagConventions.hpp"
 #include "moab/Core.hpp"
 #include "ScdVertexData.hpp"

Modified: MOAB/trunk/tools/mbcoupler/mbcoupler_test.cpp
===================================================================
--- MOAB/trunk/tools/mbcoupler/mbcoupler_test.cpp	2012-04-23 19:13:32 UTC (rev 5491)
+++ MOAB/trunk/tools/mbcoupler/mbcoupler_test.cpp	2012-04-23 21:13:38 UTC (rev 5492)
@@ -1,8 +1,6 @@
 #include "moab/ParallelComm.hpp"
 #include "MBParallelConventions.h"
 #include "moab/Core.hpp"
-#include "FileOptions.hpp"
-#include "ReadParallel.hpp"
 #include "Coupler.hpp"
 #include "iMesh_extensions.h"
 #include "moab_mpi.h"
@@ -72,7 +70,6 @@
 
 ErrorCode report_iface_ents(Interface *mbImpl,
                               std::vector<ParallelComm *> &pcs,
-                              std::vector<ReadParallel *> &rps,
                               bool print_results);
 
 ErrorCode test_interpolation(Interface *mbImpl, 
@@ -144,7 +141,6 @@
   
     // read in mesh(es)
   std::vector<ParallelComm *> pcs(meshFiles.size()); 
-  std::vector<ReadParallel *> rps(meshFiles.size());
 
     // Create root sets for each mesh using the iMesh API.  Then pass these
     // to the load_file functions to be populated.
@@ -152,14 +148,19 @@
 
   for (unsigned int i = 0; i < meshFiles.size(); i++) {
     pcs[i] = new ParallelComm(mbImpl);
-    rps[i] = new ReadParallel(mbImpl, pcs[i]);
+    int index = pcs[i]->get_id();
+    std::string newReadopts;
+    std::ostringstream extraOpt;
+    extraOpt  << ";PARALLEL_COMM=" << index;