- re-organize file hierarchy

- years in copyright changed

src/C/Makefile.am

@@ -1,6 +1,5 @@
 
 if ENABLE_C
-# Header files that I wish to install in $(prefix)/include
 include_HEADERS =					\
 	$(top_srcdir)/src/include/H5Block_attribs.h	\
 	$(top_srcdir)/src/include/H5Block_io.h		\
@@ -12,6 +11,7 @@ include_HEADERS =					\
 	$(top_srcdir)/src/include/H5Fed_tags.h		\
 	$(top_srcdir)/src/include/H5Part_io.h		\
 	$(top_srcdir)/src/include/H5Part_model.h	\
+	$(top_srcdir)/src/include/H5_attachments.h	\
 	$(top_srcdir)/src/include/H5_debug.h		\
 	$(top_srcdir)/src/include/H5_error.h		\
 	$(top_srcdir)/src/include/H5_file.h		\
@@ -21,7 +21,6 @@ include_HEADERS =					\
 	$(top_srcdir)/src/include/H5_step_attribs.h	\
 	$(top_srcdir)/src/include/H5hut.h
 
-# Listing of all possible headers that I may include
 EXTRA_HEADERS =
 endif
 

src/Fortran/H5.c

@@ -9,9 +9,11 @@
 
 #include "h5_private.h"
 
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
 #include "h5core/h5_debug.h"
-#include "h5core/h5_model.h"
+#include "h5core/h5_file.h"
+
+#include <hdf5.h>
 
 #define h5_createprop_file FC_MANGLING(    \
                 h5_createprop_file,	   \

src/Fortran/H5Block_model.c

@@ -10,6 +10,7 @@
 #include "h5_private.h"
 #include "h5core/h5_debug.h"
 #include "h5core/h5b_model.h"
+#include "h5core/h5b_io.h"
 
 #define h5bl_hasfielddata FC_MANGLING (				  \
                 h5bl_hasfielddata,				  \

src/Fortran/H5Part_model.c

@@ -10,6 +10,7 @@
 #include "h5_private.h"
 #include "h5core/h5_debug.h"
 #include "h5core/h5u_model.h"
+#include "h5core/h5u_io.h"
 
 #include "h5core/h5_syscall.h"
 

src/Fortran/H5_attribs.c

@@ -10,7 +10,8 @@
 #include "h5_private.h"
 
 #include "h5core/h5_debug.h"
-#include "h5core/h5_attribs.h"
+#include "h5core/h5_file_attribs.h"
+#include "h5core/h5_step_attribs.h"
 
 /*
    __ _ _              _   _        _ _           _            

src/Fortran/H5_model.c

@@ -9,7 +9,7 @@
 
 #include "h5_private.h"
 
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
 #include "h5core/h5_debug.h"
 #include "h5core/h5_model.h"
 

src/Fortran/h5_private.h

@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
 
 #if defined(FC_MANGLING_LOWERCASE_NO_UNDERSCORE)
 #    define FC_MANGLING(a,b) a

src/h5core/Makefile.am

@@ -1,42 +1,42 @@
+AUTOMAKE_OPTIONS = subdir-objects
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/include @AM_CPPFLAGS@
 
 EXTRA_HEADERS =					\
-	h5_attribs_private.h			\
-	h5_debug_private.h			\
-	h5_errorhandling_private.h		\
-	h5_fcmp_private.h			\
-	h5_hdf5_private.h			\
-	h5_hsearch_private.h			\
-	h5_init_private.h			\
-	h5_lustre_private.h			\
-	h5_maps_private.h			\
-	h5_model_private.h			\
-	h5_mpi_private.h			\
-	h5_private.h				\
-	h5_qsort_private.h			\
-	h5_readwrite_private.h			\
-	h5_syscall_private.h			\
-	h5_types_private.h			\
-	h5_va_macros.h				\
-	h5b_model_private.h			\
-	h5b_readwrite_private.h			\
-	h5b_types_private.h			\
-	h5t_access_private.h			\
-	h5t_adjacencies_private.h		\
-	h5t_core_private.h			\
-	h5t_errorhandling_private.h		\
-	h5t_map_private.h			\
-	h5t_model_private.h			\
-	h5t_octree_private.h			\
-	h5t_readwrite_private.h			\
-	h5t_ref_elements_private.h		\
-	h5t_retrieve_private.h			\
-	h5t_store_private.h			\
-	h5t_tags_private.h			\
-	h5t_types_private.h			\
-	h5u_readwrite_private.h			\
-	h5u_types_private.h
+	private/h5_hdf5.h			\
+	private/h5_hsearch.h			\
+	private/h5_init.h			\
+	private/h5_lustre.h			\
+	private/h5_maps.h			\
+	private/h5_model.h			\
+	private/h5_mpi.h			\
+	private/h5.h				\
+	private/h5_qsort.h			\
+	private/h5_io.h				\
+	private/h5_types.h			\
+	private/h5_va_macros.h			\
+	private/h5b_model.h			\
+	private/h5b_io.h			\
+	private/h5b_types.h			\
+	private/h5t_access.h			\
+	private/h5t_adjacencies.h		\
+	private/h5t_core.h			\
+	private/h5t_errorhandling.h		\
+	private/h5t_map.h			\
+	private/h5t_model.h			\
+	private/h5t_octree.h			\
+	private/h5t_io.h			\
+	private/h5t_ref_elements.h		\
+	private/h5t_retrieve.h			\
+	private/h5t_store.h			\
+	private/h5t_tags.h			\
+	private/h5t_types.h			\
+	private/h5u_io.h			\
+	private/h5u_types.h			\
+	private/h5_attribs.h			\
+	private/h5_debug.h			\
+	private/h5_errorhandling.h		\
+	private/h5_fcmp.h
 
 # Extra files that I wish to include in the dist tar ball.
 EXTRA_DIST = $(EXTRA_HEADERS)
@@ -46,53 +46,53 @@ lib_LTLIBRARIES = libH5hut.la
 
 # Listing of sources
 libH5hut_la_SOURCES =				\
-	h5_attach.c				\
+	h5_attachments.c			\
 	h5_attribs.c				\
+	h5_debug.c				\
 	h5_errorhandling.c			\
-	h5_fcmp.c				\
 	h5_init.c				\
-	h5_hdf5.c				\
-	h5_hsearch.c				\
-	h5_maps.c				\
 	h5_model.c				\
-	h5_openclose.c				\
-	h5_qsort.c				\
-	h5_qsort_r.c				\
-	h5_readwrite.c				\
-	h5_syscall.c				\
-	h5_lustre.c				\
-	h5u_readwrite.c                         \
-	h5b_readwrite.c                         \
+	h5_file.c				\
+	h5u_io.c		                \
+	h5b_io.c 	                        \
 	h5u_model.c				\
         h5b_model.c				\
-        h5b_attribs.c
+        h5b_attribs.c				\
+	private/h5_hdf5.c			\
+	private/h5_hsearch.c			\
+	private/h5_maps.c			\
+	private/h5_fcmp.c			\
+	private/h5_qsort.c			\
+	private/h5_qsort_r.c			\
+	private/h5_io.c				\
+	private/h5_lustre.c
 
 # grid stuff
 libH5hut_la_SOURCES +=				\
-	h5t_access_tetm.c			\
-	h5t_access_trim.c			\
 	h5t_adjacencies.c			\
-	h5t_adjacencies_tetm.c			\
-	h5t_adjacencies_trim.c			\
-	h5t_core.c				\
-	h5t_core_trim.c				\
-	h5t_core_tetm.c				\
 	h5t_map.c				\
 	h5t_model.c				\
-	h5t_model_tetm.c			\
-	h5t_model_trim.c			\
 	h5t_octree.c				\
-	h5t_readwrite.c				\
-	h5t_readwrite_trim.c			\
-	h5t_readwrite_tetm.c			\
-	h5t_ref_elements.c			\
+	h5t_io.c				\
 	h5t_retrieve.c				\
-	h5t_retrieve_tetm.c			\
-	h5t_retrieve_trim.c			\
 	h5t_store.c				\
-	h5t_store_tetm.c			\
-	h5t_store_trim.c			\
-	h5t_tags.c
+	h5t_tags.c				\
+	private/h5t_core.c			\
+	private/h5t_core_trim.c			\
+	private/h5t_core_tetm.c			\
+	private/h5t_access_tetm.c		\
+	private/h5t_access_trim.c		\
+	private/h5t_adjacencies_tetm.c		\
+	private/h5t_adjacencies_trim.c		\
+	private/h5t_model_tetm.c		\
+	private/h5t_model_trim.c		\
+	private/h5t_retrieve_tetm.c		\
+	private/h5t_retrieve_trim.c		\
+	private/h5t_io_trim.c			\
+	private/h5t_io_tetm.c			\
+	private/h5t_ref_elements.c		\
+	private/h5t_store_tetm.c		\
+	private/h5t_store_trim.c
 
 
 libH5hut_la_DEPENDENCIES = $(EXTRA_HEADERS)

src/h5core/h5_attachments.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,14 +7,14 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5core/h5.h"
-#include "h5_types_private.h"
+#include "h5core/h5_init.h"
+#include "private/h5_types.h"
 
-#include "h5_errorhandling_private.h"
-#include "h5_hdf5_private.h"
-#include "h5_model_private.h"
+#include "private/h5_errorhandling.h"
+#include "private/h5_hdf5.h"
+#include "private/h5_model.h"
 #include "h5core/h5_syscall.h"
-#include "h5_va_macros.h"
+#include "private/h5_va_macros.h"
 
 #include <string.h>
 #include <sys/stat.h>

src/h5core/h5_attribs.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,64 +7,16 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5core/h5.h"
-#include "h5_types_private.h"
+#include "h5core/h5_init.h"
+#include "h5core/h5_debug.h"
 
-#include "h5_private.h"
-#include "h5_readwrite_private.h"
-#include "h5_hdf5_private.h"
+#include "private/h5_types.h"
+#include "private/h5.h"
+#include "private/h5_io.h"
+#include "private/h5_hdf5.h"
+#include "private/h5_attribs.h"
 
 
-static inline h5_err_t
-get_attrib_info (
-	hid_t attrib_id,
-	h5_int64_t* attrib_type,	/*!< OUT: H5 type of attribute */
-	h5_size_t* attrib_nelem		/*!< OUT: number of elements */
-	) {
-        H5_INLINE_FUNC_ENTER (h5_err_t);
-	hid_t mytype;
-        TRY (mytype = hdf5_get_attribute_type (attrib_id));
-
-        H5T_class_t type_class;
-        TRY (type_class = hdf5_get_class_type (mytype));
-
-	if (attrib_nelem) {
-                if (type_class == H5T_STRING) {
-                        *attrib_nelem = H5Tget_size(mytype);
-                } else {
-                        hid_t space_id;
-                        TRY (space_id = hdf5_get_attribute_dataspace (attrib_id));
-                        TRY (*attrib_nelem = hdf5_get_npoints_of_dataspace (space_id));
-                        TRY (hdf5_close_dataspace (space_id));
-                }
-	}
-	if (attrib_type) {
-		TRY (*attrib_type = h5priv_normalize_h5_type (mytype));
-	}
-        TRY (hdf5_close_type (mytype));
-	TRY (hdf5_close_attribute (attrib_id));
-	H5_INLINE_FUNC_RETURN (H5_SUCCESS);
-}
-
-h5_err_t
-h5priv_get_attrib_info_by_name (
-	const hid_t id,			/*!< IN: HDF5 object ID */
-	const char* const attrib_name,	/*!< IN: name of attribute */
-	h5_int64_t* attrib_type,	/*!< OUT: H5 type of attribute */
-	h5_size_t* attrib_nelem		/*!< OUT: number of elements */
-	) {
-	H5_PRIV_API_ENTER (h5_err_t,
-			   "id=%lld, "
-			   "attrib_name=%s,"
-			   "attrib_type=%p, attrib_nelem=%p",
-			   (long long int)id,
-			   attrib_name,
-			   attrib_type,
-			   attrib_nelem);
-	hid_t attrib_id;
-        TRY (attrib_id = hdf5_open_attribute (id, attrib_name));
-        H5_PRIV_API_RETURN (get_attrib_info (attrib_id, attrib_type, attrib_nelem));
-}
 
 h5_err_t
 h5priv_get_attrib_info_by_idx (

src/h5core/h5_attribs_private.h

@@ -1,50 +0,0 @@
-/*
-  Copyright (c) 2006-2015, The Regents of the University of California,
-  through Lawrence Berkeley National Laboratory (subject to receipt of any
-  required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
-  Institut (Switzerland).  All rights reserved.
-
-  License: see file COPYING in top level of source distribution.
-*/
-
-#ifndef __H5_ATTRIBS_PRIVATE_H
-#define __H5_ATTRIBS_PRIVATE_H
-
-#include "h5_types_private.h"
-
-h5_err_t
-h5priv_read_attrib (
-	const hid_t id,
-	const char* attrib_name,
-	const hid_t attrib_type,
-	void* const attrib_value
-	);
-
-h5_err_t
-h5priv_write_attrib (
-	const hid_t id,
-	const char* attrib_name,
-	const hid_t attrib_type,
-	const void* attrib_value,
-	const hsize_t attrib_nelem,
-	const int overwrite
-	);
-
-h5_err_t
-h5priv_get_attrib_info_by_name (
-	const hid_t id,
-	const char* const attrib_name,
-	h5_int64_t* attrib_type,
-	h5_size_t* attrib_nelem
-	);
-
-h5_err_t
-h5priv_get_attrib_info_by_idx (
-	const hid_t id,
-	const h5_size_t attrib_idx,
-	char* attrib_name,
-	const h5_size_t len_attrib_name,
-	h5_int64_t* attrib_type,
-	h5_size_t* attrib_nelem
-	);
-#endif

src/h5core/h5_debug.c

@@ -0,0 +1,79 @@
+/*
+  Copyright (c) 2006-2016, The Regents of the University of California,
+  through Lawrence Berkeley National Laboratory (subject to receipt of any
+  required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
+  Institut (Switzerland).  All rights reserved.
+
+  License: see file COPYING in top level of source distribution.
+*/
+
+#include "h5core/h5_init.h"
+#include "private/h5_init.h"
+
+h5_int32_t			h5_debug_level = H5_VERBOSE_ERROR;
+struct call_stack		h5_call_stack;
+
+char *h5_rfmts[] = {
+	[e_int]			"%d",
+	[e_ssize_t]		"%ld",
+	[e_char_p]		"%s",
+	[e_void_p]		"%p",
+	[e_h5_err_t]		"%lld",
+	[e_h5_int64_t]		"%lld",
+	[e_h5_id_t]		"%lld",
+	[e_h5_ssize_t]		"%lld",
+	[e_h5_errorhandler_t]	"%p",
+	[e_h5_file_p]		"%p",
+	[e_h5_file_t]		"0x%08x",
+	[e_h5_lvl_idx_t]	"%d",
+	[e_h5t_iterator_p]	"%p",
+	[e_h5_loc_id_t]		"%ld",
+	[e_h5_loc_idx_t]	"%ld",
+	[e_hid_t]		"%lld",
+	[e_H5O_type_t]		"%ld",
+	[e_h5_glb_elem_p]       "%p",
+        [e_h5_prop_p]           "%p",
+        [e_h5_prop_t]           "0x%08x",
+        [e_h5_prop_file_p]      "%p",
+        [e_h5_prop_file_t]      "0x%08x",
+	[e_herr_t]		"%ld"
+};
+
+/*!
+   \ingroup h5_core_errorhandling
+
+   Set debug/verbosity level. On level 0 all output will be supressed (even
+   error messages). On level 1 error messages, on level 2 warning messages
+   and on level 3 informational messages will be printed. On level 4 debug
+   messages will be printed.
+
+   Values less than 0 are equivalent to 0. Values greater than 4 are equivalent
+   to 4.
+
+   \return \c H5_SUCCESS on success.
+   \return \c H5_ERR_INVAL if debug level is invalid.
+ */
+h5_err_t
+h5_set_debuglevel (
+        const h5_id_t level     /*!< debug level */
+        ) {
+	if (level < 0)
+		h5_debug_level = ((1 << 20) - 1) & ~0x7;
+	else
+		h5_debug_level = level;
+	return H5_SUCCESS;
+}
+
+/*!
+   \ingroup h5_core_errorhandling
+
+   Get current debug/verbosity level.
+
+   \return current debug level
+ */
+h5_err_t
+h5_get_debuglevel (
+        void
+        ) {
+	return h5_debug_level;
+}

src/h5core/h5_errorhandling.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,39 +7,11 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5core/h5.h"
-#include "h5_init_private.h"
+#include "h5core/h5_init.h"
+#include "private/h5_init.h"
 
 static h5_errorhandler_t	h5_errhandler = h5_report_errorhandler;
 h5_err_t			h5_errno;
-h5_int32_t			h5_debug_level = H5_VERBOSE_ERROR;
-struct call_stack		h5_call_stack;
-
-char *h5_rfmts[] = {
-	[e_int]			"%d",
-	[e_ssize_t]		"%ld",
-	[e_char_p]		"%s",
-	[e_void_p]		"%p",
-	[e_h5_err_t]		"%lld",
-	[e_h5_int64_t]		"%lld",
-	[e_h5_id_t]		"%lld",
-	[e_h5_ssize_t]		"%lld",
-	[e_h5_errorhandler_t]	"%p",
-	[e_h5_file_p]		"%p",
-	[e_h5_file_t]		"0x%08x",
-	[e_h5_lvl_idx_t]	"%d",
-	[e_h5t_iterator_p]	"%p",
-	[e_h5_loc_id_t]		"%ld",
-	[e_h5_loc_idx_t]	"%ld",
-	[e_hid_t]		"%lld",
-	[e_H5O_type_t]		"%ld",
-	[e_h5_glb_elem_p]       "%p",
-        [e_h5_prop_p]           "%p",
-        [e_h5_prop_t]           "0x%08x",
-        [e_h5_prop_file_p]      "%p",
-        [e_h5_prop_file_t]      "0x%08x",
-	[e_herr_t]		"%ld"
-};
 
 /*!
    \ingroup h5_core
@@ -59,45 +31,6 @@ const char* const H5_O_MODES[] = {
 	"H5_O_APPENDONLY"
 };
 
-/*!
-   \ingroup h5_core_errorhandling
-
-   Set debug/verbosity level. On level 0 all output will be supressed (even
-   error messages). On level 1 error messages, on level 2 warning messages
-   and on level 3 informational messages will be printed. On level 4 debug
-   messages will be printed.
-
-   Values less than 0 are equivalent to 0. Values greater than 4 are equivalent
-   to 4.
-
-   \return \c H5_SUCCESS on success.
-   \return \c H5_ERR_INVAL if debug level is invalid.
- */
-h5_err_t
-h5_set_debuglevel (
-        const h5_id_t level     /*!< debug level */
-        ) {
-	if (level < 0)
-		h5_debug_level = ((1 << 20) - 1) & ~0x7;
-	else
-		h5_debug_level = level;
-	return H5_SUCCESS;
-}
-
-/*!
-   \ingroup h5_core_errorhandling
-
-   Get current debug/verbosity level.
-
-   \return current debug level
- */
-h5_err_t
-h5_get_debuglevel (
-        void
-        ) {
-	return h5_debug_level;
-}
-
 /*!
    \ingroup h5_core_errorhandling
 

src/h5core/h5_file.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -11,15 +11,16 @@
 #include <errno.h>
 #include <fcntl.h>
 
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
+#include "h5core/h5_debug.h"
 
-#include "h5_private.h"
-#include "h5_hdf5_private.h"
+#include "private/h5.h"
+#include "private/h5_hdf5.h"
 
-#include "h5_model_private.h"
-#include "h5_mpi_private.h"
-#include "h5u_readwrite_private.h"
-#include "h5b_readwrite_private.h"
+#include "private/h5_model.h"
+#include "private/h5_mpi.h"
+#include "private/h5u_io.h"
+#include "private/h5b_io.h"
 
 #include "h5core/h5_errorhandling.h"
 #include "h5core/h5_syscall.h"
@@ -49,6 +50,15 @@ h5_check_filehandle (
 	return H5_SUCCESS;
 }
 
+hid_t
+h5_get_hdf5_file(
+	const h5_file_t f_		/*!< file handle		*/
+	) {
+        h5_file_p f = (h5_file_p)f_;
+	H5_CORE_API_ENTER (hid_t, "f=%p", f);
+	H5_CORE_API_RETURN (f->file);
+}
+
 /*!
   Initialize H5Part
 */
