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

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2010-05-26 12:22:45 -0500 (Wed, 26 May 2010)
New Revision: 3960

Modified:
   MOAB/trunk/src/io/WriteHDF5.cpp
   MOAB/trunk/src/io/WriteHDF5.hpp
   MOAB/trunk/src/io/mhdf/include/mhdf.h
   MOAB/trunk/src/io/mhdf/src/nodes.c
   MOAB/trunk/src/parallel/WriteHDF5Parallel.cpp
Log:
revert HDF5 chunking for node coordinates

Modified: MOAB/trunk/src/io/WriteHDF5.cpp
===================================================================
--- MOAB/trunk/src/io/WriteHDF5.cpp	2010-05-25 21:54:21 UTC (rev 3959)
+++ MOAB/trunk/src/io/WriteHDF5.cpp	2010-05-26 17:22:45 UTC (rev 3960)
@@ -311,7 +311,6 @@
     parallelWrite(false),
     collectiveIO(false),
     writeTagDense(false),
-    chunkNodes(false),
     writeProp( H5P_DEFAULT ),
     dbgOut("H5M ", stderr)
 {
@@ -391,7 +390,6 @@
   }
   
   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
@@ -2206,7 +2204,7 @@
   if (nodeSet.range.size()) {
     nodeSet.total_num_ents = nodeSet.range.size();
     handle = mhdf_createNodeCoords( filePtr, dimension, nodeSet.total_num_ents,
-                                    &first_id, chunkNodes, &status );
+                                    &first_id, &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 21:54:21 UTC (rev 3959)
+++ MOAB/trunk/src/io/WriteHDF5.hpp	2010-05-26 17:22:45 UTC (rev 3960)
@@ -304,8 +304,6 @@
   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/include/mhdf.h
===================================================================
--- MOAB/trunk/src/io/mhdf/include/mhdf.h	2010-05-25 21:54:21 UTC (rev 3959)
+++ MOAB/trunk/src/io/mhdf/include/mhdf.h	2010-05-26 17:22:45 UTC (rev 3960)
@@ -476,11 +476,6 @@
  * \param first_node_id_out  Nodes are assigned IDs sequentially in the
  *             order they occur in the table, where the ID of the first