[MOAB-dev] r3950 - in MOAB/trunk/src: io io/mhdf/src parallel

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-05-25 10:02:33 -0500 (Tue, 25 May 2010)
New Revision: 3950

Modified:
   MOAB/trunk/src/io/WriteHDF5.cpp
   MOAB/trunk/src/io/WriteHDF5.hpp
   MOAB/trunk/src/io/mhdf/src/nodes.c
   MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp
Log:
fix bug in coordinate chunking code for h5m files, and add an string option to enable the capability

Modified: MOAB/trunk/src/io/WriteHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/WriteHDF5.cpp	2010-05-25 14:20:18 UTC (rev 3949)
+++ MOAB/trunk/src/io/WriteHDF5.cpp	2010-05-25 15:02:33 UTC (rev 3950)
@@ -307,6 +307,7 @@
     parallelWrite(false),
     collectiveIO(false),
     writeTagDense(false),
+    chunkNodes(false),
     writeProp( H5P_DEFAULT ),
     dbgOut("H5M ", stderr)
 {
@@ -386,6 +387,7 @@
   }
   
   writeTagDense = (MB_SUCCESS == opts.get_null_option("DENSE_TAGS"));
+  chunkNodes = (MB_SUCCESS == opts.get_null_option("CHUNK_NODES"));
     
 
   // Enable some extra checks for reads.  Note: amongst other things this
@@ -2177,7 +2179,7 @@
   if (nodeSet.range.size()) {
     nodeSet.total_num_ents = nodeSet.range.size();
     handle = mhdf_createNodeCoords( filePtr, dimension, nodeSet.total_num_ents,
-                                    &first_id, false, &status );
+                                    &first_id, chunkNodes, &status );
     CHK_MHDF_ERR_0(status);
     mhdf_closeData( filePtr, handle, &status );
     CHK_MHDF_ERR_0(status);

Modified: MOAB/trunk/src/io/WriteHDF5.hpp
===================================================================
--- MOAB/trunk/src/io/WriteHDF5.hpp	2010-05-25 14:20:18 UTC (rev 3949)
+++ MOAB/trunk/src/io/WriteHDF5.hpp	2010-05-25 15:02:33 UTC (rev 3950)
@@ -304,6 +304,8 @@
   bool collectiveIO;
   //! True if writing dense-formatted tag data
   bool writeTagDense;
+  //! True if using chunking in on-disk layout of node coordinate data
+  bool chunkNodes;
   
   //! Property set to pass to H5Dwrite calls. 
   //! For serial, should be H5P_DEFAULTS.

Modified: MOAB/trunk/src/io/mhdf/src/nodes.c
===================================================================
--- MOAB/trunk/src/io/mhdf/src/nodes.c	2010-05-25 14:20:18 UTC (rev 3949)
+++ MOAB/trunk/src/io/mhdf/src/nodes.c	2010-05-25 15:02:33 UTC (rev 3950)
@@ -23,6 +23,7 @@
 #include "util.h"
 #include "file-handle.h"