[MOAB-dev] r5629 - in MOAB/trunk: doc src/io

[hayes6 at mcs.anl.gov]

Author: hayes6
Date: 2012-07-10 14:09:14 -0500 (Tue, 10 Jul 2012)
New Revision: 5629

Modified:
   MOAB/trunk/doc/metadata_info.doc
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/io/ReadNC.hpp
Log:
updated HOMME NC data reader for unstructured meshes, support for parallel reading with element based partition

Modified: MOAB/trunk/doc/metadata_info.doc
===================================================================
(Binary files differ)

Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2012-07-09 20:29:06 UTC (rev 5628)
+++ MOAB/trunk/src/io/ReadNC.cpp	2012-07-10 19:09:14 UTC (rev 5629)
@@ -125,6 +125,7 @@
 
   // Open the file
   dbgOut.tprintf(1, "Opening file %s\n", file_name);
+  fileName = std::string(file_name);
   int success;
   
 #ifdef PNETCDF_FILE
@@ -229,7 +230,7 @@
   }
   else if (!nomesh) {
     if (ucdMesh) 
-      rval = create_ucd_verts_hexes(opts, tmp_set, quads);
+      rval = create_ucd_verts_quads(opts, tmp_set, quads);
     else
       rval = create_verts_quads(scdi, tmp_set, quads);
     ERRORR(rval, "Trouble creating vertices.");
@@ -245,17 +246,29 @@
     rval = read_variables(tmp_set, dimNames, tstep_nums);
     if (MB_FAILURE == rval) return rval;
   }
-  
+ 
 #ifdef USE_MPI
     // create partition set, and populate with elements
   if (isParallel) {
     EntityHandle partn_set;
     rval = mbImpl->create_meshset(MESHSET_SET, partn_set);
     ERRORR(rval, "Trouble creating partition set.");
+
+    Range verts;
+    mbImpl->get_entities_by_type(0, MBVERTEX, verts);
+    mbImpl->add_entities(partn_set,quads);
+    mbImpl->add_entities(partn_set,verts);
     myPcomm->partition_sets().insert(partn_set);
     rval = mbImpl->add_entities(partn_set, quads);
-    ERRORR(rval, "Couldn't add new hexes to partition set.");
+    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");
+    //TODO print which procs own which verts, check global number of verts