[MOAB-dev] r5562 - MOAB/branches/nc_to_2.5d/src/io

[xbxu at mcs.anl.gov]

Author: xbxu
Date: 2012-06-12 13:04:08 -0500 (Tue, 12 Jun 2012)
New Revision: 5562

Modified:
   MOAB/branches/nc_to_2.5d/src/io/ReadNC.cpp
   MOAB/branches/nc_to_2.5d/src/io/ReadNC.hpp
Log:
read variables to the correct location except variables to be put on edges

Modified: MOAB/branches/nc_to_2.5d/src/io/ReadNC.cpp
===================================================================
--- MOAB/branches/nc_to_2.5d/src/io/ReadNC.cpp	2012-06-12 16:30:19 UTC (rev 5561)
+++ MOAB/branches/nc_to_2.5d/src/io/ReadNC.cpp	2012-06-12 18:04:08 UTC (rev 5562)
@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <cmath>
+#include <cstdlib>
 #include <iostream>
 #include <sstream>
 #include <map>
@@ -30,7 +31,7 @@
 ReadNC::ReadNC(Interface* impl)
         : mbImpl(impl), CPU_WORD_SIZE(-1), IO_WORD_SIZE(-1), fileId(-1), 
           tMin(-1), tMax(-1),
-          iDim(-1), jDim(-1), kDim(-1), tDim(-1), iCDim(-1), jCDim(-1), kCDim(-1), 
+	  iDim(-1), jDim(-1), tDim(-1), iCDim(-1), jCDim(-1),
 	  numUnLim(-1), mCurrentMeshHandle(0),
           startVertex(0), startElem(0), mGlobalIdTag(0), 
           max_line_length(-1), max_str_length(-1), vertexOffset(0), dbgOut(stderr),
@@ -64,8 +65,8 @@
     lCDims[i] = -1;
   }
   
-  iDim = jDim = kDim = tDim = -1;
-  iCDim = jCDim = kCDim = -1;
+  iDim = jDim = tDim = -1;
+  iCDim = jCDim = -1;
   numUnLim = -1;
   mCurrentMeshHandle = 0;
   startVertex = startElem = 0;
@@ -216,10 +217,9 @@
   }
   ERRORR(rval, "Trouble initializing mesh values.");
 
-  int tlDims2 = lDims[2];
-  int tlDims5 = lDims[5];
-  lDims[2] = lDims[5] = -1;
-  
+  // FIXME: should remove when gDims[2] and gDims[5] is unset at line 1112/1441
+  lDims[2]=lDims[5]=-1;
+
     // Create mesh vertex/quads sequences
   Range quads;
   if (nomesh && !novars) {
@@ -234,9 +234,6 @@
     ERRORR(rval, "Trouble creating vertices.");
   }
 
-  lDims[2] = tlDims2;