diff --git a/.gitattributes b/.gitattributes index 7ab1664..1425578 100644 --- a/.gitattributes +++ b/.gitattributes @@ -423,6 +423,7 @@ src/h5core/h5t_map_private.h -text src/h5core/h5t_openclose.c -text src/h5core/h5t_readwrite.c -text src/h5core/h5t_readwrite_private.h -text +src/h5core/h5t_ref_elements.c -text src/h5core/h5t_retrieve.c -text src/h5core/h5t_retrieve_private.h -text src/h5core/h5t_storemesh.c -text diff --git a/src/h5core/Makefile.am b/src/h5core/Makefile.am index 53ba734..3ddf7bf 100644 --- a/src/h5core/Makefile.am +++ b/src/h5core/Makefile.am @@ -1,33 +1,10 @@ # src level Makefile.am -# PATH SETTING (IMPORTED FROM CONFIGURE) -HDF5ROOT = @HDF5ROOT@ - -OBJEXT = o - # COMPILERS CC = @CC@ -#INCLUDES -HDFINC = -I$(HDF5ROOT)/include -MPIINC = @MPIINC@ - -INC = $(HDFINC) ${MPIINC} -I. -I../include -I../include/h5core - -# H5Part header file location -H5PINC = -I@prefix@/include - -# COMPILER FLAGS -CFLAGS = @CFLAGS@ ${INC} - -# H5Part compiled library location -H5PLIB = -L@prefix@/lib - -# HDF5 LIBRARY -HDFLIB = -L$(HDF5ROOT)/lib -lhdf5 -lz $(SZLIB) @LDFLAGS@ - -# SZ LIBRARY -SZLIB = @SZLIB@ +AM_CPPFLAGS = -I@HDF5ROOT@/include @MPIINC@ -I. -I../include -I../include/h5core +AM_CFLAGS = @CFLAGS@ EXTRA_HEADERS = \ ../include/h5core/h5_attribs.h \ @@ -42,6 +19,7 @@ EXTRA_HEADERS = \ ../include/h5core/h5t_map.h \ ../include/h5core/h5t_openclose.h \ ../include/h5core/h5t_readwrite.h \ + ../include/h5core/h5t_ref_elements.h \ ../include/h5core/h5t_retrieve.h \ ../include/h5core/h5t_storemesh.h \ ../include/h5core/h5t_tags.h \ @@ -72,6 +50,7 @@ EXTRA_DIST = $(EXTRA_HEADERS) # Files that I don't want to include in the dist tar ball nodist_include_HEADERS = +OBJEXT = o # What to build... Will be determined by configure script. lib_LIBRARIES = libH5Core.a @@ -103,6 +82,7 @@ libH5Core_a_SOURCES = \ h5t_map.c \ h5t_openclose.c \ h5t_readwrite.c \ + h5t_ref_elements.c \ h5t_retrieve.c \ h5t_storemesh.c \ h5t_tags.c \ @@ -117,9 +97,6 @@ all: ../lib/libH5Core.a ../lib/libH5Core.a: libH5Core.a -cp $^ $@ -%.o : %.c - $(CC) $(CFLAGS) $(INC) -c $< - $(libH5Core_a_OBJECTS): $(libH5Core_a_DEPENDENCIES) clean: diff --git a/src/h5core/h5t_ref_elements.c b/src/h5core/h5t_ref_elements.c new file mode 100644 index 0000000..1ed5594 --- /dev/null +++ b/src/h5core/h5t_ref_elements.c @@ -0,0 +1,37 @@ +#include "h5_core.h" + +const h5t_ref_element_t h5t_tri_ref_element = { + 2, + {3, 3, 1}, // #vertices, #edges, #triangles + { + [0] = {1, 1, 1}, // #vertices of vertices + [1] = {2, 2, 2}, // #vertices of edges + [2] = {3} // #vertices of trinagles + }, + { + [0] = {{0}, {1}, {2}}, // 3 vertices + [1] = {{0,1}, {0,2}, {1,2}}, // 3 edges + [2] = {{0,1,2}} // 1 triangles + }, + {{0.0, 0.0}, {1.0, 0.0}, {0.0, 1.0}}, +}; + +const h5t_ref_element_t h5t_tet_ref_element = { + 3, + {4, 6, 4, 1}, // #vertices, #edges, #triangles, #tetrahedra + { + [0] = {1,1,1,1}, // #vertices of vertices + [1] = {2,2,2,2,2,2}, // #vertices of edges + [2] = {3,3,3,3}, // #vertices of trinagles + [3] = {4} // #vertices of tets + }, + { + [0] = {{0}, {1}, {2}, {3}}, // 4 vertices + [1] = {{0,1}, {0,2}, {1,2}, {0,3}, {1,3}, {2,3}}, // 6 edges + [2] = {{0,1,2}, {0,1,3}, {0,2,3}, {1,2,3}}, // 4 triangles + [3] = {{0,1,2,3}} // 1 tets + }, + {{0.0, 0.0, 0.0}, {1.0, 0.0, 0.0}, {0.0, 1.0, 0.0}, {0.0, 0.0, 1.0}}, +}; + +