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

[xbxu at mcs.anl.gov]

Author: xbxu
Date: 2012-06-13 09:17:37 -0500 (Wed, 13 Jun 2012)
New Revision: 5572

Modified:
   MOAB/branches/nc_to_2.5d/src/io/ReadNC.cpp
   MOAB/branches/nc_to_2.5d/src/io/ReadNC.hpp
Log:
minor bug fixes

Modified: MOAB/branches/nc_to_2.5d/src/io/ReadNC.cpp
===================================================================
--- MOAB/branches/nc_to_2.5d/src/io/ReadNC.cpp	2012-06-12 21:06:16 UTC (rev 5571)
+++ MOAB/branches/nc_to_2.5d/src/io/ReadNC.cpp	2012-06-13 14:17:37 UTC (rev 5572)
@@ -223,7 +223,7 @@
     // Create mesh vertex/quads sequences
   Range quads;
   if (nomesh && !novars) {
-    rval = check_verts_hexes(tmp_set);
+    rval = check_verts_quads(tmp_set);
     ERRORR(rval, "Mesh characteristics didn't match from last read.\n");
   }
   else if (!nomesh) {
@@ -359,7 +359,7 @@
   return MB_SUCCESS;
 }
     
-ErrorCode ReadNC::check_verts_hexes(EntityHandle file_set) 
+ErrorCode ReadNC::check_verts_quads(EntityHandle file_set) 
 {
     // check parameters on this read against what was on the mesh from last read
     // get the number of vertices 
@@ -752,8 +752,8 @@
   // get quads in set
   Range quads;
   rval = mbImpl->get_entities_by_dimension(file_set, 2, quads);
-  ERRORR(rval, "Trouble getting vertices in set.");
-  assert("Should only have a single vertex subrange, since they were read in one shot" &&
+  ERRORR(rval, "Trouble getting quads in set.");
+  assert("Should only have a single quad subrange, since they were read in one shot" &&
 	 quads.psize() == 1);
   //quads_handles.resize(quads.size());
   //std::copy(quads.begin(), quads.end(), quads_handles.begin());
@@ -1636,6 +1636,8 @@
     case NC_BYTE:
     case NC_CHAR:
     case NC_DOUBLE:
+      data_type = MB_TYPE_DOUBLE;
+      break;
     case NC_FLOAT:
       data_type = MB_TYPE_DOUBLE;
       break;
@@ -1972,6 +1974,8 @@
     case NC_BYTE:
     case NC_CHAR:
     case NC_DOUBLE:
+      data_type = MB_TYPE_DOUBLE;
+      break;
     case NC_FLOAT:
       data_type = MB_TYPE_DOUBLE;
       break;