incorporated fixes from Gunther for 1.6.0 release

src/H5MultiBlockReadWrite.c

@@ -10,8 +10,11 @@
 #include "H5MultiBlockErrors.h"
 #include "H5MultiBlockPrivate.h"
 
+#ifdef PARALLEL_IO
+
+
 /*!
-  \ingroup h5multiblock_write
+  \ingroup h5multiblock_data
 
   Write a multiblock field \c name from the buffer starting at \c data
   to the current time-step using the defined block decomposition and dimensions.
@@ -39,7 +42,7 @@ H5MultiBlock3dWriteFieldFloat64 (
 }
 
 /*!
-  \ingroup h5multiblock_read
+  \ingroup h5multiblock_data
 
   Allocate a buffer to hold a block from a multiblock field and place the
   pointer in \c data, then read the block into the buffer. Uses the block
@@ -68,7 +71,7 @@ H5MultiBlock3dReadFieldFloat64 (
 }
 
 /*!
-  \ingroup h5multiblock_write
+  \ingroup h5multiblock_data
 
   Write a multiblock field \c name from the buffer starting at \c data
   to the current time-step using the defined block decomposition and dimensions.
@@ -96,7 +99,7 @@ H5MultiBlock3dWriteFieldFloat32 (
 }
 
 /*!
-  \ingroup h5multiblock_read
+  \ingroup h5multiblock_data
 
   Allocate a buffer to hold a block from a multiblock field and place the
   pointer in \c data, then read the block into the buffer. Uses the block
@@ -125,7 +128,7 @@ H5MultiBlock3dReadFieldFloat32 (
 }
 
 /*!
-  \ingroup h5multiblock_write
+  \ingroup h5multiblock_data
 
   Write a multiblock field \c name from the buffer starting at \c data
   to the current time-step using the defined block decomposition and dimensions.
@@ -153,7 +156,7 @@ H5MultiBlock3dWriteFieldInt64 (
 }
 
 /*!
-  \ingroup h5multiblock_read
+  \ingroup h5multiblock_data
 
   Allocate a buffer to hold a block from a multiblock field and place the
   pointer in \c data, then read the block into the buffer. Uses the block
@@ -182,7 +185,7 @@ H5MultiBlock3dReadFieldInt64 (
 }
 
 /*!
-  \ingroup h5multiblock_write
+  \ingroup h5multiblock_data
 
   Write a multiblock field \c name from the buffer starting at \c data
   to the current time-step using the defined block decomposition and dimensions.
@@ -210,7 +213,7 @@ H5MultiBlock3dWriteFieldInt32 (
 }
 
 /*!
-  \ingroup h5multiblock_read
+  \ingroup h5multiblock_data
 
   Allocate a buffer to hold a block from a multiblock field and place the
   pointer in \c data, then read the block into the buffer. Uses the block
@@ -237,3 +240,5 @@ H5MultiBlock3dReadFieldInt32 (
 
 	return H5PART_SUCCESS;
 }
+
+#endif // PARALLEL_IO

src/H5Part.c

@@ -1940,8 +1940,9 @@ _H5Part_have_group (
 #ifndef H5_USE_16_API
 	return (H5Lexists( id, name, H5P_DEFAULT ) ? 1 : 0);
 #else
+	herr_t exists = 0;
 	H5E_BEGIN_TRY
-	herr_t exists = H5Gget_objinfo( id, name, 1, NULL );
+	H5Gget_objinfo( id, name, 1, NULL );
 	H5E_END_TRY
 	return (exists >= 0 ? 1 : 0);
 #endif

src/H5Part.h

@@ -99,6 +99,10 @@ H5PartCloseFile (
 	H5PartFile *f
 	);
 
+h5part_int64_t
+H5PartFileIsValid (
+	H5PartFile *f
+	);
 
 /*============== File Writing Functions ==================== */
 h5part_int64_t

src/generate-h5multi-readwrite.py

@@ -11,6 +11,13 @@ c_head = """
 
 #include "H5MultiBlockErrors.h"
 #include "H5MultiBlockPrivate.h"
+
+#ifdef PARALLEL_IO
+
+"""
+
+c_tail = """
+#endif // PARALLEL_IO
 """
 
 h_head = """
@@ -237,6 +244,7 @@ def write_calls():
 #	fcfile.write(create_call(read_fc,type,dim));
 #	fifile.write(create_call(write_fi,type,dim));
 #	fifile.write(create_call(read_fi,type,dim));
+  cfile.write(c_tail)
   cfile.close()
   hfile.write(h_tail)
   hfile.close()