@@ -680,22 +690,6 @@ h5_get_num_procs (
 	H5_CORE_API_RETURN (f->nprocs);
 }
 
-/*!
-  \ingroup h5_core_filehandling
-
-  Provides access to the underlying HDF5 file handle.
-
-  \return Number of steps or error code
-*/
-hid_t
-h5_get_hdf5_file(
-	const h5_file_t f_		/*!< file handle		*/
-	) {
-        h5_file_p f = (h5_file_p)f_;
-	H5_CORE_API_ENTER (hid_t, "f=%p", f);
-	H5_CORE_API_RETURN (f->file);
-}
-
 /*!
   \ingroup h5_core_filehandling
 

src/h5core/h5_init.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -14,12 +14,12 @@
 
 #include "config.h"
 
-#include "h5core/h5.h"
-#include "h5_hdf5_private.h"
+#include "h5core/h5_init.h"
+#include "private/h5_hdf5.h"
 
-#include "h5_mpi_private.h"
-#include "h5t_types_private.h"
-#include "h5t_tags_private.h"
+#include "private/h5_mpi.h"
+#include "private/h5t_types.h"
+#include "private/h5t_tags.h"
 
 
 

src/h5core/h5_model.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -9,13 +9,13 @@
 
 #include <string.h>
 
-#include "h5core/h5.h"
-#include "h5_types_private.h"
-#include "h5_hdf5_private.h"
-#include "h5_model_private.h"
-#include "h5_mpi_private.h"
-#include "h5_readwrite_private.h"
-#include "h5_va_macros.h"
+#include "h5core/h5_init.h"
+#include "private/h5_types.h"
+#include "private/h5_hdf5.h"
+#include "private/h5_model.h"
+#include "private/h5_mpi.h"
+#include "private/h5_io.h"
+#include "private/h5_va_macros.h"
 
 h5_err_t
 h5priv_close_step (

src/h5core/h5_private.h

@@ -1,24 +0,0 @@
-#ifndef __H5_PRIVATE_H
-#define __H5_PRIVATE_H
-
-#include "h5_types_private.h"
-#include "h5_errorhandling_private.h"
-
-#define UNUSED_ARGUMENT(x) (void)x
-
-static inline h5_err_t
-check_filehandle (
-	const h5_file_p f
-	) {
-	if (f == NULL || f->file < 0 || f->u == NULL || f->b == NULL) {
-		return h5_error (
-			H5_ERR_BADF,
-			"Called with bad filehandle.");
-	}
-	return H5_SUCCESS;
-}
-
-#define CHECK_FILEHANDLE(f)   \
-        TRY (check_filehandle (f));
-
-#endif

src/h5core/h5_syscall.c

@@ -1,42 +0,0 @@
-/*
-  Copyright (c) 2006-2015, The Regents of the University of California,
-  through Lawrence Berkeley National Laboratory (subject to receipt of any
-  required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
-  Institut (Switzerland).  All rights reserved.
-
-  License: see file COPYING in top level of source distribution.
-*/
-
-#include <search.h>
-
-#include "h5core/h5_types.h"
-#include "h5core/h5_errorhandling.h"
-
-void*
-h5priv_tsearch (
-        const void* key,
-        void** rootp,
-        int (*compar)(const void* key1, const void* key2)
-        ) {
-	void* ptr = tsearch (key, rootp, compar);
-	if (ptr == NULL) {
-		h5_error (H5_ERR_NOMEM, "Out of memory.");
-		return (void*)(H5_ERR);
-	}
-	return ptr;
-}
-
-void*
-h5priv_tfind (
-        const void* key,
-        void* const* rootp,
-        int (*compar)(const void* key1, const void* key2)
-        ) {
-	void* ptr = tfind (key, rootp, compar);
-	if (ptr == NULL) {
-		return (void*)(H5_ERR);
-	}
-	return ptr;
-}
-
-

src/h5core/h5_syscall_private.h

@@ -1,28 +0,0 @@
-/*
-  Copyright (c) 2006-2015, The Regents of the University of California,
-  through Lawrence Berkeley National Laboratory (subject to receipt of any
-  required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
-  Institut (Switzerland).  All rights reserved.
-
-  License: see file COPYING in top level of source distribution.
-*/
-
-#ifndef __H5_SYSCALL_PRIVATE_H
-#define __H5_SYSCALL_PRIVATE_H
-
-#include "h5core/h5_types.h"
-
-void*
-h5priv_tsearch (
-        const void* key,
-        void** rootp,
-        int (*compar)(const void* key1, const void* key2)
-        );
-
-void*
-h5priv_tfind (
-        const void* key,
-        void *const* rootp,
-        int (*compar)(const void* key1, const void* key2)
-        );
-#endif

src/h5core/h5b_attribs.c

@@ -1,23 +1,22 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
 
   License: see file COPYING in top level of source distribution.
 */
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
 
-#include "h5_debug_private.h"
-#include "h5_va_macros.h"
+#include "private/h5_debug.h"
 
-#include "h5_private.h"
-#include "h5_hdf5_private.h"
+#include "private/h5.h"
+#include "private/h5_hdf5.h"
+
+#include "private/h5_attribs.h"
+#include "private/h5b_types.h"
+#include "private/h5b_model.h"
 
