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

[xbxu at mcs.anl.gov]

Author: xbxu
Date: 2012-06-07 09:45:53 -0500 (Thu, 07 Jun 2012)
New Revision: 5552

Modified:
   MOAB/branches/nc_to_2.5d/src/io/ReadNC.cpp
   MOAB/branches/nc_to_2.5d/src/io/ReadNC.hpp
Log:
change the current nc reader to 2.5d representation, work in progress

Modified: MOAB/branches/nc_to_2.5d/src/io/ReadNC.cpp
===================================================================
--- MOAB/branches/nc_to_2.5d/src/io/ReadNC.cpp	2012-06-05 22:19:22 UTC (rev 5551)
+++ MOAB/branches/nc_to_2.5d/src/io/ReadNC.cpp	2012-06-07 14:45:53 UTC (rev 5552)
@@ -30,10 +30,11 @@
 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), numUnLim(-1), mCurrentMeshHandle(0),
+          iDim(-1), jDim(-1), kDim(-1), tDim(-1), iCDim(-1), jCDim(-1), kCDim(-1), 
+	  numUnLim(-1), mCurrentMeshHandle(0),
           startVertex(0), startElem(0), mGlobalIdTag(0), 
           max_line_length(-1), max_str_length(-1), vertexOffset(0), dbgOut(stderr),
-          isParallel(false), partMethod(-1), ucdMesh(false)
+          isParallel(false), partMethod(-1), ucdMesh(false), iPeriodic(false)
 #ifdef USE_MPI
         , myPcomm(NULL)
 #endif
@@ -43,6 +44,8 @@
   for (unsigned int i = 0; i < 6; i++) {
     gDims[i] = -1;
     lDims[i] = -1;
+    gCDims[i] = -1;
+    lCDims[i] = -1;
   }
     
   impl->query_interface(readMeshIface);
@@ -57,9 +60,12 @@
   for (unsigned int i = 0; i < 6; i++) {
     gDims[i] = -1;
     lDims[i] = -1;
+    gCDims[i] = -1;
+    lCDims[i] = -1;
   }
   
   iDim = jDim = kDim = tDim = -1;
+  iCDim = jCDim = kCDim = -1;
   numUnLim = -1;
   mCurrentMeshHandle = 0;
   startVertex = startElem = 0;
@@ -131,6 +137,28 @@
   rval = read_header();
   ERRORR(rval, " ");
 
+  // check if CF convention is being followed
+  std::string attname;
+  std::map<std::string,AttData>::iterator attIt = globalAtts.find("conventions");
+  if (attIt == globalAtts.end()) {
+    attIt = globalAtts.find("Conventions");
+    attname = std::string("Conventions");
+  }