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

[smithrm at mcs.anl.gov]

Author: smithrm
Date: 2010-10-07 15:24:01 -0500 (Thu, 07 Oct 2010)
New Revision: 4204

Modified:
   MOAB/trunk/src/parallel/ReadParallel.cpp
Log:
o Commenting out changes from changeset 4003 (fix for ticket #30) as it's causing issues when reading 2 files in parallel as in Coupler testing.  A new fix for ticket #30 will have to be devised or this one corrected.


Modified: MOAB/trunk/src/parallel/ReadParallel.cpp
===================================================================
--- MOAB/trunk/src/parallel/ReadParallel.cpp	2010-10-07 17:53:06 UTC (rev 4203)
+++ MOAB/trunk/src/parallel/ReadParallel.cpp	2010-10-07 20:24:01 UTC (rev 4204)
@@ -656,17 +656,17 @@
                                            &all_sets);
   RR("Failure gathering related entities.");
 
-    // Collect the empty sets from all_sets
-  Range orig_empty_sets;
-  for (Range::iterator rit = all_sets.begin();
-       rit != all_sets.end(); rit++) {
-    int num_ents;
-    result = mbImpl->get_number_entities_by_handle(*rit, num_ents);
-    RR("Failure getting number of entities.");
+//     // Collect the empty sets from all_sets
+//   Range orig_empty_sets;
+//   for (Range::iterator rit = all_sets.begin();
+//        rit != all_sets.end(); rit++) {
+//     int num_ents;
+//     result = mbImpl->get_number_entities_by_handle(*rit, num_ents);
+//     RR("Failure getting number of entities.");
 
-    if (num_ents == 0)
-      orig_empty_sets.insert(*rit);
-  }
+//     if (num_ents == 0)
+//       orig_empty_sets.insert(*rit);
+//   }
 
     // get pre-existing entities
   Range file_ents;
@@ -693,19 +693,19 @@
     RR("Failure removing deletable entities.");
   }
 
-    // Collect the empty sets from keepable_sets and add to deletable_sets
-  for (Range::iterator rit = keepable_sets.begin();
-       rit != keepable_sets.end(); rit++) {
-    int num_ents;
-    result = mbImpl->get_number_entities_by_handle(*rit, num_ents);
-    RR("Failure getting number of entities.");
+//     // Collect the empty sets from keepable_sets and add to deletable_sets
+//   for (Range::iterator rit = keepable_sets.begin();
+//        rit != keepable_sets.end(); rit++) {
+//     int num_ents;
+//     result = mbImpl->get_number_entities_by_handle(*rit, num_ents);
+//     RR("Failure getting number of entities.");
 
-    if (num_ents == 0)
-      deletable_sets.insert(*rit);