[MOAB-dev] r5896 - in MOAB/trunk: src/parallel test/parallel

[iulian at mcs.anl.gov]

Author: iulian
Date: 2012-12-04 22:30:38 -0600 (Tue, 04 Dec 2012)
New Revision: 5896

Modified:
   MOAB/trunk/src/parallel/ParallelComm.cpp
   MOAB/trunk/test/parallel/ucdtrvpart.cpp
Log:
rename a variable used innapropriately in an inner loop.
Thank you Vijay, for pointing this out.
It was OK, as the compiler was much smarter than me:) and took care of things.
also, show what options could be used to multi-load an ucd nc file using trivial partition in a 
typical scenario (1. read header 2. create mesh and resolve sharing 3. read a variable)
 


Modified: MOAB/trunk/src/parallel/ParallelComm.cpp
===================================================================
--- MOAB/trunk/src/parallel/ParallelComm.cpp	2012-12-04 21:14:02 UTC (rev 5895)
+++ MOAB/trunk/src/parallel/ParallelComm.cpp	2012-12-05 04:30:38 UTC (rev 5896)
@@ -4088,13 +4088,13 @@
       indexInTuple++;
       multishared_verts.inc_n();
       // create more tuples, for each instance
-      for (int k=startMulti; k<=endMulti; k++)
+      for (int k2=startMulti; k2<=endMulti; k2++)
       {
         multishared_verts.vi_wr[2*indexInTuple] = proc_to_send_to; // send to
-        multishared_verts.vi_wr[2*indexInTuple+1] =  remoting_entities.vi_wr[k]; // multi proc
-        multishared_verts.vl_wr[indexInTuple] =  remoting_entities.vl_wr[k]; // gid, for debug
+        multishared_verts.vi_wr[2*indexInTuple+1] =  remoting_entities.vi_wr[k2]; // multi proc
+        multishared_verts.vl_wr[indexInTuple] =  remoting_entities.vl_wr[k2]; // gid, for debug
         multishared_verts.vul_wr[2*indexInTuple] = handle_with_multi; // remote handle on proc_to_send_to
-        multishared_verts.vul_wr[2*indexInTuple+1] = remoting_entities.vul_wr[2*k]; // handle on multi proc
+        multishared_verts.vul_wr[2*indexInTuple+1] = remoting_entities.vul_wr[2*k2]; // handle on multi proc
         indexInTuple++;
         multishared_verts.inc_n();
       }

Modified: MOAB/trunk/test/parallel/ucdtrvpart.cpp
===================================================================
--- MOAB/trunk/test/parallel/ucdtrvpart.cpp	2012-12-04 21:14:02 UTC (rev 5895)
+++ MOAB/trunk/test/parallel/ucdtrvpart.cpp	2012-12-05 04:30:38 UTC (rev 5896)
@@ -26,7 +26,7 @@
   
   result += RUN_TEST(test_read_parallel_ucd_trivial);
   result += RUN_TEST(test_read_parallel_ucd_trivial_spectral);
-  //result += RUN_TEST(test_multiple_loads_of_same_file);
+  result += RUN_TEST(test_multiple_loads_of_same_file);
   
   MPI_Finalize();
   return result;
@@ -106,16 +106,16 @@
   CHECK_ERR(rval);
 
   // read first only header information, no mesh, no variable
-  std::string opts("PARALLEL=READ_PART;PARTITION;PARALLEL_GHOSTS=2.0.1;NOMESH;VARIABLE=;PARTITION_METHOD=TRIVIAL_PARTITION");
+  std::string opts("PARALLEL=READ_PART;PARTITION;NOMESH;VARIABLE=;PARTITION_METHOD=TRIVIAL_PARTITION");
   rval = mb.load_file(example, &file_set, opts.c_str());
   CHECK_ERR(rval);
 
-  opts="PARALLEL=READ_PART;PARTITION;PARALLEL_RESOLVE_SHARED_ENTS;PARALLEL_GHOSTS=2.0.1;PARTITION_METHOD=TRIVIAL_PARTITION;VARIABLE=";
+  opts="PARALLEL=READ_PART;PARTITION;PARALLEL_RESOLVE_SHARED_ENTS;PARTITION_METHOD=TRIVIAL_PARTITION;VARIABLE=";
   rval = mb.load_file(example, &file_set, opts.c_str());
   CHECK_ERR(rval);