[MOAB-dev] r4236 - in MOAB/trunk: MeshFiles/unittest/io src/io test/io

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-10-22 13:53:00 -0500 (Fri, 22 Oct 2010)
New Revision: 4236

Added:
   MOAB/trunk/MeshFiles/unittest/io/hex_2x2x2_ss.exo
Modified:
   MOAB/trunk/MeshFiles/unittest/io/Makefile.am
   MOAB/trunk/src/io/ReadNCDF.cpp
   MOAB/trunk/test/io/exodus_test.cc
Log:
incorporate fixes from Rao Garimella for exodus files with alternate coordinate format and exodus files w/out elem_map

Modified: MOAB/trunk/MeshFiles/unittest/io/Makefile.am
===================================================================
--- MOAB/trunk/MeshFiles/unittest/io/Makefile.am	2010-10-22 16:45:02 UTC (rev 4235)
+++ MOAB/trunk/MeshFiles/unittest/io/Makefile.am	2010-10-22 18:53:00 UTC (rev 4236)
@@ -4,6 +4,7 @@
 	     cubtest12.cub \
 	     cubtest.jou \
 	     gmsh2.msh \
+	     hex_2x2x2_ss.exo \
              ho_test.g \
              ho_test.cub \
              test.cub \

Added: MOAB/trunk/MeshFiles/unittest/io/hex_2x2x2_ss.exo
===================================================================
(Binary files differ)


Property changes on: MOAB/trunk/MeshFiles/unittest/io/hex_2x2x2_ss.exo
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: MOAB/trunk/src/io/ReadNCDF.cpp
===================================================================
--- MOAB/trunk/src/io/ReadNCDF.cpp	2010-10-22 16:45:02 UTC (rev 4235)
+++ MOAB/trunk/src/io/ReadNCDF.cpp	2010-10-22 18:53:00 UTC (rev 4236)
@@ -430,7 +430,6 @@
  
 ErrorCode ReadNCDF::read_nodes(const Tag* file_id_tag)
 {
-
     // read the nodes into memory
 
   assert(NULL != ncFile);
@@ -446,46 +445,49 @@
   vertexOffset = ID_FROM_HANDLE( node_handle ) - MB_START_ID;
 
   // read in the coordinates
-  NcBool status;
-  NcVar *coords = ncFile->get_var("coord");
-  if (NULL == coords || !coords->is_valid()) {
-    readMeshIface->report_error("ReadNCDF:: Problem getting coords variable.");
-    return MB_FAILURE;
-  }
-  status = coords->get(arrays[0], 1, numberNodes_loading);
-  if (0 == status) {
-    readMeshIface->report_error("ReadNCDF:: Problem getting x coord array.");
-    return MB_FAILURE;
-  }
-  status = coords->set_cur(1, 0);