[MOAB-dev] r5734 - in MOAB/trunk: src/io tools/mbcoupler tools/refiner

[tautges at mcs.anl.gov]

Author: tautges
Date: 2012-09-12 17:11:20 -0500 (Wed, 12 Sep 2012)
New Revision: 5734

Modified:
   MOAB/trunk/src/io/ReadDamsel.cpp
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/io/ReadNC.hpp
   MOAB/trunk/tools/mbcoupler/mbcoupler_test.cpp
   MOAB/trunk/tools/refiner/SplitVertices.cpp
   MOAB/trunk/tools/refiner/SplitVertices.hpp
   MOAB/trunk/tools/refiner/test_mesh_refiner.cpp
Log:
Fixed several things reading HOMME data.  Also removed several compiler 
warning-generating code.

Passes make check in serial and parallel.



Modified: MOAB/trunk/src/io/ReadDamsel.cpp
===================================================================
--- MOAB/trunk/src/io/ReadDamsel.cpp	2012-09-12 20:25:34 UTC (rev 5733)
+++ MOAB/trunk/src/io/ReadDamsel.cpp	2012-09-12 22:11:20 UTC (rev 5734)
@@ -90,12 +90,9 @@
                                   DAMSEL_HANDLE_TYPE_HANDLE32);
   
     // model attach - need model id from make model, filename
-  int proc_rank = 0, proc_size = 1;
 #ifdef USE_MPI
   MPI_Comm comm = MPI_COMM_WORLD;
   if (nativeParallel) {
-    proc_rank = myPcomm->proc_config().proc_rank();
-    proc_size = myPcomm->proc_config().proc_size();
     comm = myPcomm->proc_config().proc_comm();
   }
 #endif

Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2012-09-12 20:25:34 UTC (rev 5733)
+++ MOAB/trunk/src/io/ReadNC.cpp	2012-09-12 22:11:20 UTC (rev 5734)
@@ -978,9 +978,7 @@
       
       // set up the dimensions and counts
       // first time
-      if(!ucdMesh)
-        vdatas[i].readDims[t].push_back(tstep_nums[t]); //scd meshes take extra dimension
-
+      vdatas[i].readDims[t].push_back(tstep_nums[t]);
       vdatas[i].readCounts[t].push_back(1);
       
       // then z/y/x
@@ -993,9 +991,12 @@
 	{
 	case 0:
 	  // vertices
-	  vdatas[i].readDims[t].push_back(lDims[1]);
+              if (!ucdMesh) {
+                // only structured mesh has j parameter that multiplies i to get total # vertices
+                vdatas[i].readDims[t].push_back(lDims[1]);
+                vdatas[i].readCounts[t].push_back(lDims[4]-lDims[1]+1);
+              }
 	  vdatas[i].readDims[t].push_back(lDims[0]);
-	  vdatas[i].readCounts[t].push_back(lDims[4]-lDims[1]+1);
 	  vdatas[i].readCounts[t].push_back(lDims[3]-lDims[0]+1);
 	  assert(vdatas[i].readDims[t].size() == vdatas[i].varDims.size());
 	  range = &verts;
@@ -1416,14 +1417,16 @@
   for (unsigned int i = 0; i < vdatas.size(); i++) {
     for (unsigned int t = 0; t < tstep_nums.size(); t++) {