-#include "h5_attribs_private.h"
-#include "h5_readwrite_private.h"
-#include "h5b_types_private.h"
-#include "h5b_model_private.h"
 h5_err_t
 h5b_write_field_attrib (
 	const h5_file_t fh,			/*!< IN: file handle */

src/h5core/h5b_io.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,15 +7,15 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5core/h5.h"
-#include "h5_types_private.h"
-#include "h5_hdf5_private.h"
+#include "h5core/h5_init.h"
+#include "private/h5_types.h"
+#include "private/h5_hdf5.h"
 
-#include "h5_model_private.h"
-#include "h5_mpi_private.h"
-#include "h5_readwrite_private.h"
-#include "h5b_types_private.h"
-#include "h5b_model_private.h"
+#include "private/h5_model.h"
+#include "private/h5_mpi.h"
+#include "private/h5_io.h"
+#include "private/h5b_types.h"
+#include "private/h5b_model.h"
 
 #include "h5core/h5_syscall.h"
 

src/h5core/h5b_model.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -10,15 +10,17 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "h5_private.h"
-#include "h5_hdf5_private.h"
-
-#include "h5_model_private.h"
-#include "h5_mpi_private.h"
-#include "h5_readwrite_private.h"
-#include "h5b_types_private.h"
+#include "h5core/h5_init.h"
 #include "h5core/h5_syscall.h"
 
+#include "private/h5.h"
+#include "private/h5_hdf5.h"
+
+#include "private/h5_model.h"
+#include "private/h5_mpi.h"
+#include "private/h5_io.h"
+#include "private/h5b_types.h"
+
 #define MIN( x, y ) ( (x) <= (y) ? (x) : (y) )
 #define MAX( x, y ) ( (x) >= (y) ? (x) : (y) )
 

src/h5core/h5t_adjacencies.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,12 +7,14 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5core/h5.h"
-#include "h5_private.h"
-#include "h5t_types_private.h"
-#include "h5t_adjacencies_private.h"
-#include "h5t_map_private.h"
-#include "h5t_core_private.h"
+#include "h5core/h5_init.h"
+#include "h5core/h5_debug.h"
+
+#include "private/h5.h"
+#include "private/h5t_types.h"
+#include "private/h5t_adjacencies.h"
+#include "private/h5t_map.h"
+#include "private/h5t_core.h"
 
 #include <time.h>
 

src/h5core/h5t_io.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,8 +7,8 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5core/h5.h"
-#include "h5_types_private.h"
+#include "h5core/h5_init.h"
+#include "private/h5_types.h"
 
 #include <stdlib.h>
 #include <unistd.h> // for the use of sleep
@@ -17,13 +17,13 @@
 #include <parmetis.h>
 #endif
 
-#include "h5_attribs_private.h"
-#include "h5_hdf5_private.h"
+#include "private/h5_attribs.h"
+#include "private/h5_hdf5.h"
 
-#include "h5_model_private.h"
-#include "h5t_types_private.h"
-#include "h5t_access_private.h"
-#include "h5t_core_private.h"
+#include "private/h5_model.h"
+#include "private/h5t_types.h"
+#include "private/h5t_access.h"
+#include "private/h5t_core.h"
 #include "h5core/h5t_map.h"
 
 int preferred_direction = 0;
@@ -37,15 +37,15 @@ int dont_use_parmetis = 0;
 // 2 distribute geometrically with preferred direction
 
 
-#include "h5core/h5.h"
-#include "h5t_types_private.h"
-#include "h5t_model_private.h"
-#include "h5t_map_private.h"
-#include "h5t_adjacencies_private.h"
-#include "h5t_readwrite_private.h"
-#include "h5t_store_private.h"
-#include "h5t_core_private.h"
-#include "h5_mpi_private.h"
+#include "h5core/h5_init.h"
+#include "private/h5t_types.h"
+#include "private/h5t_model.h"
+#include "private/h5t_map.h"
+#include "private/h5t_adjacencies.h"
+#include "private/h5t_io.h"
+#include "private/h5t_store.h"
+#include "private/h5t_core.h"
+#include "private/h5_mpi.h"
 
 #include <assert.h>
 

src/h5core/h5t_map.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,15 +7,15 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5_fcmp_private.h"
-#include "h5_hdf5_private.h"
+#include "private/h5_fcmp.h"
+#include "private/h5_hdf5.h"
 
-#include "h5t_types_private.h"
-#include "h5t_access_private.h"
-#include "h5t_map_private.h"
+#include "private/h5t_types.h"
+#include "private/h5t_access.h"
+#include "private/h5t_map.h"
 #include "h5core/h5t_map.h"
-#include "h5t_model_private.h"
-#include "h5_mpi_private.h"
+#include "private/h5t_model.h"
+#include "private/h5_mpi.h"
 
 /*
    Mapping of global to local id's:

src/h5core/h5t_model.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,26 +7,28 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5core/h5.h"
-#include "h5_private.h"
-#include "h5_mpi_private.h"
-#include "h5_errorhandling_private.h"
+#include "h5core/h5_init.h"
+#include "h5core/h5_debug.h"
 
-#include "h5_attribs_private.h"
-#include "h5_hdf5_private.h"
+#include "private/h5.h"
+#include "private/h5_mpi.h"
+#include "private/h5_errorhandling.h"
 
-#include "h5t_types_private.h"
-#include "h5t_errorhandling_private.h"
-#include "h5t_model_private.h"
-#include "h5t_adjacencies_private.h"
-#include "h5t_readwrite_private.h"
-#include "h5t_tags_private.h"
+#include "private/h5_attribs.h"
+#include "private/h5_hdf5.h"
 
-#include "h5_init_private.h"
+#include "private/h5t_types.h"
+#include "private/h5t_errorhandling.h"
+#include "private/h5t_model.h"
+#include "private/h5t_adjacencies.h"
+#include "private/h5t_io.h"
+#include "private/h5t_tags.h"
+
+#include "private/h5_init.h"
 
 #include "h5core/h5_model.h"
-#include "h5t_core_private.h"
-#include "h5t_store_private.h"
+#include "private/h5t_core.h"
+#include "private/h5t_store.h"
 
 #include <string.h>
 #include <assert.h>

src/h5core/h5t_octree.c

@@ -1,5 +1,5 @@
-#include "h5t_octree_private.h"
-#include "h5t_core_private.h"
+#include "private/h5t_octree.h"
+#include "private/h5t_core.h"
 
 #ifdef WITH_PARALLEL_H5GRID
 
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <assert.h>
 
-#include "h5_mpi_private.h"
+#include "private/h5_mpi.h"
 
 static h5_err_t
 get_bounding_box_of_octant (

src/h5core/h5t_retrieve.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,16 +7,18 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5core/h5.h"
-#include "h5_private.h"
+#include "h5core/h5_init.h"
+#include "h5core/h5_debug.h"
 
-#include "h5t_types_private.h"
-#include "h5t_errorhandling_private.h"
-#include "h5t_map_private.h"
-#include "h5t_model_private.h"
-#include "h5t_access_private.h"
-#include "h5t_tags_private.h"
-#include "h5t_retrieve_private.h"
+#include "private/h5.h"
+
+#include "private/h5t_types.h"
+#include "private/h5t_errorhandling.h"
+#include "private/h5t_map.h"
+#include "private/h5t_model.h"
+#include "private/h5t_access.h"
+#include "private/h5t_tags.h"
+#include "private/h5t_retrieve.h"
 
 #include "h5core/h5t_map.h"
 

src/h5core/h5t_store.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,18 +7,19 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5_errorhandling_private.h"
-#include "h5t_types_private.h"
-#include "h5t_errorhandling_private.h"
-#include "h5t_access_private.h"
-#include "h5t_core_private.h"
-#include "h5t_map_private.h"
-#include "h5t_model_private.h"
-#include "h5t_store_private.h"
-#include "h5t_core_private.h"
-#include "h5t_readwrite_private.h"
-#include "h5_init_private.h"
-#include "h5_mpi_private.h"
+#include "private/h5_errorhandling.h"
+#include "private/h5t_types.h"
+#include "private/h5t_errorhandling.h"
+#include "private/h5t_access.h"
+#include "private/h5t_core.h"
+#include "private/h5t_map.h"
+#include "private/h5t_model.h"
+#include "private/h5t_store.h"
+#include "private/h5t_core.h"
+#include "private/h5t_io.h"
+#include "private/h5_init.h"
+#include "private/h5.h"
+#include "private/h5_mpi.h"
 
 #include "h5core/h5t_map.h"
 
@@ -415,17 +416,35 @@ h5tpriv_add_level (
 	m->leaf_level = m->num_leaf_levels++;
 	m->num_loaded_levels = m->num_leaf_levels;
 
-	TRY (m->num_glb_vertices = h5_alloc (m->num_glb_vertices, m->num_leaf_levels*sizeof (*m->num_glb_vertices)));
-	TRY (m->num_loc_vertices = h5_alloc (m->num_loc_vertices, m->num_leaf_levels*sizeof (*m->num_loc_vertices)));
+	TRY (m->num_glb_vertices = h5_alloc (
+		     m->num_glb_vertices,
+		     m->num_leaf_levels*sizeof (*m->num_glb_vertices)));
+	TRY (m->num_loc_vertices = h5_alloc (
+		     m->num_loc_vertices,
+		     m->num_leaf_levels*sizeof (*m->num_loc_vertices)));
 
-	TRY (m->num_b_vtx = h5_alloc (m->num_b_vtx, m->num_leaf_levels*sizeof (*m->num_b_vtx)));
-	TRY (m->first_b_vtx = h5_alloc (m->first_b_vtx, m->num_leaf_levels*sizeof (*m->first_b_vtx)));
+	TRY (m->num_b_vtx = h5_alloc (
+		     m->num_b_vtx,
+		     m->num_leaf_levels*sizeof (*m->num_b_vtx)));
+	TRY (m->first_b_vtx = h5_alloc (
+		     m->first_b_vtx,
+		     m->num_leaf_levels*sizeof (*m->first_b_vtx)));
 
-	TRY (m->num_glb_elems = h5_alloc (m->num_glb_elems, m->num_leaf_levels*sizeof (*m->num_glb_elems)));
-	TRY (m->num_glb_leaf_elems = h5_alloc (m->num_glb_leaf_elems, m->num_leaf_levels*sizeof (*m->num_glb_leaf_elems)));
-	TRY (m->num_interior_elems = h5_alloc (m->num_interior_elems, m->num_leaf_levels*sizeof (*m->num_interior_elems)));
-	TRY (m->num_interior_leaf_elems = h5_alloc (m->num_interior_leaf_elems, m->num_leaf_levels*sizeof (*m->num_interior_leaf_elems)));
-	TRY (m->num_ghost_elems = h5_alloc (m->num_ghost_elems, m->num_leaf_levels*sizeof (*m->num_ghost_elems)));
+	TRY (m->num_glb_elems = h5_alloc (
+		     m->num_glb_elems,
+		     m->num_leaf_levels*sizeof (*m->num_glb_elems)));
+	TRY (m->num_glb_leaf_elems = h5_alloc (
+		     m->num_glb_leaf_elems,
+		     m->num_leaf_levels*sizeof (*m->num_glb_leaf_elems)));
+	TRY (m->num_interior_elems = h5_alloc (
+		     m->num_interior_elems,
+		     m->num_leaf_levels*sizeof (*m->num_interior_elems)));
+	TRY (m->num_interior_leaf_elems = h5_alloc (
+		     m->num_interior_leaf_elems,
+		     m->num_leaf_levels*sizeof (*m->num_interior_leaf_elems)));
+	TRY (m->num_ghost_elems = h5_alloc (
+		     m->num_ghost_elems,
+		     m->num_leaf_levels*sizeof (*m->num_ghost_elems)));
 
 	m->num_glb_vertices[m->leaf_level] = -1;
 	m->num_loc_vertices[m->leaf_level] = -1;

src/h5core/h5t_tags.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,23 +7,23 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5t_types_private.h"
+#include "private/h5t_types.h"
 #include "h5core/h5t_map.h"
 
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
 
-#include "h5_va_macros.h"
+#include "private/h5_va_macros.h"
 
-#include "h5_attribs_private.h"
-#include "h5_hdf5_private.h"
+#include "private/h5_attribs.h"
+#include "private/h5_hdf5.h"
 
-#include "h5_model_private.h"
-#include "h5t_access_private.h"
-#include "h5t_map_private.h"
-#include "h5t_model_private.h"
-#include "h5t_tags_private.h"
+#include "private/h5_model.h"
+#include "private/h5t_access.h"
+#include "private/h5t_map.h"
+#include "private/h5t_model.h"
+#include "private/h5t_tags.h"
 
-#include "h5_init_private.h"
+#include "private/h5_init.h"
 
 #include <assert.h>
 

src/h5core/h5u_io.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,14 +7,14 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5core/h5.h"
-#include "h5_types_private.h"
-#include "h5_hdf5_private.h"
-#include "h5_model_private.h"
-#include "h5_readwrite_private.h"
-#include "h5u_types_private.h"
+#include "h5core/h5_init.h"
+#include "private/h5_types.h"
+#include "private/h5_hdf5.h"
+#include "private/h5_model.h"
+#include "private/h5_io.h"
+#include "private/h5u_types.h"
 
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
 #include "h5core/h5_model.h"
 #include "h5core/h5_syscall.h"
 

src/h5core/h5u_model.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,15 +7,19 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5core/h5.h"
-#include "h5_private.h"
-#include "h5_hdf5_private.h"
-
-#include "h5_model_private.h"
-#include "h5_mpi_private.h"
-#include "h5_readwrite_private.h"
-#include "h5u_types_private.h"
+#include "h5core/h5_init.h"
+#include "h5core/h5_debug.h"
 #include "h5core/h5u_model.h"
+#include "h5core/h5u_io.h"
+
+#include "private/h5.h"
+#include "private/h5_hdf5.h"
+
+#include "private/h5_model.h"
+#include "private/h5_mpi.h"
+#include "private/h5_io.h"
+#include "private/h5u_types.h"
+
 
 h5_ssize_t
 h5u_get_num_points (

src/h5core/private/h5.h

@@ -0,0 +1,42 @@
+#ifndef __PRIVATE_H5_H
+#define __PRIVATE_H5_H
+
+#include "private/h5_types.h"
+#include "private/h5_debug.h"
+#include "private/h5_errorhandling.h"
+
+#define UNUSED_ARGUMENT(x) (void)x
+
+static inline h5_err_t
+check_filehandle (
+	const h5_file_p f
+	) {
+	if (f == NULL || f->file < 0 || f->u == NULL || f->b == NULL) {
+		return h5_error (
+			H5_ERR_BADF,
+			"Called with bad filehandle.");
+	}
+	return H5_SUCCESS;
+}
+
+#define CHECK_FILEHANDLE(f)   \
+        TRY (check_filehandle (f));
+
+#define is_writable(f) (f->props->flags & (H5_O_RDWR | H5_O_WRONLY | H5_O_APPENDONLY))
+#define is_readable(f) (f->props->flags & (H5_O_RDWR | H5_O_RDONLY))
+#define is_readonly(f) (f->props->flags & H5_O_RDONLY)
+#define is_appendonly(f) (f->props->flags & H5_O_APPENDONLY)
+
+#define CHECK_WRITABLE_MODE(f)                                          \
+	TRY (is_writable (f) ? H5_SUCCESS : h5_error (                  \
+                     H5_ERR_INVAL,                                      \
+                     "Attempting to write to read-only file"));
+
+#define CHECK_TIMEGROUP(f)                                             \
+	TRY ((f->step_gid > 0) ? H5_SUCCESS : h5_error (               \
+                     H5_ERR_INVAL,                                     \
+                     "Time step is invalid! Have you set the time step?"));
+
+
+
+#endif

src/h5core/private/h5_attribs.h

@@ -0,0 +1,95 @@
+/*
+  Copyright (c) 2006-2016, The Regents of the University of California,
+  through Lawrence Berkeley National Laboratory (subject to receipt of any
+  required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
+  Institut (Switzerland).  All rights reserved.
+
+  License: see file COPYING in top level of source distribution.
+*/
+
+#ifndef __PRIVATE_H5_ATTRIBS_H
+#define __PRIVATE_H5_ATTRIBS_H
+
+#include "private/h5_types.h"
+#include "private/h5_model.h"
+#include "private/h5_hdf5.h"
+
+h5_err_t
+h5priv_read_attrib (
+	const hid_t id,
+	const char* attrib_name,
+	const hid_t attrib_type,
+	void* const attrib_value
+	);
+
+h5_err_t
+h5priv_write_attrib (
+	const hid_t id,
+	const char* attrib_name,
+	const hid_t attrib_type,
+	const void* attrib_value,
+	const hsize_t attrib_nelem,
+	const int overwrite
+	);
+
+static inline h5_err_t
+get_attrib_info (
+	hid_t attrib_id,
+	h5_int64_t* attrib_type,	/*!< OUT: H5 type of attribute */
+	h5_size_t* attrib_nelem		/*!< OUT: number of elements */
+	) {
+        H5_INLINE_FUNC_ENTER (h5_err_t);
+	hid_t mytype;
+        TRY (mytype = hdf5_get_attribute_type (attrib_id));
+
+        H5T_class_t type_class;
+        TRY (type_class = hdf5_get_class_type (mytype));
+
+	if (attrib_nelem) {
+                if (type_class == H5T_STRING) {
+                        *attrib_nelem = H5Tget_size(mytype);
+                } else {
+                        hid_t space_id;
+                        TRY (space_id = hdf5_get_attribute_dataspace (attrib_id));
+                        TRY (*attrib_nelem = hdf5_get_npoints_of_dataspace (space_id));
+                        TRY (hdf5_close_dataspace (space_id));
+                }
+	}
+	if (attrib_type) {
+		TRY (*attrib_type = h5priv_normalize_h5_type (mytype));
+	}
+        TRY (hdf5_close_type (mytype));
+	TRY (hdf5_close_attribute (attrib_id));
+	H5_INLINE_FUNC_RETURN (H5_SUCCESS);
+}
+
+static inline h5_err_t
+h5priv_get_attrib_info_by_name (
+	const hid_t id,			/*!< IN: HDF5 object ID */
+	const char* const attrib_name,	/*!< IN: name of attribute */
+	h5_int64_t* attrib_type,	/*!< OUT: H5 type of attribute */
+	h5_size_t* attrib_nelem		/*!< OUT: number of elements */
+	) {
+	H5_PRIV_API_ENTER (h5_err_t,
+			   "id=%lld, "
+			   "attrib_name=%s,"
+			   "attrib_type=%p, attrib_nelem=%p",
+			   (long long int)id,
+			   attrib_name,
+			   attrib_type,
+			   attrib_nelem);
+	hid_t attrib_id;
+        TRY (attrib_id = hdf5_open_attribute (id, attrib_name));
+        H5_PRIV_API_RETURN (get_attrib_info (attrib_id, attrib_type, attrib_nelem));
+}
+
+h5_err_t
+h5priv_get_attrib_info_by_idx (
+	const hid_t id,
+	const h5_size_t attrib_idx,
+	char* attrib_name,
+	const h5_size_t len_attrib_name,
+	h5_int64_t* attrib_type,
+	h5_size_t* attrib_nelem
+	);
+#endif

src/h5core/private/h5_debug.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,8 +7,8 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5_DEBUG_PRIVATE_H
-#define __H5_DEBUG_PRIVATE_H
+#ifndef __PRIVATE_H5_DEBUG_H
+#define __PRIVATE_H5_DEBUG_H
 
 #include "h5core/h5_debug.h"
 

src/h5core/private/h5_errorhandling.h

@@ -1,8 +1,10 @@
-#ifndef __H5_ERRORHANDLING_PRIVATE_H
-#define __H5_ERRORHANDLING_PRIVATE_H
+#ifndef __PRIVATE_H5_ERRORHANDLING_H
+#define __PRIVATE_H5_ERRORHANDLING_H
 
 #include "h5core/h5_errorhandling.h"
 
+extern const char* const H5_O_MODES[];
+
 #define h5priv_handle_file_mode_error( mode_id )                        \
         h5_error(                                                       \
                 H5_ERR_BADF,                                            \

src/h5core/private/h5_fcmp.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.

src/h5core/private/h5_fcmp.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,8 +7,8 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5_FCMP_H
-#define __H5_FCMP_H
+#ifndef __PRIVATE_H5_FCMP_H
+#define __PRIVATE_H5_FCMP_H
 
 #include "h5core/h5_types.h"
 

src/h5core/private/h5_hdf5.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -10,7 +10,7 @@
 #include <string.h>
 #include <hdf5.h>
 
-#include "h5_hdf5_private.h"
+#include "private/h5_hdf5.h"
 
 #include "h5core/h5_types.h"
 #include "h5core/h5_syscall.h"

src/h5core/private/h5_hdf5.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,14 +7,15 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5_HDF5_PRIVATE_H
-#define __H5_HDF5_PRIVATE_H
+#ifndef __PRIVATE_H5_HDF5_H
+#define __PRIVATE_H5_HDF5_H
 
 #include <hdf5.h>
 
 #include "h5core/h5_types.h"
 #include "h5core/h5_errorhandling.h"
-#include "h5_debug_private.h"
+#include "private/h5_debug.h"
+#include "private/h5_va_macros.h"
 
 ssize_t
 hdf5_get_num_groups (

src/h5core/private/h5_hsearch.c

@@ -19,7 +19,7 @@
    02111-1307 USA.  */
 
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -32,8 +32,8 @@
 #include <assert.h>
 #include <stddef.h>
 
-#include "h5_debug_private.h"
-#include "h5_hsearch_private.h"
+#include "private/h5_debug.h"
+#include "private/h5_hsearch.h"
 
 #include "h5core/h5_types.h"
 #include "h5core/h5_syscall.h"

src/h5core/private/h5_hsearch.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,8 +7,8 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5_HSEARCH_PRIVATE_H
-#define __H5_HSEARCH_PRIVATE_H
+#ifndef __PRIVATE_H5_HSEARCH_H
+#define __PRIVATE_H5_HSEARCH_H
 
 #include "h5core/h5_types.h"
 

src/h5core/private/h5_init.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,11 +7,11 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5_INIT_PRIVATE_H
-#define __H5_INIT_PRIVATE_H
+#ifndef __PRIVATE_H5_INIT_H
+#define __PRIVATE_H5_INIT_H
 
 #include "h5core/h5_types.h"
-#include "h5t_types_private.h"
+#include "private/h5t_types.h"
 
 #ifdef __cplusplus
 extern "C" {

src/h5core/private/h5_io.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,13 +7,13 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5core/h5.h"
-#include "h5_types_private.h"
+#include "h5core/h5_init.h"
+#include "private/h5_types.h"
 
-#include "h5_errorhandling_private.h"
-#include "h5_hdf5_private.h"
-#include "h5_model_private.h"
-#include "h5_readwrite_private.h"
+#include "private/h5_errorhandling.h"
+#include "private/h5_hdf5.h"
+#include "private/h5_model.h"
+#include "private/h5_io.h"
 
 /*!
    Write data to dataset.

src/h5core/private/h5_io.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,28 +7,11 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5_READWRITE_PRIVATE_H
-#define __H5_READWRITE_PRIVATE_H
+#ifndef __PRIVATE_H5_IO_H
+#define __PRIVATE_H5_IO_H
 
 #include "h5core/h5_types.h"
 
-
-#define is_writable(f) (f->props->flags & (H5_O_RDWR | H5_O_WRONLY | H5_O_APPENDONLY))
-#define is_readable(f) (f->props->flags & (H5_O_RDWR | H5_O_RDONLY))
-#define is_readonly(f) (f->props->flags & H5_O_RDONLY)
-#define is_appendonly(f) (f->props->flags & H5_O_APPENDONLY)
-
-#define CHECK_WRITABLE_MODE(f)                                          \
-	TRY (is_writable (f) ? H5_SUCCESS : h5_error (                  \
-                     H5_ERR_INVAL,                                      \
-                     "Attempting to write to read-only file"));
-
-#define CHECK_TIMEGROUP(f)                                             \
-	TRY ((f->step_gid > 0) ? H5_SUCCESS : h5_error (               \
-                     H5_ERR_INVAL,                                     \
-                     "Time step is invalid! Have you set the time step?"));
-
-
 /*
    information about HDF5 dataset
  */
@@ -73,11 +56,6 @@ h5priv_read_dataset (
         hid_t (*)(h5t_mesh_t* const, const hid_t),
 	void* const);
 
-h5_int64_t
-h5priv_normalize_h5_type (
-	hid_t type
-	);
-
 h5_int64_t
 h5priv_get_dataset_type(
 	const hid_t group_id,

src/h5core/private/h5_lustre.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,7 +7,7 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
 
 #ifdef H5_USE_LUSTRE
 

src/h5core/private/h5_lustre.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,8 +7,8 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5_LUSTRE_PRIVATE_H
-#define __H5_LUSTRE_PRIVATE_H
+#ifndef __PRIVATE_H5_LUSTRE_H
+#define __PRIVATE_H5_LUSTRE_H
 
 #include "h5core/h5_types.h"
 

src/h5core/private/h5_maps.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,10 +7,10 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
 
-#include "h5_errorhandling_private.h"
-#include "h5_maps_private.h"
+#include "private/h5_errorhandling.h"
+#include "private/h5_maps.h"
 
 /*
    Allocate new/empty string-list

src/h5core/private/h5_maps.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,14 +7,14 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5_MAPS_PRIVATE_H
-#define __H5_MAPS_PRIVATE_H
+#ifndef __PRIVATE_H5_MAPS_H
+#define __PRIVATE_H5_MAPS_H
 
-#include "h5_types_private.h"
+#include "private/h5_types.h"
 #include "h5core/h5_debug.h"
 #include "h5core/h5_errorhandling.h"
 #include "h5core/h5_syscall.h"
-#include "h5_debug_private.h"
+#include "private/h5_debug.h"
 
 typedef struct {
 	size_t size;

src/h5core/private/h5_model.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,8 +7,8 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5_MODEL_PRIVATE_H
-#define __H5_MODEL_PRIVATE_H
+#ifndef __PRIVATE_H5_MODEL_H
+#define __PRIVATE_H5_MODEL_H
 
 
 /* WARNING! Changing these values will alter the data model and introduce
@@ -26,8 +26,8 @@
 
 #include "h5core/h5_types.h"
 #include "h5core/h5_model.h"
-#include "h5_private.h"
-#include "h5_mpi_private.h"
+#include "private/h5.h"
+#include "private/h5_mpi.h"
 
 #ifdef PARALLEL_IO
 static inline h5_err_t
@@ -113,4 +113,9 @@ h5priv_close_step (
 	const h5_file_p f
 	);
 
+h5_int64_t
+h5priv_normalize_h5_type (
+	hid_t type
+	);
+
 #endif

src/h5core/private/h5_mpi.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,14 +7,14 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5_MPI_PRIVATE_H
-#define __H5_MPI_PRIVATE_H
+#ifndef __PRIVATE_H5_MPI_H
+#define __PRIVATE_H5_MPI_H
 
 #ifdef PARALLEL_IO
 
 #include "h5core/h5_types.h"
 #include "h5core/h5_errorhandling.h"
-#include "h5_debug_private.h"
+#include "private/h5_debug.h"
 
 static inline h5_err_t
 h5priv_mpi_alltoall (

src/h5core/private/h5_qsort.c

@@ -38,7 +38,7 @@ static char sccsid[] = "@(#)qsort.c	8.1 (Berkeley) 6/4/93";
 
 #include <stdlib.h>
 
-#include "h5_qsort_private.h"
+#include "private/h5_qsort.h"
 
 #ifdef I_AM_QSORT_R
 typedef int cmp_t (void *, const void *, const void *);

src/h5core/private/h5_qsort.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,8 +7,8 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5_QSORT_PRIVATE_H
-#define __H5_QSORT_PRIVATE_H
+#ifndef __PRIVATE_H5_QSORT_H
+#define __PRIVATE_H5_QSORT_H
 
 #include "h5core/h5_types.h"
 void

src/h5core/private/h5_types.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,8 +7,8 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5_TYPES_PRIVATE_H
-#define __H5_TYPES_PRIVATE_H
+#ifndef __PRIVATE_H5_TYPES_H
+#define __PRIVATE_H5_TYPES_H
 
 #include <hdf5.h>
 #include "h5core/h5_types.h"

src/h5core/private/h5_va_macros.h

@@ -1,5 +1,5 @@
-#ifndef __H5_VA_MACROS_H
-#define __H5_VA_MACROS_H
+#ifndef __PRIVATE_H5_VA_MACROS_H
+#define __PRIVATE_H5_VA_MACROS_H
 
 #define PP_NARG(...) \
         PP_NARG_(__VA_ARGS__,PP_RSEQ_N())

src/h5core/private/h5b_io.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,8 +7,8 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5B_READWRITE_PRIVATE_H
-#define __H5B_READWRITE_PRIVATE_H
+#ifndef __PRIVATE_H5B_IO_H
+#define __PRIVATE_H5B_IO_H
 
 #include "h5core/h5_types.h"
 

src/h5core/private/h5b_model.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,8 +7,8 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5B_MODEL_PRIVATE_H
-#define __H5B_MODEL_PRIVATE_H
+#ifndef __PRIVATE_H5B_MODEL_H
+#define __PRIVATE_H5B_MODEL_H
 
 #include "h5core/h5_types.h"
 

src/h5core/private/h5b_types.h

@@ -1,5 +1,5 @@
-#ifndef __H5B_TYPES_PRIVATE_H
-#define __H5B_TYPES_PRIVATE_H
+#ifndef __PRIVATE_H5B_TYPES_H
+#define __PRIVATE_H5B_TYPES_H
 
 struct h5b_partition {
 	h5_int64_t i_start;

src/h5core/private/h5t_access.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,11 +7,11 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5T_ACCESS_PRIVATE_H
-#define __H5T_ACCESS_PRIVATE_H
+#ifndef __PRIVATE_H5T_ACCESS_H
+#define __PRIVATE_H5T_ACCESS_H
 
 #include "h5core/h5_types.h"
-#include "h5t_types_private.h"
+#include "private/h5t_types.h"
 
 struct h5t_access_methods {
 #if defined(WITH_PARALLEL_H5GRID)

src/h5core/private/h5t_access_tetm.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,13 +7,15 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5core/h5.h"
-#include "h5_private.h"
-#include "h5_types_private.h"
-#include "h5_init_private.h"
-#include "h5t_types_private.h"
-#include "h5t_model_private.h"
-#include "h5t_access_private.h"
+#include "h5core/h5_init.h"
+#include "h5core/h5_debug.h"
+
+#include "private/h5.h"
+#include "private/h5_types.h"
+#include "private/h5_init.h"
+#include "private/h5t_types.h"
+#include "private/h5t_model.h"
+#include "private/h5t_access.h"
 
 /*** op's on local elements ***/
 

src/h5core/private/h5t_access_trim.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,12 +7,14 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5core/h5.h"
-#include "h5_private.h"
-#include "h5_init_private.h"
-#include "h5t_types_private.h"
-#include "h5t_model_private.h"
-#include "h5t_access_private.h"
+#include "h5core/h5_init.h"
+#include "h5core/h5_debug.h"
+
+#include "private/h5.h"
+#include "private/h5_init.h"
+#include "private/h5t_types.h"
+#include "private/h5t_model.h"
+#include "private/h5t_access.h"
 
 #if defined(WITH_PARALLEL_H5GRID)
 static MPI_Datatype

src/h5core/private/h5t_adjacencies.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,12 +7,12 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5T_ADJACENCIES_PRIVATE_H
-#define __H5T_ADJACENCIES_PRIVATE_H
+#ifndef __PRIVATE_H5T_ADJACENCIES_H
+#define __PRIVATE_H5T_ADJACENCIES_H
 
 #include "h5core/h5_types.h"
-#include "h5t_types_private.h"
-#include "h5_debug_private.h"
+#include "private/h5t_types.h"
+#include "private/h5_debug.h"
 
 struct h5t_adjacency_methods {
 	h5_err_t (*get_adjacencies)(

src/h5core/private/h5t_adjacencies_tetm.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,13 +7,13 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5_maps_private.h"
-#include "h5t_core_private.h"
-#include "h5t_types_private.h"
-#include "h5t_model_private.h"
-#include "h5t_map_private.h"
-#include "h5t_access_private.h"
-#include "h5t_adjacencies_private.h"
+#include "private/h5_maps.h"
+#include "private/h5t_core.h"
+#include "private/h5t_types.h"
+#include "private/h5t_model.h"
+#include "private/h5t_map.h"
+#include "private/h5t_access.h"
+#include "private/h5t_adjacencies.h"
 
 #include <time.h>
 

src/h5core/private/h5t_adjacencies_trim.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,12 +7,12 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5t_types_private.h"
-#include "h5t_model_private.h"
-#include "h5t_map_private.h"
-#include "h5t_access_private.h"
-#include "h5t_adjacencies_private.h"
-#include "h5t_core_private.h"
+#include "private/h5t_types.h"
+#include "private/h5t_model.h"
+#include "private/h5t_map.h"
+#include "private/h5t_access.h"
+#include "private/h5t_adjacencies.h"
+#include "private/h5t_core.h"
 
 #include <time.h>
 

src/h5core/private/h5t_core.c

@@ -1,12 +1,12 @@
 #include <string.h>
 
-#include "h5t_types_private.h"
+#include "private/h5t_types.h"
 #include "h5core/h5t_map.h"
 
-#include "h5t_map_private.h"
-#include "h5t_core_private.h"
-#include "h5t_access_private.h"
-#include "h5t_errorhandling_private.h"
+#include "private/h5t_map.h"
+#include "private/h5t_core.h"
+#include "private/h5t_access.h"
+#include "private/h5t_errorhandling.h"
 
 h5_err_t
 h5tpriv_grow_te_htab (

src/h5core/private/h5t_core.h

@@ -1,5 +1,14 @@
-#ifndef __H5T_CORE_PRIVATE_H
-#define __H5T_CORE_PRIVATE_H
+/*
+  Copyright (c) 2006-2016, The Regents of the University of California,
+  through Lawrence Berkeley National Laboratory (subject to receipt of any
+  required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
+  Institut (Switzerland).  All rights reserved.
+
+  License: see file COPYING in top level of source distribution.
+*/
+
+#ifndef __PRIVATE_H5T_CORE_H
+#define __PRIVATE_H5T_CORE_H
 
 
 #define MAX_CHUNKS_PER_OCTANT 4 // WARNING there are probably places where the makro isn't used
@@ -11,22 +20,22 @@
 #define MAX_NUM_ELEMS_TO_REFINE_LOCALLY 2048 // used define instead of having number in code
 
 
-#include "h5t_tags_private.h"
+#include "private/h5t_tags.h"
 
-#include "h5t_types_private.h"
+#include "private/h5t_types.h"
 
-#include "h5t_access_private.h"
-#include "h5t_adjacencies_private.h"
-#include "h5t_map_private.h"
-#include "h5t_model_private.h"
-#include "h5t_ref_elements_private.h"
-#include "h5t_readwrite_private.h"
-#include "h5t_retrieve_private.h"
-#include "h5t_store_private.h"
+#include "private/h5t_access.h"
+#include "private/h5t_adjacencies.h"
+#include "private/h5t_map.h"
+#include "private/h5t_model.h"
+#include "private/h5t_ref_elements.h"
+#include "private/h5t_io.h"
+#include "private/h5t_retrieve.h"
+#include "private/h5t_store.h"
 
-#include "h5t_errorhandling_private.h"
+#include "private/h5t_errorhandling.h"
 
-#include "h5t_octree_private.h"
+#include "private/h5t_octree.h"
 
 #include <assert.h>
 

src/h5core/private/h5t_core_tetm.c

@@ -16,11 +16,11 @@
 #include <string.h>
 
 
-#include "h5_maps_private.h"
-#include "h5t_model_private.h"
-#include "h5t_types_private.h"
-#include "h5t_core_private.h"
-#include "h5t_retrieve_private.h"
+#include "private/h5_maps.h"
+#include "private/h5t_model.h"
+#include "private/h5t_types.h"
+#include "private/h5t_core.h"
+#include "private/h5t_retrieve.h"
 
 
 #define H5_LOC_ELEM_T   h5_loc_tet_t

src/h5core/private/h5t_core_trim.c

@@ -15,10 +15,10 @@
 #include <string.h>
 #include <assert.h>
 
-#include "h5t_types_private.h"
-#include "h5t_model_private.h"
-#include "h5t_core_private.h"
-#include "h5t_core_private.h"
+#include "private/h5t_types.h"
+#include "private/h5t_model.h"
+#include "private/h5t_core.h"
+#include "private/h5t_core.h"
 
 #define H5_LOC_ELEM_T h5_loc_tri_t
 

src/h5core/private/h5t_errorhandling.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,12 +7,12 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5T_ERRORHANDLING_PRIVATE_H
-#define __H5T_ERRORHANDLING_PRIVATE_H
+#ifndef __PRIVATE_H5T_ERRORHANDLING_H
+#define __PRIVATE_H5T_ERRORHANDLING_H
 
 #include "h5core/h5_types.h"
 #include "h5core/h5_errorhandling.h"
-#include "h5_debug_private.h"
+#include "private/h5_debug.h"
 
 #define ERR_ELEM_NEXIST  "Element with local vertex IDs (%s) doesn't exist!"
 

src/h5core/private/h5t_io.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,11 +7,11 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5T_READWRITE_PRIVATE_H
-#define __H5T_READWRITE_PRIVATE_H
+#ifndef __PRIVATE_H5T_IO_H
+#define __PRIVATE_H5T_IO_H
 
 #include "h5core/h5_types.h"
-#include "h5t_types_private.h"
+#include "private/h5t_types.h"
 
 struct h5t_read_methods {
 	h5_err_t (*init_loc_elems_struct)(h5t_mesh_t* const,

src/h5core/private/h5t_io_tetm.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,10 +7,10 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5t_types_private.h"
-#include "h5t_map_private.h"
-#include "h5t_model_private.h"
-#include "h5t_readwrite_private.h"
+#include "private/h5t_types.h"
+#include "private/h5t_map.h"
+#include "private/h5t_model.h"
+#include "private/h5t_io.h"
 
 #include "h5core/h5t_map.h"
 /*

src/h5core/private/h5t_io_trim.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,11 +7,11 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5t_types_private.h"
-#include "h5t_map_private.h"
-#include "h5t_model_private.h"
-#include "h5t_readwrite_private.h"
-#include "h5t_access_private.h"
+#include "private/h5t_types.h"
+#include "private/h5t_map.h"
+#include "private/h5t_model.h"
+#include "private/h5t_io.h"
+#include "private/h5t_access.h"
 
 #include "h5core/h5t_map.h"
 

src/h5core/private/h5t_map.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,15 +7,15 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5T_MAP_PRIVATE_H
-#define __H5T_MAP_PRIVATE_H
+#ifndef __PRIVATE_H5T_MAP_H
+#define __PRIVATE_H5T_MAP_H
 
-#include "h5_types_private.h"
+#include "private/h5_types.h"
 #include "h5core/h5_debug.h"
 #include "h5core/h5_errorhandling.h"
 #include "h5core/h5_syscall.h"
-#include "h5_debug_private.h"
-#include "h5t_model_private.h"
+#include "private/h5_debug.h"
+#include "private/h5t_model.h"
 
 /*
   Find ID in sorted list

src/h5core/private/h5t_model.h

@@ -1,17 +1,17 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
 
   License: see file COPYING in top level of source distribution.
 */
-#ifndef __H5T_MODEL_PRIVATE_H
-#define __H5T_MODEL_PRIVATE_H
+#ifndef __PRIVATE_H5T_MODEL_H
+#define __PRIVATE_H5T_MODEL_H
 
 #include "h5core/h5_types.h"
 #include "h5core/h5t_model.h"
-#include "h5t_types_private.h"
+#include "private/h5t_types.h"
 
 #define H5T_CONTAINER_GRPNAME	"Topo"
 #define TETRAHEDRAL_MESHES_GRPNAME "TetMeshes"

src/h5core/private/h5t_model_tetm.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,21 +7,22 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5t_types_private.h"
+#include "private/h5t_types.h"
 
-#include "h5_hdf5_private.h"
-#include "h5_va_macros.h"
+#include "private/h5_hdf5.h"
+#include "private/h5_va_macros.h"
 
 
-#include "h5t_model_private.h"
-#include "h5t_access_private.h"
-#include "h5t_adjacencies_private.h"
-#include "h5t_readwrite_private.h"
-#include "h5t_retrieve_private.h"
-#include "h5t_store_private.h"
+#include "private/h5t_model.h"
+#include "private/h5t_access.h"
+#include "private/h5t_adjacencies.h"
+#include "private/h5t_io.h"
+#include "private/h5t_retrieve.h"
+#include "private/h5t_store.h"
 
-#include "h5_init_private.h"
-#include "h5t_core_private.h"
+#include "private/h5.h"
+#include "private/h5_init.h"
+#include "private/h5t_core.h"
 
 static struct h5t_methods tet_funcs = {
 	&h5tpriv_read_tetm_methods,

src/h5core/private/h5t_model_trim.c

@@ -1,26 +1,27 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
 
   License: see file COPYING in top level of source distribution.
 */
-#include "h5t_types_private.h"
+#include "private/h5t_types.h"
 
-#include "h5_hdf5_private.h"
-#include "h5_mpi_private.h"
-#include "h5_va_macros.h"
+#include "private/h5.h"
+#include "private/h5_hdf5.h"
+#include "private/h5_mpi.h"
+#include "private/h5_va_macros.h"
 
-#include "h5t_model_private.h"
-#include "h5t_access_private.h"
-#include "h5t_adjacencies_private.h"
-#include "h5t_readwrite_private.h"
-#include "h5t_retrieve_private.h"
-#include "h5t_store_private.h"
+#include "private/h5t_model.h"
+#include "private/h5t_access.h"
+#include "private/h5t_adjacencies.h"
+#include "private/h5t_io.h"
+#include "private/h5t_retrieve.h"
+#include "private/h5t_store.h"
 
-#include "h5_init_private.h"
-#include "h5t_core_private.h"
+#include "private/h5_init.h"
+#include "private/h5t_core.h"
 
 static struct h5t_methods tri_funcs = {
 	&h5tpriv_read_trim_methods,

src/h5core/private/h5t_octree.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,8 +7,8 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5T_OCTREE_PRIVATE_H
-#define __H5T_OCTREE_PRIVATE_H
+#ifndef __PRIVATE_H5T_OCTREE_H
+#define __PRIVATE_H5T_OCTREE_H
 
 
 #include "h5core/h5_types.h"

src/h5core/private/h5t_ref_elements.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,9 +7,9 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5t_types_private.h"
-#include "h5t_model_private.h"
-#include "h5t_ref_elements_private.h"
+#include "private/h5t_types.h"
+#include "private/h5t_model.h"
+#include "private/h5t_ref_elements.h"
 
 /*
    information we can retrieve from the reference element:

src/h5core/private/h5t_ref_elements.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,8 +7,8 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5T_REF_ELEMENTS_PRIVATE_H
-#define __H5T_REF_ELEMENTS_PRIVATE_H
+#ifndef __PRIVATE_H5T_REF_ELEMENTS_H
+#define __PRIVATE_H5T_REF_ELEMENTS_H
 
 #include "h5core/h5_types.h"
 

src/h5core/private/h5t_retrieve.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,11 +7,11 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5T_RETRIEVE_PRIVATE_H
-#define __H5T_RETRIEVE_PRIVATE_H
+#ifndef __PRIVATE_H5T_RETRIEVE_H
+#define __PRIVATE_H5T_RETRIEVE_H
 
 #include "h5core/h5_types.h"
-#include "h5t_types_private.h"
+#include "private/h5t_types.h"
 #include "h5core/h5t_retrieve.h"
 
 struct h5t_retrieve_methods {

src/h5core/private/h5t_retrieve_tetm.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,14 +7,14 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5t_types_private.h"
-#include "h5t_errorhandling_private.h"
-#include "h5t_core_private.h"
-#include "h5t_map_private.h"
-#include "h5t_model_private.h"
-#include "h5t_access_private.h"
-#include "h5t_tags_private.h"
-#include "h5t_retrieve_private.h"
+#include "private/h5t_types.h"
+#include "private/h5t_errorhandling.h"
+#include "private/h5t_core.h"
+#include "private/h5t_map.h"
+#include "private/h5t_model.h"
+#include "private/h5t_access.h"
+#include "private/h5t_tags.h"
+#include "private/h5t_retrieve.h"
 
 static h5_err_t
 init_entity_iterator (

src/h5core/private/h5t_retrieve_trim.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,14 +7,14 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5t_types_private.h"
-#include "h5t_errorhandling_private.h"
-#include "h5t_core_private.h"
-#include "h5t_map_private.h"
-#include "h5t_model_private.h"
-#include "h5t_access_private.h"
-#include "h5t_tags_private.h"
-#include "h5t_retrieve_private.h"
+#include "private/h5t_types.h"
+#include "private/h5t_errorhandling.h"
+#include "private/h5t_core.h"
+#include "private/h5t_map.h"
+#include "private/h5t_model.h"
+#include "private/h5t_access.h"
+#include "private/h5t_tags.h"
+#include "private/h5t_retrieve.h"
 
 static h5_err_t
 init_entity_iterator (

src/h5core/private/h5t_store.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,11 +7,11 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5T_STORE_PRIVATE_H
-#define __H5T_STORE_PRIVATE_H
+#ifndef __PRIVATE_H5T_STORE_H
+#define __PRIVATE_H5T_STORE_H
 
 #include "h5core/h5_types.h"
-#include "h5t_types_private.h"
+#include "private/h5t_types.h"
 #include "h5core/h5t_store.h"
 
 struct h5t_store_methods {

src/h5core/private/h5t_store_tetm.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,15 +7,15 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5t_types_private.h"
-#include "h5t_errorhandling_private.h"
-#include "h5t_access_private.h"
-#include "h5t_adjacencies_private.h"
-#include "h5t_core_private.h"
-#include "h5t_map_private.h"
-#include "h5t_model_private.h"
-#include "h5t_readwrite_private.h"
-#include "h5t_store_private.h"
+#include "private/h5t_types.h"
+#include "private/h5t_errorhandling.h"
+#include "private/h5t_access.h"
+#include "private/h5t_adjacencies.h"
+#include "private/h5t_core.h"
+#include "private/h5t_map.h"
+#include "private/h5t_model.h"
+#include "private/h5t_io.h"
+#include "private/h5t_store.h"
 
 #include "h5core/h5t_map.h"
 

src/h5core/private/h5t_store_trim.c

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,15 +7,15 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#include "h5t_types_private.h"
-#include "h5t_errorhandling_private.h"
-#include "h5t_access_private.h"
-#include "h5t_adjacencies_private.h"
-#include "h5t_core_private.h"
-#include "h5t_map_private.h"
-#include "h5t_model_private.h"
-#include "h5t_readwrite_private.h"
-#include "h5t_store_private.h"
+#include "private/h5t_types.h"
+#include "private/h5t_errorhandling.h"
+#include "private/h5t_access.h"
+#include "private/h5t_adjacencies.h"
+#include "private/h5t_core.h"
+#include "private/h5t_map.h"
+#include "private/h5t_model.h"
+#include "private/h5t_io.h"
+#include "private/h5t_store.h"
 
 #include "h5core/h5t_map.h"
 

src/h5core/private/h5t_tags.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,8 +7,8 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5T_TAGS_PRIVATE_H
-#define __H5T_TAGS_PRIVATE_H
+#ifndef __PRIVATE_H5T_TAGS_H
+#define __PRIVATE_H5T_TAGS_H
 
 #include <hdf5.h>
 

src/h5core/private/h5t_types.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,18 +7,18 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5T_TYPES_PRIVATE_H
-#define __H5T_TYPES_PRIVATE_H
+#ifndef __PRIVATE_H5T_TYPES_H
+#define __PRIVATE_H5T_TYPES_H
 
 #include "h5core/h5_types.h"
-#include "h5_types_private.h"
-#include "h5_hsearch_private.h"
-#include "h5_maps_private.h"
+#include "private/h5_types.h"
+#include "private/h5_hsearch.h"
+#include "private/h5_maps.h"
 
-#include "h5t_ref_elements_private.h"
+#include "private/h5t_ref_elements.h"
 
-#include "h5_readwrite_private.h"
-#include "h5t_octree_private.h"
+#include "private/h5_io.h"
+#include "private/h5t_octree.h"
 
 
 typedef struct h5_glb_vertex {

src/h5core/private/h5u_errorhandling.h

@@ -1,5 +1,5 @@
-#ifndef __H5U_ERRORHANDLING_PRIVATE_H
-#define __H5U_ERRORHANDLING_PRIVATE_H
+#ifndef __PRIVATE_H5U_ERRORHANDLING_H
+#define __PRIVATE_H5U_ERRORHANDLING_H
 
 #define HANDLE_H5_SET_VIEW_ERR( f, rc, start, end )     \
         h5_error(                                       \

src/h5core/private/h5u_io.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,8 +7,8 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5U_READWRITE_PRIVATE_H
-#define __H5U_READWRITE_PRIVATE_H
+#ifndef __PRIVATE_H5U_IO_H
+#define __PRIVATE_H5U_IO_H
 
 #include "h5core/h5_types.h"
 

src/h5core/private/h5u_types.h

@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2006-2015, The Regents of the University of California,
+  Copyright (c) 2006-2016, The Regents of the University of California,
   through Lawrence Berkeley National Laboratory (subject to receipt of any
   required approvals from the U.S. Dept. of Energy) and the Paul Scherrer
   Institut (Switzerland).  All rights reserved.
@@ -7,8 +7,8 @@
   License: see file COPYING in top level of source distribution.
 */
 
-#ifndef __H5U_TYPES_PRIVATE_H
-#define __H5U_TYPES_PRIVATE_H
+#ifndef __PRIVATE_H5U_TYPES_H
+#define __PRIVATE_H5U_TYPES_H
 
 #include "h5core/h5_types.h"
 

src/include/H5Block_attribs.h

@@ -12,8 +12,7 @@
 
 #include <string.h>
 
-#include "h5core/h5_types.h"
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
 #include "h5core/h5_debug.h"
 #include "h5core/h5b_attribs.h"
 

src/include/H5Block_io.h

@@ -10,8 +10,7 @@
 #ifndef __H5BLOCK_IO_H
 #define __H5BLOCK_IO_H
 
-#include "h5core/h5_types.h"
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
 #include "h5core/h5_debug.h"
 #include "h5core/h5b_io.h"
 
@@ -19,136 +18,12 @@
 extern "C" {
 #endif
 
-/*
-   !   _                   _          
-   !  (_)_ __   __ _ _   _(_)_ __ ___ 
-   !  | | '_ \ / _` | | | | | '__/ _ \
-   !  | | | | | (_| | |_| | | | |  __/
-   !  |_|_| |_|\__, |\__,_|_|_|  \___|
-   !              |_|
-   !
-*/
-
 
 /**
    \addtogroup h5block_io
    @{
 */
 
-/**
-  Query number of fields in current time step.
-
-  \return \c number of fields
-  \return H5_FAILURE on error
-*/
-static inline h5_ssize_t
-H5BlockGetNumFields (
-	const h5_file_t f		///< [in]  file handle.
-	) {
-	H5_API_ENTER (h5_ssize_t,
-                      "f=%p",
-                      (h5_file_p)f);
-	H5_API_RETURN (h5b_get_num_fields(f));
-}
-
-/**
-  Get the name, rank and dimensions of the field specified by the
-  index \c idx.
-
-  \c elem_rank reports the rank of the elements in the field
-  (e.g. scalar or vector).
-
-  This function can be used to retrieve all fields bound to the
-  current time-step by looping from \c 0 to the number of fields
-  minus one.  The number of fields bound to the current time-step
-  can be queried by calling the function \ref H5BlockGetNumFields.
-
-  \return \c H5_SUCCESS on success
-  \return \c H5_FAILURE on error
-*/
-static inline h5_err_t
-H5BlockGetFieldInfo (
-	const h5_file_t f,		///< [in]  file handle
-	const h5_size_t idx,		///< [in]  index of field
-	char* name,			///< [out] field name
-	const h5_size_t len_name,	///< [in]  buffer size
-	h5_size_t* field_rank,		///< [out] field rank
-	h5_size_t* field_dims,		///< [out] field dimensions
-	h5_size_t* elem_rank,		///< [out] element rank
-	h5_int64_t* type		///< [out] datatype
-	) {
-	H5_API_ENTER (h5_err_t,
-		      "f=%p, idx=%llu, "
-		      "name=%p, len_name=%llu, "
-		      "field_rank=%p, field_dims=%p, elem_rank=%p, type=%p",
-		      (h5_file_p)f, (long long unsigned)idx,
-		      name, (long long unsigned)len_name, 
-		      field_rank, field_dims, elem_rank,
-		      type);
-	H5_API_RETURN (
-		h5b_get_field_info (
-			f,
-			idx,
-			name,
-			len_name,
-			field_rank,
-			field_dims,
-			elem_rank,
-			type));
-}
-
-/**
-   Determines whether a field with a given name exists.
-
-   \return      true (value \c >0) if atrribute exists
-   \return      false (\c 0) if attribute does not exist
-   \return      \c H5_FAILURE on error
-  */
-static inline h5_err_t
-H5BlockHasField (
-	const h5_file_t f,		///< [in]  file handle
-	const char* name		///< [in]  field name
-	) {
-	H5_API_ENTER (h5_err_t,
-		      "f=%p, name='%s'",
-		      (h5_file_p)f, name);
-	H5_API_RETURN (
-		h5b_has_field (
-			f,
-			name));
-}
-
-/**
-  Get the rank and dimensions of the field specified by its name.
-
-  \return \c H5_SUCCESS on success
-  \return \c H5_FAILURE on error
-
-  \see H5BlockGetFieldInfo.
-*/
-static inline h5_err_t
-H5BlockGetFieldInfoByName (
-	const h5_file_t f,		///< [in]  file handle
-	const char* name,		///< [in]  field name
-	h5_size_t* field_rank,		///< [out] field rank
-	h5_size_t* field_dims,		///< [out] field dimensions
-	h5_size_t* elem_rank,		///< [out] element rank
-	h5_int64_t* type		///< [out] datatype
-	) {
-	H5_API_ENTER (h5_err_t,
-		      "f=%p, name='%s', "
-		      "field_rank=%p, field_dims=%p, elem_rank=%p, type=%p",
-		      (h5_file_p)f, name, field_rank, field_dims, elem_rank, type);
-	H5_API_RETURN (
-		h5b_get_field_info_by_name (
-			f,
-			name,
-			field_rank,
-			field_dims,
-			elem_rank,
-			type));
-}
-
 /*
   !                 _ _                       _            
   !  __      ___ __(_) |_ ___   ___  ___ __ _| | __ _ _ __ 
@@ -216,7 +91,9 @@ H5Block3dWriteScalarFieldFloat64 (
 	H5_API_ENTER (h5_err_t,
                       "f=%p, name='%s', buffer=%p",
                       (h5_file_p)f, name, buffer);
-	H5_API_RETURN (h5b_write_scalar_data(f, name, (void*)buffer, H5T_NATIVE_DOUBLE ));
+	H5_API_RETURN (
+		h5b_write_scalar_data (
+			f, name, (void*)buffer, H5T_NATIVE_DOUBLE ));
 }
 
 static inline h5_err_t
@@ -229,7 +106,9 @@ H5Block3dWriteScalarFieldFloat32 (
 	H5_API_ENTER (h5_err_t,
                       "f=%p, name='%s', buffer=%p",
                       (h5_file_p)f, name, buffer);
-	H5_API_RETURN (h5b_write_scalar_data(f, name, buffer, H5T_NATIVE_FLOAT ));
+	H5_API_RETURN (
+		h5b_write_scalar_data (
+			f, name, buffer, H5T_NATIVE_FLOAT ));
 }
 
 static inline h5_err_t
@@ -242,7 +121,9 @@ H5Block3dWriteScalarFieldInt64 (
 	H5_API_ENTER (h5_err_t,
                       "f=%p, name='%s', buffer=%p",
                       (h5_file_p)f, name, buffer);
-	H5_API_RETURN (h5b_write_scalar_data(f, name, buffer, H5T_NATIVE_INT64 ));
+	H5_API_RETURN (
+		h5b_write_scalar_data (
+			f, name, buffer, H5T_NATIVE_INT64 ));
 }
 
 static inline h5_err_t
@@ -255,7 +136,9 @@ H5Block3dWriteScalarFieldInt32 (
 	H5_API_ENTER (h5_err_t,
                       "f=%p, name='%s', buffer=%p",
                       (h5_file_p)f, name, buffer);
-	H5_API_RETURN (h5b_write_scalar_data(f, name, buffer, H5T_NATIVE_INT32 ));
+	H5_API_RETURN (
+		h5b_write_scalar_data (
+			f, name, buffer, H5T_NATIVE_INT32 ));
 }
 
 /*
@@ -316,7 +199,9 @@ H5Block3dReadScalarFieldFloat64 (
 	H5_API_ENTER (h5_err_t,
                       "f=%p, name='%s', buffer=%p",
                       (h5_file_p)f, name, buffer);
-	H5_API_RETURN (h5b_read_scalar_data(f, name, (void*)buffer, H5T_NATIVE_DOUBLE));
+	H5_API_RETURN (
+		h5b_read_scalar_data (
+			f, name, (void*)buffer, H5T_NATIVE_DOUBLE));
 }
 
 static inline h5_err_t
@@ -329,7 +214,9 @@ H5Block3dReadScalarFieldFloat32 (
 	H5_API_ENTER (h5_err_t,
                       "f=%p, name='%s', buffer=%p",
                       (h5_file_p)f, name, buffer);
-	H5_API_RETURN (h5b_read_scalar_data(f, name, buffer, H5T_NATIVE_FLOAT));
+	H5_API_RETURN (
+		h5b_read_scalar_data (
+			f, name, buffer, H5T_NATIVE_FLOAT));
 }
 
 static inline h5_err_t
@@ -342,7 +229,9 @@ H5Block3dReadScalarFieldInt64 (
 	H5_API_ENTER (h5_err_t,
                       "f=%p, name='%s', buffer=%p",
                       (h5_file_p)f, name, buffer);
-	H5_API_RETURN (h5b_read_scalar_data(f, name, buffer, H5T_NATIVE_INT64));
+	H5_API_RETURN (
+		h5b_read_scalar_data (
+			f, name, buffer, H5T_NATIVE_INT64));
 }
 
 static inline h5_err_t
@@ -355,7 +244,9 @@ H5Block3dReadScalarFieldInt32 (
 	H5_API_ENTER (h5_err_t,
                       "f=%p, name='%s', buffer=%p",
                       (h5_file_p)f, name, buffer);
-	H5_API_RETURN (h5b_read_scalar_data(f, name, buffer, H5T_NATIVE_INT32));
+	H5_API_RETURN (
+		h5b_read_scalar_data (
+			f, name, buffer, H5T_NATIVE_INT32));
 }
 
 /*
@@ -438,8 +329,11 @@ H5Block3dWriteVector3dFieldFloat64 (
 	H5_API_ENTER (h5_err_t,
                       "f=%p, name='%s', x_buf=%p, y_buf=%p, z_buf=%p",
 		      (h5_file_p)f, name, x_buf, y_buf, z_buf);
-	H5_API_RETURN(h5b_write_vector3d_data(f, name,
-		(void*)x_buf, (void*)y_buf, (void*)z_buf, H5T_NATIVE_DOUBLE));
+	H5_API_RETURN (
+		h5b_write_vector3d_data(
+			f, name,
+			(void*)x_buf, (void*)y_buf, (void*)z_buf,
+			H5T_NATIVE_DOUBLE));
 }
 
 static inline h5_err_t
@@ -454,8 +348,11 @@ H5Block3dWriteVector3dFieldFloat32 (
 	H5_API_ENTER (h5_err_t,
                       "f=%p, name='%s', x_buf=%p, y_buf=%p, z_buf=%p",
 		      (h5_file_p)f, name, x_buf, y_buf, z_buf);
-	H5_API_RETURN(h5b_write_vector3d_data(f, name,
-		x_buf, y_buf, z_buf, H5T_NATIVE_FLOAT));
+	H5_API_RETURN(
+		h5b_write_vector3d_data (
+			f, name,
+			x_buf, y_buf, z_buf,
+			H5T_NATIVE_FLOAT));
 }
 
 static inline h5_err_t
@@ -470,8 +367,11 @@ H5Block3dWriteVector3dFieldInt64 (
 	H5_API_ENTER (h5_err_t,
                       "f=%p, name='%s', x_buf=%p, y_buf=%p, z_buf=%p",
 		      (h5_file_p)f, name, x_buf, y_buf, z_buf);
-	H5_API_RETURN (h5b_write_vector3d_data(f, name,
-					       x_buf, y_buf, z_buf, H5T_NATIVE_INT64));
+	H5_API_RETURN (
+		h5b_write_vector3d_data (
+			f, name,
+			x_buf, y_buf, z_buf,
+			H5T_NATIVE_INT64));
 }
 
 static inline h5_err_t
@@ -486,8 +386,11 @@ H5Block3dWriteVector3dFieldInt32 (
 	H5_API_ENTER (h5_err_t,
                       "f=%p, name='%s', x_buf=%p, y_buf=%p, z_buf=%p",
 		      (h5_file_p)f, name, x_buf, y_buf, z_buf);
-	H5_API_RETURN(h5b_write_vector3d_data(f, name,
-					      x_buf, y_buf, z_buf, H5T_NATIVE_INT32));
+	H5_API_RETURN (
+		h5b_write_vector3d_data(
+			f, name,
+			x_buf, y_buf, z_buf,
+			H5T_NATIVE_INT32));
 }
 
 /*
@@ -564,8 +467,11 @@ H5Block3dReadVector3dFieldFloat64 (
 	H5_API_ENTER (h5_err_t,
                       "f=%p, name='%s', x_buf=%p, y_buf=%p, z_buf=%p",
 		      (h5_file_p)f, name, x_buf, y_buf, z_buf);
-	H5_API_RETURN(h5b_read_vector3d_data(f, name,
-		x_buf, y_buf, z_buf, H5T_NATIVE_DOUBLE));
+	H5_API_RETURN (
+		h5b_read_vector3d_data (
+			f, name,
+			x_buf, y_buf, z_buf,
+			H5T_NATIVE_DOUBLE));
 }
 
 static inline h5_err_t
@@ -580,8 +486,11 @@ H5Block3dReadVector3dFieldFloat32 (
 	H5_API_ENTER (h5_err_t,
                       "f=%p, name='%s', x_buf=%p, y_buf=%p, z_buf=%p",
 		      (h5_file_p)f, name, x_buf, y_buf, z_buf);
-	H5_API_RETURN(h5b_read_vector3d_data(f, name,
-		x_buf, y_buf, z_buf, H5T_NATIVE_FLOAT));
+	H5_API_RETURN (
+		h5b_read_vector3d_data (
+			f, name,
+			x_buf, y_buf, z_buf,
+			H5T_NATIVE_FLOAT));
 }
 
 static inline h5_err_t
@@ -596,8 +505,11 @@ H5Block3dReadVector3dFieldInt64 (
 	H5_API_ENTER (h5_err_t,
                       "f=%p, name='%s', x_buf=%p, y_buf=%p, z_buf=%p",
 		      (h5_file_p)f, name, x_buf, y_buf, z_buf);
-	H5_API_RETURN (h5b_read_vector3d_data(f, name,
-					      x_buf, y_buf, z_buf, H5T_NATIVE_INT64));
+	H5_API_RETURN (
+		h5b_read_vector3d_data (
+			f, name,
+			x_buf, y_buf, z_buf,
+			H5T_NATIVE_INT64));
 }
 
 static inline h5_err_t
@@ -612,8 +524,11 @@ H5Block3dReadVector3dFieldInt32 (
 	H5_API_ENTER (h5_err_t,
                       "f=%p, name='%s', x_buf=%p, y_buf=%p, z_buf=%p",
 		      (h5_file_p)f, name, x_buf, y_buf, z_buf);
-	H5_API_RETURN(h5b_read_vector3d_data(f, name,
-					     x_buf, y_buf, z_buf, H5T_NATIVE_INT32));
+	H5_API_RETURN (
+		h5b_read_vector3d_data (
+			f, name,
+			x_buf, y_buf, z_buf,
+			H5T_NATIVE_INT32));
 }
 ///< @}
 

src/include/H5Block_model.h

@@ -10,8 +10,7 @@
 #ifndef __H5BLOCK_MODEL
 #define __H5BLOCK_MODEL
 
-#include "h5core/h5_types.h"
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
 #include "h5core/h5_debug.h"
 #include "h5core/h5b_model.h"
 
@@ -24,7 +23,15 @@
 extern "C" {
 #endif
 
-/********************** defining the layout **********************************/
+/*
+   !   _                   _          
+   !  (_)_ __   __ _ _   _(_)_ __ ___ 
+   !  | | '_ \ / _` | | | | | '__/ _ \
+   !  | | | | | (_| | |_| | | | |  __/
+   !  |_|_| |_|\__, |\__,_|_|_|  \___|
+   !              |_|
+   !
+*/
 
 /**
   Checks whether the current time-step has field data or not.
@@ -43,6 +50,124 @@ H5BlockHasFieldData (
         H5_API_RETURN (h5b_has_field_data (f));
 }
 
+
+/**
+  Query number of fields in current time step.
+
+  \return \c number of fields
+  \return H5_FAILURE on error
+*/
+static inline h5_ssize_t
+H5BlockGetNumFields (
+	const h5_file_t f		///< [in]  file handle.
+	) {
+	H5_API_ENTER (h5_ssize_t,
+                      "f=%p",
+                      (h5_file_p)f);
+	H5_API_RETURN (h5b_get_num_fields(f));
+}
+
+/**
+  Get the name, rank and dimensions of the field specified by the
+  index \c idx.
+
+  \c elem_rank reports the rank of the elements in the field
+  (e.g. scalar or vector).
+
+  This function can be used to retrieve all fields bound to the
+  current time-step by looping from \c 0 to the number of fields
+  minus one.  The number of fields bound to the current time-step
+  can be queried by calling the function \ref H5BlockGetNumFields.
+
+  \return \c H5_SUCCESS on success
+  \return \c H5_FAILURE on error
+*/
+static inline h5_err_t
+H5BlockGetFieldInfo (
+	const h5_file_t f,		///< [in]  file handle
+	const h5_size_t idx,		///< [in]  index of field
+	char* name,			///< [out] field name
+	const h5_size_t len_name,	///< [in]  buffer size
+	h5_size_t* field_rank,		///< [out] field rank
+	h5_size_t* field_dims,		///< [out] field dimensions
+	h5_size_t* elem_rank,		///< [out] element rank
+	h5_int64_t* type		///< [out] datatype
+	) {
+	H5_API_ENTER (h5_err_t,
+		      "f=%p, idx=%llu, "
+		      "name=%p, len_name=%llu, "
+		      "field_rank=%p, field_dims=%p, elem_rank=%p, type=%p",
+		      (h5_file_p)f, (long long unsigned)idx,
+		      name, (long long unsigned)len_name, 
+		      field_rank, field_dims, elem_rank,
+		      type);
+	H5_API_RETURN (
+		h5b_get_field_info (
+			f,
+			idx,
+			name,
+			len_name,
+			field_rank,
+			field_dims,
+			elem_rank,
+			type));
+}
+
+/**
+   Determines whether a field with a given name exists.
+
+   \return      true (value \c >0) if atrribute exists
+   \return      false (\c 0) if attribute does not exist
+   \return      \c H5_FAILURE on error
+  */
+static inline h5_err_t
+H5BlockHasField (
+	const h5_file_t f,		///< [in]  file handle
+	const char* name		///< [in]  field name
+	) {
+	H5_API_ENTER (h5_err_t,
+		      "f=%p, name='%s'",
+		      (h5_file_p)f, name);
+	H5_API_RETURN (
+		h5b_has_field (
+			f,
+			name));
+}
+
+/**
+  Get the rank and dimensions of the field specified by its name.
+
+  \return \c H5_SUCCESS on success
+  \return \c H5_FAILURE on error
+
+  \see H5BlockGetFieldInfo.
+*/
+static inline h5_err_t
+H5BlockGetFieldInfoByName (
+	const h5_file_t f,		///< [in]  file handle
+	const char* name,		///< [in]  field name
+	h5_size_t* field_rank,		///< [out] field rank
+	h5_size_t* field_dims,		///< [out] field dimensions
+	h5_size_t* elem_rank,		///< [out] element rank
+	h5_int64_t* type		///< [out] datatype
+	) {
+	H5_API_ENTER (h5_err_t,
+		      "f=%p, name='%s', "
+		      "field_rank=%p, field_dims=%p, elem_rank=%p, type=%p",
+		      (h5_file_p)f, name, field_rank, field_dims,
+		      elem_rank, type);
+	H5_API_RETURN (
+		h5b_get_field_info_by_name (
+			f,
+			name,
+			field_rank,
+			field_dims,
+			elem_rank,
+			type));
+}
+
+/********************** defining the layout **********************************/
+
 /**
   Tests whether a view has been set, either directly with
   \ref H5Block3dSetView or indirectly with \ref H5Block3dSetGrid.

src/include/H5Fed_adjacency.h

@@ -11,7 +11,7 @@
 #define __H5FED_ADJACENCY_H
 
 #include "h5core/h5_types.h"
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
 #include "h5core/h5_debug.h"
 #include "h5core/h5t_adjacencies.h"
 

src/include/H5Fed_model.h

@@ -11,7 +11,7 @@
 #define __H5FED_MODEL_H
 
 #include "h5core/h5_types.h"
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
 #include "h5core/h5_debug.h"
 #include "h5core/h5t_model.h"
 

src/include/H5Fed_retrieve.h

@@ -11,7 +11,7 @@
 #define __H5FED_RETRIEVE_H
 
 #include "h5core/h5_types.h"
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
 #include "h5core/h5_debug.h"
 #include "h5core/h5_syscall.h"
 #include "h5core/h5t_map.h"

src/include/H5Fed_store.h

@@ -11,7 +11,7 @@
 #define __H5FED_STORE_H
 
 #include "h5core/h5_types.h"
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
 #include "h5core/h5_debug.h"
 #include "h5core/h5t_store.h"
 

src/include/H5Fed_tags.h

@@ -11,7 +11,7 @@
 #define __H5FED_TAGS_H
 
 #include "h5core/h5_types.h"
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
 #include "h5core/h5_debug.h"
 #include "h5core/h5t_tags.h"
 

src/include/H5Part_io.h

@@ -10,203 +10,19 @@
 #ifndef H5PART_IO
 #define H5PART_IO
 
-#include "h5core/h5_types.h"
-#include "h5core/h5.h"
+#include "h5core/h5_init.h"
 #include "h5core/h5_debug.h"
 #include "h5core/h5u_io.h"
-#include "h5core/h5u_model.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-/*
-   !   _                   _          
-   !  (_)_ __   __ _ _   _(_)_ __ ___ 
-   !  | | '_ \ / _` | | | | | '__/ _ \
-   !  | | | | | (_| | |_| | | | |  __/
-   !  |_|_| |_|\__, |\__,_|_|_|  \___|
-   !              |_|
-   !
-*/
 
 /**
    \addtogroup h5part_io
    @{
 */
-/**
-  Get the number of datasets that are stored at the current step.
-
-  \return   number of datasets in current timestep
-  \return   \c H5_FAILURE on error
-*/
-static inline h5_ssize_t
-H5PartGetNumDatasets (
-	const h5_file_t f		///< [in]  file handle
-	) {
-	H5_API_ENTER (h5_err_t,
-                      "f=%p",
-                      (h5_file_p)f);
-	H5_API_RETURN (h5u_get_num_datasets(f));
-}
-
-/**
-  Query the name of a dataset given by it's index in the current step.
-
-  If the number of datasets is \c n, the range of \c _index is \c 0 to \c n-1.
-
-  \return \c H5_SUCCESS on success
-  \return \c H5_FAILURE on error
-*/
-static inline h5_err_t
-H5PartGetDatasetName (
-	const h5_file_t f,           	///< [in]  file handle
-	const h5_id_t idx,      	///< [in]  index of the dataset
-	char* name,             	///< [out] name of dataset
-	const h5_size_t len     	///< [in]  size of buffer \c name
-	) {
-	H5_API_ENTER (h5_err_t, 
-		       "f=%p, "
-		       "idx=%lld, "
-		       "name='%p', len=%llu, ",
-                      (h5_file_p)f,
-		       (long long)idx,
-		       name, (unsigned long long)len);
-	H5_API_RETURN (h5u_get_dataset_info(f, idx, name, len, NULL, NULL));
-}
-
-/**
-  Gets the name, type and number of elements of a dataset based on its
-  index in the current timestep.
-
-  Type is one of the following values:
-
-  - \c H5_FLOAT64_T (for \c h5_float64_t)
-  - \c H5_FLOAT32_T (for \c h5_float32_t)
-  - \c H5_INT64_T (for \c h5_int64_t)
-  - \c H5_INT32_T (for \c h5_int32_t)
-
-  \return \c H5_SUCCESS on success
-  \return \c H5_FAILURE on error
-
-  \see H5PartGetNumDatasets()
-  \see H5PartGetDatasetInfoByName()
-*/
-static inline h5_err_t
-H5PartGetDatasetInfo (
-	const h5_file_t f,           	///< [in]  file handle
-	const h5_id_t idx,      	///< [in]  index of the dataset
-	char* name,             	///< [out] name of dataset
-	const h5_size_t len_name,       ///< [in]  size of buffer \c name
-	h5_int64_t* type,       	///< [out] type of data in dataset
-	h5_size_t* nelems        	///< [out] number of elements
-	) {
-	H5_API_ENTER (h5_int64_t, 
-		      "f=%p, "
-		      "idx=%lld, "
-		      "name='%p', len_name=%llu, "
-		      "type=%p, nelems=%p",
-		      (h5_file_p)f,
-		      (long long)idx,
-		      name, (long long unsigned)len_name,
-		      type, nelems);
-	H5_API_RETURN (h5u_get_dataset_info (
-			       f, idx, name, len_name, type, nelems));
-}
-/**
-  Determines whether a dataset with given name exists in current step.
-
-  \return      true (value \c >0) if step exists
-  \return      false (\c 0) if step does not exist
-  \return      \c H5_FAILURE on error
-*/
-static inline h5_err_t
-H5PartHasDataset (
-	const h5_file_t f,           	///< [in]  file handle
-	const char* const name         	///< [in]  name of dataset
-	) {
-	H5_API_ENTER (h5_int64_t, 
-		      "f=%p, name='%s'",
-		      (h5_file_p)f, name);
-	H5_API_RETURN (h5u_has_dataset (f, name));
-}
-
-/**
-  Gets the type and number of elements of a dataset based on its
-  name in the current timestep.
-
-  Type is one of the following values:
-
-  - \c H5_FLOAT64_T (for \c h5_float64_t)
-  - \c H5_FLOAT32_T (for \c h5_float32_t)
-  - \c H5_INT64_T (for \c h5_int64_t)
-  - \c H5_INT32_T (for \c h5_int32_t)
-
-  \return \c H5_SUCCESS on success
-  \return \c H5_FAILURE on error
-
-  \see H5PartHasDataset()
-  \see H5PartGetDatasetInfo()
-*/
-static inline h5_err_t
-H5PartGetDatasetInfoByName (
-	const h5_file_t f,           	///< [in]  file handle
-	const char* const name,         ///< [in]  name of dataset
-	h5_int64_t* type,       	///< [out] type of data in dataset
-	h5_size_t* nelems        	///< [out] number of elements
-	) {
-	H5_API_ENTER (h5_int64_t, 
-		      "f=%p, "
-		      "name='%s', "
-		      "type=%p, nelems=%p",
-		      (h5_file_p)f,
-		      name,
-		      type, nelems);
-	H5_API_RETURN (h5u_get_dataset_info_by_name (
-			       f, name, type, nelems));
-}
-
-/**
-  This function returns the number of particles in this processor's view,
-  if a view has been set.
-
-  If not, it returns the total number of particles across all processors
-  from the last \ref H5PartSetNumParticles() call.
-
-  If you have neither set the number of particles
-  nor set a view, then this returns the total number of
-  particles in the first data set of the current time step.
-  Note that H5Part assumes that all data sets within a given time step
-  have the same number of particles (although the number particles can
-  vary across time steps).
-  
-  If none of these conditions are met, an error is thrown.
-
-  \return	number of elements in datasets in current step.
-  \return       \c H5_FAILURE on error.
- */
-	static inline h5_ssize_t
-H5PartGetNumPoints (
-	const h5_file_t f		///< [in]  file handle.
-	) {
-	H5_API_ENTER (h5_ssize_t,
-                      "f=%p",
-                      (h5_file_p)f);
-	H5_API_RETURN (h5u_get_num_points (f));
-}
-
-/**
-  \see H5PartGetNumPoints()
-*/
-static inline h5_ssize_t
-H5PartGetNumParticles (
-	const h5_file_t f		///< [in]  file handle.
-	) {
-	H5_API_ENTER (h5_ssize_t,
-                      "f=%p",
-                      (h5_file_p)f);
-	H5_API_RETURN (h5u_get_num_points (f));
-}
 
 /*
   !                 _ _