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

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2011-01-11 18:47:27 -0600 (Tue, 11 Jan 2011)
New Revision: 4435

Modified:
   MOAB/trunk/src/parallel/ReadParallel.cpp
Log:
2nd attempt at fixing RESOLVE_SHARED_ENTS for READ_PART

Modified: MOAB/trunk/src/parallel/ReadParallel.cpp
===================================================================
--- MOAB/trunk/src/parallel/ReadParallel.cpp	2011-01-11 23:59:31 UTC (rev 4434)
+++ MOAB/trunk/src/parallel/ReadParallel.cpp	2011-01-12 00:47:27 UTC (rev 4435)
@@ -386,10 +386,20 @@
             sl.tag_list_length = 1;
           }
           tmp_result = impl->serial_load_file( *file_names, &file_set, opts, &sl, file_id_tag );
+          if (MB_SUCCESS != tmp_result)
+            break;
+            
+          Tag part_tag;
+          tmp_result = impl->tag_get_handle( partition_tag_name.c_str(), part_tag );
+          if (MB_SUCCESS != tmp_result)
+            break;
           
-          if (MB_SUCCESS == tmp_result)
-            tmp_result = create_partition_sets( partition_tag_name, file_set );
-          } break;
+          tmp_result = impl->get_entities_by_type_and_tag( file_set, MBENTITYSET,
+                             &part_tag, 0, 1, myPcomm->partition_sets() );
+          
+          //if (MB_SUCCESS == tmp_result)
+          //  tmp_result = create_partition_sets( partition_tag_name, file_set );
+        } break;
 
 //==================
       case PA_GET_FILESET_ENTS:
@@ -618,11 +628,7 @@
       result = mbImpl->get_entities_by_type_and_tag(file_set, MBENTITYSET, &ptag, 
                                                     (const void* const*)&proc_rk_ptr, 1,
                                                     tagged_sets); RR(" ");
-      if (!tagged_sets.empty() && myPcomm->partition_sets().empty()) {
-        myPcomm->partition_sets() = tagged_sets;
-        return MB_SUCCESS;
-      }
-      else if (!tagged_sets.empty() && tagged_sets != myPcomm->partition_sets()) {
+      if (!tagged_sets.empty() && tagged_sets != myPcomm->partition_sets()) {
         result = mbImpl->tag_delete_data(ptag, tagged_sets); RR(" ");
       }
       else if (tagged_sets == myPcomm->partition_sets()) return MB_SUCCESS;