[MOAB-dev] r5788 - in MOAB/trunk: src/io test/parallel

[iulian at mcs.anl.gov]

Author: iulian
Date: 2012-10-11 14:41:14 -0500 (Thu, 11 Oct 2012)
New Revision: 5788

Modified:
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/test/parallel/Makefile.am
   MOAB/trunk/test/parallel/ucdtrvpart.cpp
Log:
activate back the ucd trivial partition test
comment out debug resolve sharing for ucd mesh, it should be triggered by option
(as usual, PARALLEL_RESOLVE_SHARED_ENTS)
test read_nc in parallel, too, in the test/parallel folder


Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2012-10-11 18:30:02 UTC (rev 5787)
+++ MOAB/trunk/src/io/ReadNC.cpp	2012-10-11 19:41:14 UTC (rev 5788)
@@ -280,7 +280,7 @@
     rval = mbImpl->add_entities(partn_set, quads);
     ERRORR(rval, "Couldn't add new quads to partition set.");
 
-#ifndef NDEBUG
+#if  0
     if (ucdMesh && !novars)
     {
       Range verts_owned;

Modified: MOAB/trunk/test/parallel/Makefile.am
===================================================================
--- MOAB/trunk/test/parallel/Makefile.am	2012-10-11 18:30:02 UTC (rev 5787)
+++ MOAB/trunk/test/parallel/Makefile.am	2012-10-11 19:41:14 UTC (rev 5788)
@@ -40,8 +40,7 @@
 endif
 
 if PNETCDF_FILE
-  PNETCDF_TESTS = 
-#    ucdtrvpart 
+  PNETCDF_TESTS =  ucdtrvpart read_nc_par
 #    ucdnodpart
 else
   PNETCDF_TESTS = 
@@ -62,8 +61,10 @@
 structured3_SOURCES = structured3.cpp
 parmerge_SOURCES = parmerge.cpp
 scdpart_SOURCES = scdpart.cpp
-# ucdtrvpart_SOURCES = ucdtrvpart.cpp
-# ucdnodpart_SOURCES = ucdnodpart.cpp
-
+if PNETCDF_FILE
+  ucdtrvpart_SOURCES = ucdtrvpart.cpp
+  read_nc_par_SOURCES=../io/read_nc.cpp
+  # ucdnodpart_SOURCES = ucdnodpart.cpp
+endif
 # Other files to clean up (e.g. output from tests)
 MOSTLYCLEANFILES = mhdf_ll.h5m tmp0.h5m tmp1.h5m tmp2.h5m tmp3.h5m

Modified: MOAB/trunk/test/parallel/ucdtrvpart.cpp
===================================================================
--- MOAB/trunk/test/parallel/ucdtrvpart.cpp	2012-10-11 18:30:02 UTC (rev 5787)
+++ MOAB/trunk/test/parallel/ucdtrvpart.cpp	2012-10-11 19:41:14 UTC (rev 5788)
@@ -31,7 +31,7 @@
 
 void test_read_parallel_ucd_trivial()
 {