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

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-08-12 13:10:59 -0500 (Thu, 12 Aug 2010)
New Revision: 4086

Added:
   MOAB/trunk/test/h5file/rocket_ents_in_assm.h5m
Modified:
   MOAB/trunk/src/io/ReadHDF5.cpp
   MOAB/trunk/test/h5file/Makefile.am
   MOAB/trunk/test/h5file/h5sets_test.cpp
Log:
fix bug in HDF5 reader and check in regression test that demonstrated the bug

Modified: MOAB/trunk/src/io/ReadHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/ReadHDF5.cpp	2010-08-12 17:47:20 UTC (rev 4085)
+++ MOAB/trunk/src/io/ReadHDF5.cpp	2010-08-12 18:10:59 UTC (rev 4086)
@@ -3474,8 +3474,8 @@
       continue;
     if (id < it->begin)
       id = it->begin;
-    const long off = id - it->begin;
     while (id < end) {
+      const long off = id - it->begin;
       long count = std::min( it->count - off,  end - id );
       merge.insert( it->value + off, it->value + off + count - 1 );
       id += count;

Modified: MOAB/trunk/test/h5file/Makefile.am
===================================================================
--- MOAB/trunk/test/h5file/Makefile.am	2010-08-12 17:47:20 UTC (rev 4085)
+++ MOAB/trunk/test/h5file/Makefile.am	2010-08-12 18:10:59 UTC (rev 4086)
@@ -1,4 +1,4 @@
-EXTRA_DIST = v3_dodec.h5m
+EXTRA_DIST = v3_dodec.h5m rocket_ents_in_assm.h5m
 
 AM_CPPFLAGS += -DSRCDIR=$(srcdir) \
                -I.. -I$(srcdir)/.. \

Modified: MOAB/trunk/test/h5file/h5sets_test.cpp
===================================================================
--- MOAB/trunk/test/h5file/h5sets_test.cpp	2010-08-12 17:47:20 UTC (rev 4085)
+++ MOAB/trunk/test/h5file/h5sets_test.cpp	2010-08-12 18:10:59 UTC (rev 4086)
@@ -1,6 +1,6 @@
 #include "moab/Core.hpp"
+#include "moab/Range.hpp"
 #include "TestUtil.hpp"
-#include "moab/Range.hpp"
 
 #include <algorithm>
 #include <iostream>
@@ -10,6 +10,10 @@
 
 using namespace moab;
 
+#ifndef SRCDIR
+#  define SRCDIR .
+#endif
+
 const char filename[] = "sets.h5m";
 bool keep_file = false;
 
@@ -300,6 +304,9 @@