[MOAB-dev] r4970 - MOAB/trunk/src/parallel

[tautges at mcs.anl.gov]

Author: tautges
Date: 2011-06-08 12:54:06 -0500 (Wed, 08 Jun 2011)
New Revision: 4970

Modified:
   MOAB/trunk/src/parallel/ReadParallel.cpp
Log:
Change parallel read to not create a new entity set if a file set was
passed in.


Modified: MOAB/trunk/src/parallel/ReadParallel.cpp
===================================================================
--- MOAB/trunk/src/parallel/ReadParallel.cpp	2011-06-08 16:20:11 UTC (rev 4969)
+++ MOAB/trunk/src/parallel/ReadParallel.cpp	2011-06-08 17:54:06 UTC (rev 4970)
@@ -280,8 +280,11 @@
   
     // make a new set for the parallel read
   EntityHandle file_set;
-  result = mbImpl->create_meshset(MESHSET_SET, file_set);
-  if (MB_SUCCESS != result) return result;
+  if (!file_set_ptr || !(*file_set_ptr)) {
+    result = mbImpl->create_meshset(MESHSET_SET, file_set);
+    if (MB_SUCCESS != result) return result;
+  }
+  else file_set = *file_set_ptr;
 
   bool i_read = false;
   Tag id_tag = 0;
@@ -534,13 +537,15 @@
       std::cout << "  " << act_times[0] << " PARALLEL TOTAL" << std::endl;
     }
   }
-  
+
+/*  
   if (MB_SUCCESS == result && file_set_ptr) {
     Range all_ents;
     result = mbImpl->get_entities_by_handle(file_set, all_ents);
     if (MB_SUCCESS == result)
       result = mbImpl->add_entities(*file_set_ptr, all_ents);
   }
+*/
     
   return result;
 }