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

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-08-24 17:27:20 -0500 (Wed, 24 Aug 2011)
New Revision: 5112

Modified:
   MOAB/trunk/src/parallel/ReadParallel.cpp
   MOAB/trunk/src/parallel/ReadParallel.hpp
Log:
resolve shared sets if resolving shared entities during parallel read

Modified: MOAB/trunk/src/parallel/ReadParallel.cpp
===================================================================
--- MOAB/trunk/src/parallel/ReadParallel.cpp	2011-08-24 22:26:38 UTC (rev 5111)
+++ MOAB/trunk/src/parallel/ReadParallel.cpp	2011-08-24 22:27:20 UTC (rev 5112)
@@ -32,6 +32,7 @@
     "PARALLEL GET_FILESET_ENTS",
     "PARALLEL RESOLVE_SHARED_ENTS",
     "PARALLEL EXCHANGE_GHOSTS",
+    "PARALLEL RESOLVE_SHARED_SETS",
     "PARALLEL PRINT_PARALLEL"
 };
 
@@ -223,6 +224,8 @@
 
   if (-1 != ghost_dim) pa_vec.push_back(PA_EXCHANGE_GHOSTS);
 
+  if (-2 != resolve_dim) pa_vec.push_back(PA_RESOLVE_SHARED_SETS);
+
   if (print_parallel) pa_vec.push_back(PA_PRINT_PARALLEL);
   
   result = load_file(file_names, num_files, file_set, parallel_mode, 
@@ -483,6 +486,16 @@
           break;
         
 //==================
+      case PA_RESOLVE_SHARED_SETS:
+          myDebug.tprint(1,"Resolving shared sets.\n");
+	  
+	  if (myPcomm->size() == 1)
+	    tmp_result = MB_SUCCESS;
+	  else
+	    tmp_result = myPcomm->resolve_shared_sets(file_set, use_id_tag ? file_id_tag : 0);
+          break;
+        
+//==================
       case PA_PRINT_PARALLEL:
           myDebug.tprint(1,"Printing parallel information.\n");
 
@@ -704,6 +717,8 @@
     result = mbImpl->remove_entities(*rit, deletable_ents);
     RR("Failure removing deletable entities.");
   }
+  result = mbImpl->remove_entities( file_set, deletable_ents );
+  RR("Failure removing deletable entities.");
 
   myDebug.tprint( 2, "Deleting deletable entities.\n" );
 

Modified: MOAB/trunk/src/parallel/ReadParallel.hpp
===================================================================
--- MOAB/trunk/src/parallel/ReadParallel.hpp	2011-08-24 22:26:38 UTC (rev 5111)