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

[hongjun at mcs.anl.gov]

Author: hongjun
Date: 2011-06-02 19:50:28 -0500 (Thu, 02 Jun 2011)
New Revision: 4936

Modified:
   MOAB/trunk/src/parallel/ParallelComm.cpp
Log:
o MB_ALREADY_ALLOCATED case is handled in "un/pack_sets" function
o Passes make check


Modified: MOAB/trunk/src/parallel/ParallelComm.cpp
===================================================================
--- MOAB/trunk/src/parallel/ParallelComm.cpp	2011-06-02 22:34:11 UTC (rev 4935)
+++ MOAB/trunk/src/parallel/ParallelComm.cpp	2011-06-03 00:50:28 UTC (rev 4936)
@@ -2510,7 +2510,7 @@
     std::vector<int> id_data(n_sets);
     result = mbImpl->tag_get_handle("PARALLEL_UNIQUE_ID", 1, MB_TYPE_INTEGER, 
                                 uid_tag, MB_TAG_SPARSE|MB_TAG_CREAT);
-    if (MB_SUCCESS != result) {
+    if (MB_ALREADY_ALLOCATED != result && MB_SUCCESS != result) {
       RRA("Trouble creating parallel geometry unique id tag.");
     }
     result = mbImpl->tag_get_data(uid_tag, all_sets, &id_data[0]);
@@ -2665,7 +2665,7 @@
     Tag uid_tag; int def_val = 0;
     result = mbImpl->tag_get_handle("PARALLEL_UNIQUE_ID", 1, MB_TYPE_INTEGER,
                                     uid_tag, MB_TAG_SPARSE|MB_TAG_CREAT, &def_val);
-    if (MB_SUCCESS != result) {
+    if (MB_ALREADY_ALLOCATED != result && MB_SUCCESS != result) {
       RRA("Trouble creating parallel geometry unique id tag.");
     }