Merge branch '1.99' of gitorious.psi.ch:h5hut/src into 1.99

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([H5hut], [1.99.14], [h5part@lists.psi.ch], H5hut)
+AC_INIT([H5hut], [1.99.13], [h5part@lists.psi.ch], H5hut)
 AC_PREREQ(2.60)
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_MACRO_DIR([m4])

src/h5core/h5_hdf5_private.h

@@ -925,7 +925,6 @@ hdf5_set_fapl_mpio_property (
 	HDF5_WRAPPER_RETURN (H5_SUCCESS);
 }
 
-#if H5_VERSION_LE(1,8,12)
 static inline h5_err_t
 hdf5_set_fapl_mpiposix_property (
 	hid_t fapl_id,
@@ -943,7 +942,6 @@ hdf5_set_fapl_mpiposix_property (
 				" the file access property list."));
 	HDF5_WRAPPER_RETURN (H5_SUCCESS);
 }
-#endif
 
 static inline h5_err_t
 hdf5_set_dxpl_mpio_property (

src/h5core/h5_openclose.c

@@ -139,14 +139,11 @@ h5_err_t mpi_init (
 	TRY (f->access_prop = hdf5_create_property(H5P_FILE_ACCESS));
 
 	/* select the HDF5 VFD */
-#if H5_VERSION_LE(1,8,12)
 	if (f->mode & H5_VFD_MPIPOSIX) {
 		h5_info("Selecting MPI-POSIX VFD");
 		hbool_t use_gpfs = 0; // TODO autodetect GPFS?
 		TRY (hdf5_set_fapl_mpiposix_property(f->access_prop, comm, use_gpfs));
-	} else
-#endif
-	{
+	} else {
 		h5_info("Selecting MPI-IO VFD");
 		TRY (hdf5_set_fapl_mpio_property(f->access_prop, comm, MPI_INFO_NULL));
 		if (f->mode & H5_VFD_INDEPENDENT) {

src/h5core/h5_readwrite.c

@@ -292,11 +292,7 @@ h5_set_throttle (
 	const int factor
 	) {
 	H5_CORE_API_ENTER (h5_err_t, "f=%p, factor=%d", f, factor);
-#if H5_VERSION_LE(1,8,12)
 	if ( (f->mode & H5_VFD_INDEPENDENT) || (f->mode & H5_VFD_MPIPOSIX) ) {
-#else
-	if (f->mode & H5_VFD_INDEPENDENT) {
-#endif
 		f->throttle = factor;
 		h5_info ("Throttling enabled with factor = %d", f->throttle );
 	} else {

src/h5core/h5b_model.c

@@ -547,8 +547,8 @@ h5b_3d_set_view (
 	p->k_end =   k_end;
 	_normalize_partition(p);
 
-	h5b_fdata_t *b = f->b;
 #ifdef PARALLEL_IO
+	h5b_fdata_t *b = f->b;
 	h5b_partition_t *user_layout;
 	h5b_partition_t *write_layout;
 
@@ -565,6 +565,7 @@ h5b_3d_set_view (
 	TRY( _dissolve_ghostzones(f, user_layout, write_layout) );
 	b->user_layout[0] = user_layout[f->myproc];
 	b->write_layout[0] = write_layout[f->myproc];
+	b->have_layout = 1;
 
 	p = b->user_layout;
 	h5_debug (
@@ -586,9 +587,9 @@ h5b_3d_set_view (
 
 	h5_free(user_layout);
 	h5_free(write_layout);
-#endif
+
 	TRY( h5bpriv_release_hyperslab(f) );
-	b->have_layout = 1;
+#endif
 
 	H5_CORE_API_RETURN (H5_SUCCESS);
 }

src/h5core/h5b_readwrite.c

@@ -9,8 +9,7 @@ _select_hyperslab_for_writing (
 	/*
 	  re-use existing hyperslab
 	*/
-	if ( f->b->shape >= 0 )
-		H5_PRIV_FUNC_LEAVE (H5_SUCCESS);
+	if ( f->b->shape >= 0 ) return H5_SUCCESS;
 
 	h5b_fdata_t *b = f->b;
 	h5b_partition_t *p = b->write_layout;

src/include/H5.h

@@ -28,8 +28,7 @@ extern "C" {
 
   You can also select a "virtual file driver" in the HDF5 layer using:
   - H5_VFD_INDEPENDENT: MPI-IO in independent (asynchronous) mode
-  - H5_VFD_MPIPOSIX: parallel I/O implemented directly by HDF5, bypassing
-    MPI-IO (only for hdf5 <= 1.8.12)
+  - H5_VFD_MPIPOSIX: parallel I/O implemented directly by HDF5, bypassing MPI-IO
 
   \return File handle.
   \return NULL on error.

tools/vtk2h5grid/vtk2h5grid.cc

@@ -53,6 +53,7 @@ usage (
         std::cout << "                    default is yes" << std::endl;
         std::cout << "  --(no-)volume     do (not) convert volume mesh." << std::endl;
         std::cout << "                    default is no" << std::endl;
+        std::cout << "  --shift x,y,z     shift all points by x,y,z" << std::endl;
         std::cout << std::endl;
         exit (1);
 }