[MOAB-dev] r3932 - in MOAB/trunk: src src/io test/io

[tautges at mcs.anl.gov]

Author: tautges
Date: 2010-05-20 17:25:37 -0500 (Thu, 20 May 2010)
New Revision: 3932

Added:
   MOAB/trunk/test/io/ccmio_test.cpp
Modified:
   MOAB/trunk/src/ReaderWriterSet.cpp
   MOAB/trunk/src/io/ReadCCMIO.cpp
   MOAB/trunk/src/io/ReadCCMIO.hpp
   MOAB/trunk/src/io/WriteCCMIO.cpp
   MOAB/trunk/src/io/WriteCCMIO.hpp
   MOAB/trunk/test/io/Makefile.am
Log:
Some updates to the CCMIO writer, and adding a ccmio test (only compiled
if you've got the ccmio libs, so shouldn't affect anybody else).



Modified: MOAB/trunk/src/ReaderWriterSet.cpp
===================================================================
--- MOAB/trunk/src/ReaderWriterSet.cpp	2010-05-20 21:33:53 UTC (rev 3931)
+++ MOAB/trunk/src/ReaderWriterSet.cpp	2010-05-20 22:25:37 UTC (rev 3932)
@@ -49,8 +49,8 @@
 #endif
 
 #ifdef CCMIO_FILE
+#  include "ReadCCMIO.hpp"
 #  include "WriteCCMIO.hpp"
-#  include "ReadCCMIO.hpp"
 #endif
 
 #ifdef HDF5_FILE

Modified: MOAB/trunk/src/io/ReadCCMIO.cpp
===================================================================
--- MOAB/trunk/src/io/ReadCCMIO.cpp	2010-05-20 21:33:53 UTC (rev 3931)
+++ MOAB/trunk/src/io/ReadCCMIO.cpp	2010-05-20 22:25:37 UTC (rev 3932)
@@ -70,9 +70,7 @@
 #define CHKERR(a, b)                                 \
     {if (MB_SUCCESS != a) {if (b) readMeshIface->report_error(b); return a;}}
 
-#define CHKCCMERR(a, b)                                 \
-    {if (kCCMIONoErr != a) {if (b) readMeshIface->report_error(b); return MB_FAILURE;}}
-  
+#define CHKCCMERR(a, b) {if (kCCMIONoErr != a && kCCMIONoFileErr != a && kCCMIONoNodeErr != a) {if (b) readMeshIface->report_error(b); return MB_FAILURE;}}
 
 ReaderIface* ReadCCMIO::factory( Interface* iface )
 { return new ReadCCMIO( iface ); }
@@ -161,18 +159,11 @@
   CHKERR(rval,NULL);
 
     // get processors
-  std::set<CCMIOSize_t> procs;
-  rval = get_processors(stateID, processorID, procs);
-  CHKERR(rval,NULL);
-
-  std::set<CCMIOSize_t>::iterator sit;
   Range new_ents, *new_ents_ptr = NULL;
   if (file_set) new_ents_ptr = &new_ents;
   
-  for (sit = procs.begin(); sit != procs.end(); sit++) {
-    rval = read_processor(stateID, problemID, processorID, *sit, new_ents_ptr);
-    CHKERR(rval,NULL);
-  }
+  rval = read_mesh(stateID, problemID, processorID, new_ents_ptr);
+  CHKERR(rval,NULL);
 
     // load some meta-data
   rval = load_metadata(rootID, problemID, file_set);