From f7ca3bdac5dc94769390dbe65be341aa061b8f89 Mon Sep 17 00:00:00 2001 From: Achim Gsell Date: Thu, 22 Apr 2010 13:58:17 +0000 Subject: [PATCH] path adapted --- src/C/H5.c | 3 +- src/C/H5Block.c | 4 +- src/C/H5Fed.c | 3 +- src/C/H5Fed_adjacency.c | 3 +- src/C/H5Fed_inquiry.c | 2 +- src/C/H5Fed_map.c | 2 +- src/C/H5Fed_retrieve.c | 2 +- src/C/H5Fed_store.c | 2 +- src/C/H5Fed_tags.c | 2 +- src/C/H5Part.c | 3 +- src/C/H5_inquiry.c | 3 +- src/C/Makefile.am | 25 +++--- src/h5core/Makefile.am | 131 ++++++++++++++--------------- src/h5core/h5_hdf5.c | 4 +- src/h5core/h5_mpi.c | 4 +- src/h5core/h5t_adjacencies.c | 4 +- src/h5core/h5t_hsearch.c | 4 +- src/h5core/h5t_inquiry.c | 4 +- src/h5core/h5t_map.c | 4 +- src/h5core/h5t_openclose.c | 4 +- src/h5core/h5t_readwrite.c | 4 +- src/h5core/h5t_retrieve.c | 7 +- src/h5core/h5t_storemesh.c | 4 +- src/h5core/h5t_tags.c | 4 +- src/h5core/h5t_tetm_adjacencies.c | 4 +- src/h5core/h5u_readwrite.c | 4 +- src/include/H5Block.h | 52 ++++++------ src/include/H5Part.h | 2 +- src/include/h5core/h5t_storemesh.h | 2 +- src/include/h5core/h5t_tags.h | 4 +- 30 files changed, 145 insertions(+), 155 deletions(-) diff --git a/src/C/H5.c b/src/C/H5.c index 9b58734..cf3787c 100644 --- a/src/C/H5.c +++ b/src/C/H5.c @@ -38,8 +38,7 @@ #include #include -#include "h5_core/h5_core.h" -#include "h5_core/h5_core_private.h" +#include "h5core/h5_core.h" #include "H5.h" /****** General routines *****************************************************/ diff --git a/src/C/H5Block.c b/src/C/H5Block.c index b77f234..2285aff 100644 --- a/src/C/H5Block.c +++ b/src/C/H5Block.c @@ -45,8 +45,8 @@ #include -#include "h5_core/h5_core.h" -#include "h5_core/h5_core_private.h" +#include "h5core/h5_core.h" +#include "../h5core/h5_core_private.h" #include "H5Part.h" #include "H5Block.h" diff --git a/src/C/H5Fed.c b/src/C/H5Fed.c index 5747078..cd0479e 100644 --- a/src/C/H5Fed.c +++ b/src/C/H5Fed.c @@ -15,8 +15,7 @@ #include #include -#include "h5_core/h5_core.h" -#include "h5_core/h5_core_private.h" +#include "h5core/h5_core.h" #include "H5Fed.h" h5_err_t diff --git a/src/C/H5Fed_adjacency.c b/src/C/H5Fed_adjacency.c index 847cd3a..bd48f10 100644 --- a/src/C/H5Fed_adjacency.c +++ b/src/C/H5Fed_adjacency.c @@ -14,8 +14,7 @@ */ #include -#include "h5_core/h5_types.h" -#include "h5_core/h5_core.h" +#include "h5core/h5_core.h" #include "H5Fed.h" /****** UPWARD ADJACENCY routines *********************************************/ diff --git a/src/C/H5Fed_inquiry.c b/src/C/H5Fed_inquiry.c index d50525a..0a2489d 100644 --- a/src/C/H5Fed_inquiry.c +++ b/src/C/H5Fed_inquiry.c @@ -19,7 +19,7 @@ #include #include -#include "h5_core/h5_core.h" +#include "h5core/h5_core.h" #include "H5Fed.h" /*! diff --git a/src/C/H5Fed_map.c b/src/C/H5Fed_map.c index 3a9be64..2d76822 100644 --- a/src/C/H5Fed_map.c +++ b/src/C/H5Fed_map.c @@ -19,7 +19,7 @@ #include #include -#include "h5_core/h5_core.h" +#include "h5core/h5_core.h" #include "H5Fed.h" h5_err_t diff --git a/src/C/H5Fed_retrieve.c b/src/C/H5Fed_retrieve.c index f431857..b1acc65 100644 --- a/src/C/H5Fed_retrieve.c +++ b/src/C/H5Fed_retrieve.c @@ -16,7 +16,7 @@ #include #include -#include "h5_core/h5_core.h" +#include "h5core/h5_core.h" #include "H5Fed.h" diff --git a/src/C/H5Fed_store.c b/src/C/H5Fed_store.c index 61ac17f..26a19cc 100644 --- a/src/C/H5Fed_store.c +++ b/src/C/H5Fed_store.c @@ -15,7 +15,7 @@ #include #include -#include "h5_core/h5_core.h" +#include "h5core/h5_core.h" #include "H5Fed.h" diff --git a/src/C/H5Fed_tags.c b/src/C/H5Fed_tags.c index 4a0a435..d09a7f6 100644 --- a/src/C/H5Fed_tags.c +++ b/src/C/H5Fed_tags.c @@ -12,7 +12,7 @@ */ #include -#include "h5_core/h5_core.h" +#include "h5core/h5_core.h" #include "H5Fed.h" /*! diff --git a/src/C/H5Part.c b/src/C/H5Part.c index 2bad3a5..653d2fd 100644 --- a/src/C/H5Part.c +++ b/src/C/H5Part.c @@ -15,8 +15,7 @@ #define close _close #endif /* WIN32 */ -#include "h5_core/h5_core.h" -#include "h5_core/h5_errorhandling_private.h" +#include "h5core/h5_core.h" #include "H5Part.h" /********* Private Variable Declarations *************/ diff --git a/src/C/H5_inquiry.c b/src/C/H5_inquiry.c index 360213a..e97d565 100644 --- a/src/C/H5_inquiry.c +++ b/src/C/H5_inquiry.c @@ -19,8 +19,7 @@ #include #include -#include "h5_core/h5_core.h" -#include "h5_core/h5_core_private.h" +#include "h5core/h5_core.h" #include "H5.h" /*! diff --git a/src/C/Makefile.am b/src/C/Makefile.am index 412a1d1..95e1ece 100644 --- a/src/C/Makefile.am +++ b/src/C/Makefile.am @@ -10,7 +10,7 @@ CC = @CC@ HDFINC = -I$(HDF5ROOT)/include MPIINC = @MPIINC@ -INC = $(HDFINC) ${MPIINC} -I./h5 +INC = $(HDFINC) ${MPIINC} -I../include # H5Part header file location H5PINC = -I@prefix@/include @@ -43,13 +43,13 @@ EXTRA_LIBRARIES = libH5.a # Header files that I wish to install in $(prefix)/include include_HEADERS = \ - H5.h \ - H5Block.h \ - H5Fed.h \ - H5Fed_map.h \ - H5Fed_store.h \ - H5Fed_tags.h \ - H5Part.h + ../include/H5.h \ + ../include/H5Block.h \ + ../include/H5Fed.h + ../include/H5Fed_map.h \ + ../include/H5Fed_store.h \ + ../include/H5Fed_tags.h \ + ../include/H5Part.h # Listing of all possible headers that I may include EXTRA_HEADERS = @@ -68,18 +68,13 @@ libH5_a_SOURCES = \ H5Fed_tags.c \ H5Part.c -SUBDIRS = h5_core bindings - libH5.a: $(libH5_a_OBJECTS) - ${AR} rucs $@ $^ + ${AR} rucs ../lib/$@ $^ %.o : %.c $(CC) $(CFLAGS) $(INC) -c $< -H5Part.o: H5Part.c H5Part.h -H5Block.o: H5Block.c H5Part.h H5Block.h - -clean: clean-recursive +clean: $(RM) -f *~ *.o *.a *.so distclean: clean diff --git a/src/h5core/Makefile.am b/src/h5core/Makefile.am index 3267ffa..2cb9230 100644 --- a/src/h5core/Makefile.am +++ b/src/h5core/Makefile.am @@ -29,42 +29,42 @@ HDFLIB = -L$(HDF5ROOT)/lib -lhdf5 -lz $(SZLIB) @LDFLAGS@ # SZ LIBRARY SZLIB = @SZLIB@ -EXTRA_HEADERS = \ - h5_attribs.h \ - h5_core.h \ - h5_errorhandling.h \ - h5_errorhandling_private.h \ - h5_fcmp_private.h \ - h5_hdf5_private.h \ - h5_hsearch_private.h \ - h5_maps.h \ - h5_mpi_private.h \ - h5_openclose.h \ - h5_qsort_private.h \ - h5_readwrite.h \ - h5_readwrite_private.h \ - h5_syscall_private.h \ - h5_types.h \ - h5b_errorhandling_private.h \ - h5t_adjacencies.h \ - h5t_tetm_adjacencies_private.h \ - h5t_consts_private.h \ - h5t_errorhandling_private.h \ - h5t_hsearch_private.h \ - h5t_inquiry.h \ - h5t_map.h \ - h5t_openclose.h \ - h5t_readwrite.h \ - h5t_readwrite_private.h \ - h5t_retrieve.h \ - h5t_retrieve_private.h \ - h5t_storemesh.h \ - h5t_storemesh_private.h \ - h5t_tags.h \ - h5t_tags_private.h \ - h5u_errorhandling_private.h \ - h5u_readwrite.h \ - hdf5_misc.h +EXTRA_HEADERS = \ + ../include/h5core/h5_attribs.h \ + ../include/h5core/h5_core.h \ + ../include/h5core/h5_errorhandling.h \ + ../include/h5core/h5_maps.h \ + ../include/h5core/h5_openclose.h \ + ../include/h5core/h5_readwrite.h \ + ../include/h5core/h5_types.h \ + ../include/h5core/h5t_adjacencies.h \ + ../include/h5core/h5t_inquiry.h \ + ../include/h5core/h5t_map.h \ + ../include/h5core/h5t_openclose.h \ + ../include/h5core/h5t_readwrite.h \ + ../include/h5core/h5t_retrieve.h \ + ../include/h5core/h5t_storemesh.h \ + ../include/h5core/h5t_tags.h \ + ../include/h5core/h5u_readwrite.h \ + ../include/h5core/hdf5_misc.h \ + h5_errorhandling_private.h \ + h5_fcmp_private.h \ + h5_hdf5_private.h \ + h5_hsearch_private.h \ + h5_mpi_private.h \ + h5_qsort_private.h \ + h5_readwrite_private.h \ + h5_syscall_private.h \ + h5b_errorhandling_private.h \ + h5t_consts_private.h \ + h5t_errorhandling_private.h \ + h5t_hsearch_private.h \ + h5t_readwrite_private.h \ + h5t_retrieve_private.h \ + h5t_storemesh_private.h \ + h5t_tags_private.h \ + h5t_tetm_adjacencies_private.h \ + h5u_errorhandling_private.h # Extra files that I wish to include in the dist tar ball. EXTRA_DIST = $(EXTRA_HEADERS) @@ -82,48 +82,45 @@ EXTRA_LIBRARIES = libH5Core.a include_HEADERS = # Listing of sources -libH5Core_a_SOURCES = \ - h5_attribs.c \ - h5_errorhandling.c \ - h5_fcmp.c \ - h5_hdf5.c \ - h5_hsearch.c \ - h5_maps.c \ - h5_mpi.c \ - h5_openclose.c \ - h5_qsort.c \ - h5_qsort_r.c \ - h5_readwrite.c \ - h5_syscall.c \ - h5t_adjacencies.c \ - h5t_tetm_adjacencies.c \ - h5t_consts.c \ - h5t_errorhandling.c \ - h5t_hsearch.c \ - h5t_inquiry.c \ - h5t_map.c \ - h5t_openclose.c \ - h5t_readwrite.c \ - h5t_retrieve.c \ - h5t_storemesh.c \ - h5t_tags.c \ - h5u_readwrite.c \ +libH5Core_a_SOURCES = \ + h5_attribs.c \ + h5_errorhandling.c \ + h5_fcmp.c \ + h5_hdf5.c \ + h5_hsearch.c \ + h5_maps.c \ + h5_mpi.c \ + h5_openclose.c \ + h5_qsort.c \ + h5_qsort_r.c \ + h5_readwrite.c \ + h5_syscall.c \ + h5t_adjacencies.c \ + h5t_consts.c \ + h5t_errorhandling.c \ + h5t_hsearch.c \ + h5t_inquiry.c \ + h5t_map.c \ + h5t_openclose.c \ + h5t_readwrite.c \ + h5t_retrieve.c \ + h5t_storemesh.c \ + h5t_tags.c \ + h5t_tetm_adjacencies.c \ + h5u_readwrite.c \ hdf5_misc.c libH5Core_a_DEPENDENCIES = $(EXTRA_HEADERS) all: libH5Core.a -libH5Core.a: $(libH5_core_a_OBJECTS) - echo $(libH5_a_OBJECTS) +libH5Core.a: $(libH5Core_a_OBJECTS) ${AR} rucs ../lib/$@ $^ %.o : %.c $(CC) $(CFLAGS) $(INC) -c $< -$(libH5Core_a_OBJECTS): $(libH5_core_a_DEPENDENCIES) - -#errorhandling.o: errorhandling.c +$(libH5Core_a_OBJECTS): $(libH5Core_a_DEPENDENCIES) clean: $(RM) -f *~ *.o *.a *.so diff --git a/src/h5core/h5_hdf5.c b/src/h5core/h5_hdf5.c index a95bfda..52ed1a3 100644 --- a/src/h5core/h5_hdf5.c +++ b/src/h5core/h5_hdf5.c @@ -1,7 +1,7 @@ #include -#include "h5_core/h5_core.h" -#include "h5_core/h5_core_private.h" +#include "h5core/h5_core.h" +#include "h5_core_private.h" /****** G r o u p ************************************************************/ diff --git a/src/h5core/h5_mpi.c b/src/h5core/h5_mpi.c index 112471b..1aa0bea 100644 --- a/src/h5core/h5_mpi.c +++ b/src/h5core/h5_mpi.c @@ -1,7 +1,7 @@ #include -#include "h5_core/h5_core.h" -#include "h5_core/h5_core_private.h" +#include "h5core/h5_core.h" +#include "h5_core_private.h" #ifdef PARALLEL_IO h5_err_t diff --git a/src/h5core/h5t_adjacencies.c b/src/h5core/h5t_adjacencies.c index 6241e40..1c71778 100644 --- a/src/h5core/h5t_adjacencies.c +++ b/src/h5core/h5t_adjacencies.c @@ -16,8 +16,8 @@ #include #include #include -#include "h5_core/h5_core.h" -#include "h5_core/h5_core_private.h" +#include "h5core/h5_core.h" +#include "h5_core_private.h" h5_err_t h5t_get_edges_upadjacent_to_vertex ( diff --git a/src/h5core/h5t_hsearch.c b/src/h5core/h5t_hsearch.c index d8c6e65..c75b38a 100644 --- a/src/h5core/h5t_hsearch.c +++ b/src/h5core/h5t_hsearch.c @@ -1,7 +1,7 @@ #include #include -#include "h5_core/h5_core.h" -#include "h5_core/h5_core_private.h" +#include "h5core/h5_core.h" +#include "h5_core_private.h" static int _cmp_te_entries ( diff --git a/src/h5core/h5t_inquiry.c b/src/h5core/h5t_inquiry.c index 795ab42..f8e078c 100644 --- a/src/h5core/h5t_inquiry.c +++ b/src/h5core/h5t_inquiry.c @@ -6,8 +6,8 @@ #include #include -#include "h5_core/h5_core.h" -#include "h5_core/h5_core_private.h" +#include "h5core/h5_core.h" +#include "h5_core_private.h" /*! Get number of meshes of given type. diff --git a/src/h5core/h5t_map.c b/src/h5core/h5t_map.c index 2f5c087..6a899c5 100644 --- a/src/h5core/h5t_map.c +++ b/src/h5core/h5t_map.c @@ -1,8 +1,8 @@ #include #include -#include "h5_core/h5_core.h" -#include "h5_core/h5_core_private.h" +#include "h5core/h5_core.h" +#include "h5_core_private.h" /* Mapping of global to local id's: diff --git a/src/h5core/h5t_openclose.c b/src/h5core/h5t_openclose.c index 565c39b..2c900fc 100644 --- a/src/h5core/h5t_openclose.c +++ b/src/h5core/h5t_openclose.c @@ -7,8 +7,8 @@ #include #include -#include "h5_core/h5_core.h" -#include "h5_core/h5_core_private.h" +#include "h5core/h5_core.h" +#include "h5_core_private.h" static struct h5t_methods tet_funcs = { h5tpriv_alloc_tets, diff --git a/src/h5core/h5t_readwrite.c b/src/h5core/h5t_readwrite.c index b3c006e..b0822c9 100644 --- a/src/h5core/h5t_readwrite.c +++ b/src/h5core/h5t_readwrite.c @@ -6,8 +6,8 @@ #include #include -#include "h5_core/h5_core.h" -#include "h5_core/h5_core_private.h" +#include "h5core/h5_core.h" +#include "h5_core_private.h" static hid_t _open_space_all ( diff --git a/src/h5core/h5t_retrieve.c b/src/h5core/h5t_retrieve.c index 60061b5..f481ff0 100644 --- a/src/h5core/h5t_retrieve.c +++ b/src/h5core/h5t_retrieve.c @@ -1,8 +1,8 @@ #include #include -#include "h5_core/h5_core.h" -#include "h5_core/h5_core_private.h" +#include "h5core/h5_core.h" +#include "h5_core_private.h" /* Skip elements which have been refined on a level <= the current one. @@ -218,6 +218,8 @@ h5t_traverse_triangles ( return td->value.items[0]; } + +#if 0 /*! Function for traversing entities with 0 < co-dim < co-dim(vertex). In a tetrahedral mesh this means edges and triangle, in triangle @@ -276,6 +278,7 @@ h5t_traverse_faces ( return td->value.items[0]; } +#endif h5_err_t h5t_end_traverse_triangles ( diff --git a/src/h5core/h5t_storemesh.c b/src/h5core/h5t_storemesh.c index 530b140..5620f8f 100644 --- a/src/h5core/h5t_storemesh.c +++ b/src/h5core/h5t_storemesh.c @@ -2,8 +2,8 @@ #include #include -#include "h5_core/h5_core.h" -#include "h5_core/h5_core_private.h" +#include "h5core/h5_core.h" +#include "h5_core_private.h" /*! Add new mesh diff --git a/src/h5core/h5t_tags.c b/src/h5core/h5t_tags.c index 7c18915..5e2a0bb 100644 --- a/src/h5core/h5t_tags.c +++ b/src/h5core/h5t_tags.c @@ -2,8 +2,8 @@ #include #include -#include "h5_core/h5_core.h" -#include "h5_core/h5_core_private.h" +#include "h5core/h5_core.h" +#include "h5_core_private.h" /* To discuss: diff --git a/src/h5core/h5t_tetm_adjacencies.c b/src/h5core/h5t_tetm_adjacencies.c index aa078f8..9f94709 100644 --- a/src/h5core/h5t_tetm_adjacencies.c +++ b/src/h5core/h5t_tetm_adjacencies.c @@ -16,8 +16,8 @@ #include #include #include -#include "h5_core/h5_core.h" -#include "h5_core/h5_core_private.h" +#include "h5core/h5_core.h" +#include "h5_core_private.h" /* compute T(V) from current level up to highest levels. diff --git a/src/h5core/h5u_readwrite.c b/src/h5core/h5u_readwrite.c index d675502..f00fd05 100644 --- a/src/h5core/h5u_readwrite.c +++ b/src/h5core/h5u_readwrite.c @@ -6,8 +6,8 @@ #include #include -#include "h5_core/h5_core.h" -#include "h5_core/h5_core_private.h" +#include "h5core/h5_core.h" +#include "h5_core_private.h" h5_int64_t h5u_has_view ( diff --git a/src/include/H5Block.h b/src/include/H5Block.h index 6dc878b..1e4089f 100644 --- a/src/include/H5Block.h +++ b/src/include/H5Block.h @@ -10,47 +10,47 @@ extern "C" { */ -h5_int64_t +h5_err_t H5BlockDefine3DFieldLayout ( h5_file_t *f, - const h5_int64_t i_start, - const h5_int64_t i_end, - const h5_int64_t j_start, - const h5_int64_t j_end, - const h5_int64_t k_start, - const h5_int64_t k_end + const h5_size_t i_start, + const h5_size_t i_end, + const h5_size_t j_start, + const h5_size_t j_end, + const h5_size_t k_start, + const h5_size_t k_end ); -h5_int64_t +h5_err_t H5Block3dGetPartitionOfProc ( h5_file_t *f, const h5_int64_t proc, - h5_int64_t *i_start, - h5_int64_t *i_end, - h5_int64_t *j_start, - h5_int64_t *j_end, - h5_int64_t *k_start, - h5_int64_t *k_end + h5_size_t *i_start, + h5_size_t *i_end, + h5_size_t *j_start, + h5_size_t *j_end, + h5_size_t *k_start, + h5_size_t *k_end ); -h5_int64_t +h5_err_t H5Block3dGetReducedPartitionOfProc ( h5_file_t *f, - h5_int64_t proc, - h5_int64_t *i_start, - h5_int64_t *i_end, - h5_int64_t *j_start, - h5_int64_t *j_end, - h5_int64_t *k_start, - h5_int64_t *k_end + h5_id_t proc, + h5_size_t *i_start, + h5_size_t *i_end, + h5_size_t *j_start, + h5_size_t *j_end, + h5_size_t *k_start, + h5_size_t *k_end ); -h5_int64_t +h5_id_t H5Block3dGetProcOf ( h5_file_t *f, - h5_int64_t i, - h5_int64_t j, - h5_int64_t k + h5_size_t i, + h5_size_t j, + h5_size_t k ); h5_int64_t diff --git a/src/include/H5Part.h b/src/include/H5Part.h index 50f5232..fc9a3fa 100644 --- a/src/include/H5Part.h +++ b/src/include/H5Part.h @@ -24,7 +24,7 @@ extern "C" { #endif -#include "h5_core/h5_core.h" +#include "h5core/h5_core.h" #include "H5.h" #ifdef PARALLEL_IO #include diff --git a/src/include/h5core/h5t_storemesh.h b/src/include/h5core/h5t_storemesh.h index 45ed93c..dc1e274 100644 --- a/src/include/h5core/h5t_storemesh.h +++ b/src/include/h5core/h5t_storemesh.h @@ -12,7 +12,7 @@ h5t_add_level ( h5_file_t * const f ); -h5_size_t +h5_err_t h5t_begin_store_vertices ( h5_file_t * const f, const h5_size_t num diff --git a/src/include/h5core/h5t_tags.h b/src/include/h5core/h5t_tags.h index 8170325..1a3910e 100644 --- a/src/include/h5core/h5t_tags.h +++ b/src/include/h5core/h5t_tags.h @@ -7,8 +7,8 @@ h5_err_t h5t_add_mtagset ( h5_file_t* const f, char name[], h5_id_t id ); h5_err_t h5t_remove_mtagset ( h5_file_t* const f, const char name[] ); h5_err_t h5t_open_mtagset ( h5_file_t* const f, const char *name, H5T_Tagset** retval ); -h5_size_t h5t_get_num_mtagsets ( h5_file_t* const f ); -h5_size_t h5t_get_mtagsets ( h5_file_t* const f, char** names[] ); +h5_ssize_t h5t_get_num_mtagsets ( h5_file_t* const f ); +h5_ssize_t h5t_get_mtagsets ( h5_file_t* const f, char** names[] ); h5_err_t h5t_get_mtagset_info ( h5_file_t* const f, const h5_id_t idx, char** names, h5_id_t* type ); h5_id_t h5t_get_mtagset_type_by_name ( h5_file_t* const f, char name[] );