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

[xbxu at mcs.anl.gov]

Author: xbxu
Date: 2012-07-02 11:11:30 -0500 (Mon, 02 Jul 2012)
New Revision: 5623

Modified:
   MOAB/trunk/src/io/ReadNC.cpp
Log:
fix the nc reader for fv grid

Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2012-07-02 03:29:06 UTC (rev 5622)
+++ MOAB/trunk/src/io/ReadNC.cpp	2012-07-02 16:11:30 UTC (rev 5623)
@@ -221,9 +221,6 @@
   }
   ERRORR(rval, "Trouble initializing mesh values.");
 
-  // FIXME: compute partition will set lDims[2] and lDims[5] to 0 when they equal to -1
-  lDims[2]=lDims[5]=-1;
-
     // Create mesh vertex/quads sequences
   Range quads;
   if (nomesh && !novars) {
@@ -1393,11 +1390,7 @@
   gDims[4] = dimVals[idx]-1+2; // add 2 for the pole points
   gDims[1] = 0;
   jName = dimNames[idx];
-  
-  // get_neighbor_sqij has errors when setting both equals -1;
-  // should remove when that is fixed
-  gDims[2] = 0; gDims[5] = 20;
-  
+    
   // look for names of center i/j dimensions
   if ((vit = std::find(dimNames.begin(), dimNames.end(), "lon")) != dimNames.end()) 
     idx = vit-dimNames.begin();
@@ -1443,14 +1436,9 @@
   tMin = 0;
   tName = dimNames[idx];
 
-    // initialize parameter bounds
-  std::copy(gDims, gDims+6, lDims);
-  
-    // initialize globally periodic based on file info
-
-    // parse options to get subset
+  // parse options to get subset
+  if (isParallel) {
 #ifdef USE_MPI
-  if (isParallel) {
     for (int i = 0; i < 6; i++) parData.gDims[i] = gDims[i];
     for (int i = 0; i < 3; i++) parData.gPeriodic[i] = globallyPeriodic[i];
     parData.partMethod = partMethod;
@@ -1467,31 +1455,50 @@
                    gDims[3]-gDims[0]+1, gDims[4]-gDims[1]+1);
     if (myPcomm->proc_config().proc_rank() == 0) 
       dbgOut.tprintf(1, "Contiguous chunks of size %d bytes.\n", 8*(lDims[3]-lDims[0]+1)*(lDims[4]-lDims[1]+1));
+#endif
   }
-#endif