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

[tautges at mcs.anl.gov]

Author: tautges
Date: 2012-10-30 10:20:17 -0500 (Tue, 30 Oct 2012)
New Revision: 5841

Modified:
   MOAB/trunk/src/io/ReadNC.cpp
   MOAB/trunk/src/io/ReadNC.hpp
   MOAB/trunk/tools/mbcoupler/Coupler.cpp
   MOAB/trunk/tools/mbcoupler/Coupler.hpp
Log:
Backing up some changes in ReadNC towards an option to create coarse,
  true spectral elements, instead of fine linear hexes from a spectral mesh.

In Coupler, some fixes for locate_points that I'd made some time back but
  hadn't committed.

Passes make check, serial and parallel.



Modified: MOAB/trunk/src/io/ReadNC.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNC.cpp	2012-10-30 05:50:06 UTC (rev 5840)
+++ MOAB/trunk/src/io/ReadNC.cpp	2012-10-30 15:20:17 UTC (rev 5841)
@@ -34,8 +34,9 @@
 
 ReadNC::ReadNC(Interface* impl) :
   mbImpl(impl), CPU_WORD_SIZE(-1), IO_WORD_SIZE(-1), fileId(-1), tMin(-1), tMax(-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), isParallel(false), partMethod(-1), ucdMesh(false), npMesh(false)
+  jCDim(-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), camType(NOT_CAM), isCf(false),
+  spectralOrder(-1), npMesh(false)
 
 #ifdef USE_MPI
 , myPcomm(NULL)
@@ -80,8 +81,6 @@
   dbgOut = stderr;
   mCurrentMeshHandle = 0;
   vertexOffset = 0;
-  ucdMesh = false;
-  npMesh = false;
 
 #ifdef USE_MPI
   myPcomm = NULL;
@@ -112,9 +111,9 @@
       return rval;
   }
 
-  bool nomesh = false, novars = false;
+  bool nomesh = false, novars = false, spectral_mesh = false;
   std::string partition_tag_name;
-  rval = parse_options(opts, var_names, tstep_nums, tstep_vals, nomesh, novars, partition_tag_name);
+  rval = parse_options(opts, var_names, tstep_nums, tstep_vals, nomesh, novars, spectral_mesh, partition_tag_name);
   ERRORR(rval, "Trouble parsing option string.");
 
   // Open the file
@@ -155,27 +154,6 @@
   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");
-  }
-  else
-    attname = std::string("conventions");
-  if (attIt == globalAtts.end())