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

[hongjun at mcs.anl.gov]

Author: hongjun
Date: 2011-04-22 14:29:26 -0500 (Fri, 22 Apr 2011)
New Revision: 4772

Modified:
   MOAB/trunk/src/parallel/ParallelComm.cpp
Log:
o Skip connectivity entity in "check_local_shared" function for EntitySet
o Entity in "unpack_tag" function is converted to local entity when "store_remote_handle" is true too
o Passes make check


Modified: MOAB/trunk/src/parallel/ParallelComm.cpp
===================================================================
--- MOAB/trunk/src/parallel/ParallelComm.cpp	2011-04-21 20:24:37 UTC (rev 4771)
+++ MOAB/trunk/src/parallel/ParallelComm.cpp	2011-04-22 19:29:26 UTC (rev 4772)
@@ -3113,12 +3113,10 @@
     std::vector<EntityHandle> dum_ents(num_ents), dum_vals;
     UNPACK_EH(buff_ptr, &dum_ents[0], num_ents);
 
-    if (!store_remote_handles) {
-        // in this case handles are indices into new entity range; need to convert
-        // to local handles
-      result = get_local_handles(&dum_ents[0], num_ents, entities);
-      RRA("Unable to convert to local handles.");
-    }
+    // in this case handles are indices into new entity range; need to convert
+    // to local handles
+    result = get_local_handles(&dum_ents[0], num_ents, entities);
+    RRA("Unable to convert to local handles.");
 
       // if it's a handle type, also convert tag vals in-place in buffer
     if (MB_TYPE_HANDLE == tag_type) {
@@ -6784,7 +6782,8 @@
       continue;
     }
     
-    if (mbImpl->type_from_handle(*vit) == MBVERTEX) continue;
+    EntityType type = mbImpl->type_from_handle(*vit);
+    if (type == MBVERTEX || type == MBENTITYSET) continue;
 
       // copy element's procs to vset and save size
     int orig_ps = num_ps; vset.clear();