[MOAB-dev] r5630 - MOAB/trunk/src/io

[iulian at mcs.anl.gov]

Author: iulian
Date: 2012-07-11 11:14:28 -0500 (Wed, 11 Jul 2012)
New Revision: 5630

Modified:
   MOAB/trunk/src/io/ReadNC.cpp
Log:
fix nightly build, according to Tom's suggestions


Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2012-07-10 19:09:14 UTC (rev 5629)
+++ MOAB/trunk/src/io/ReadNC.cpp	2012-07-11 16:14:28 UTC (rev 5630)
@@ -263,8 +263,11 @@
     ERRORR(rval, "Couldn't add new quads to partition set.");
 
 #ifndef NDEBUG
-    rval = myPcomm->resolve_shared_ents(0,-1,-1);
-    ERRORR(rval, "Trouble resolving shared entities");
+    if (ucdMesh)
+    {
+      rval = myPcomm->resolve_shared_ents(0,-1,-1);
+      ERRORR(rval, "Trouble resolving shared entities");
+    }
     //TODO print which procs own which verts, check global number of verts
 #endif
 
@@ -343,10 +346,12 @@
   isParallel = (rval != MB_ENTITY_NOT_FOUND);
   rval = opts.match_option("PARALLEL", "READ_PART");
   isParallel = (rval != MB_ENTITY_NOT_FOUND);
-  rval = opts.get_null_option("TRIVIAL_PARTITION");
-  isParallel = (rval != MB_ENTITY_NOT_FOUND);
+  if (ucdMesh)
+  {
+    rval = opts.get_null_option("TRIVIAL_PARTITION");
+    isParallel = (rval != MB_ENTITY_NOT_FOUND);
+  }
 
-
   if (!isParallel) 
       // return success here, since rval still has _NOT_FOUND from not finding option
     return MB_SUCCESS;