[svn-r9558] Purpose:

insert high level library into main library


Description:
configure.in has a new entry (--enable-hl, disable-hl) it is on by default
the configure message prints info regarding if hl is enabled or not

the tree is
/hl
/hl/src
/hl/test



Solution:

Platforms tested:
linux
solaris
AIX


Misc. update:

8 files changed, 2988 insertions, 0 deletions

diff --git a/hl/test/Dependencies b/hl/test/Dependencies
new file mode 100644
index 0000000..256da53
--- /dev/null
+++ b/hl/test/Dependencies
@@ -0,0 +1,69 @@
+## This file is machine generated on GNU systems.
+## Only temporary changes may be made here.
+
+lite_dset_test.lo: \
+   $(srcdir)/lite_dset_test.c \
+   $(top_srcdir)/src/H5LT.h
+lite_attr_test.lo: \
+   $(srcdir)/lite_attr_test.c \
+   $(top_srcdir)/src/H5LT.h
+image_test.lo: \
+   $(srcdir)/image_test.c \
+   $(top_srcdir)/src/H5IM.h \
+   $(top_srcdir)/src/H5LT.h
+image_demo.lo: \
+   $(srcdir)/image_demo.c \
+   $(top_srcdir)/src/H5IM.h \
+   $(top_srcdir)/src/H5LT.h \
+   $(srcdir)/pal_rgb.h
+image_make.lo: \
+   $(srcdir)/image_make.c \
+   $(top_srcdir)/src/H5IM.h \
+   $(top_srcdir)/src/H5LT.h \
+   $(srcdir)/pal_rgb.h
+make_table.lo: \
+   $(srcdir)/make_table.c \
+   $(top_srcdir)/src/H5TB.h \
+   $(top_srcdir)/src/H5LT.h
+append_record.lo: \
+   $(srcdir)/append_record.c \
+   $(top_srcdir)/src/H5TB.h \
+   $(top_srcdir)/src/H5LT.h
+write_record_fill.lo: \
+   $(srcdir)/write_record_fill.c \
+   $(top_srcdir)/src/H5TB.h \
+   $(top_srcdir)/src/H5LT.h
+field_names.lo: \
+   $(srcdir)/field_names.c \
+   $(top_srcdir)/src/H5TB.h \
+   $(top_srcdir)/src/H5LT.h
+field_index.lo: \
+   $(srcdir)/field_index.c \
+   $(top_srcdir)/src/H5TB.h \
+   $(top_srcdir)/src/H5LT.h
+query_table.lo: \
+   $(srcdir)/query_table.c \
+   $(top_srcdir)/src/H5TB.h \
+   $(top_srcdir)/src/H5LT.h
+insert_record.lo: \
+   $(srcdir)/insert_record.c \
+   $(top_srcdir)/src/H5TB.h \
+   $(top_srcdir)/src/H5LT.h
+delete_record.lo: \
+   $(srcdir)/delete_record.c
+add_record_from.lo: \
+   $(srcdir)/add_record_from.c \
+   $(top_srcdir)/src/H5TB.h \
+   $(top_srcdir)/src/H5LT.h
+combine_tables.lo: \
+   $(srcdir)/combine_tables.c \
+   $(top_srcdir)/src/H5TB.h \
+   $(top_srcdir)/src/H5LT.h
+insert_field.lo: \
+   $(srcdir)/insert_field.c \
+   $(top_srcdir)/src/H5TB.h \
+   $(top_srcdir)/src/H5LT.h
+delete_field.lo: \
+   $(srcdir)/delete_field.c \
+   $(top_srcdir)/src/H5TB.h \
+   $(top_srcdir)/src/H5LT.h
diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
new file mode 100644
index 0000000..d98d0bc
--- /dev/null
+++ b/hl/test/Makefile.in
@@ -0,0 +1,65 @@
+## HDF5 Library Test Makefile(.in)
+##
+## Copyright (C) 2001 National Center for Supercomputing Applications.
+##                    All rights reserved.
+##
+## 
+top_srcdir=@top_srcdir@
+top_builddir=../..
+srcdir=@srcdir@
+@COMMENCE@
+
+## Add include directory to the C preprocessor flags and the h5test and hdf5
+## libraries to the library list.
+CPPFLAGS=-I. -I$(srcdir) -I../src -I$(top_srcdir)/src @CPPFLAGS@
+
+## These are our main targets. They should be listed in the order to be
+## executed, generally most specific tests to least specific tests.
+RUNTEST=$(LT_RUN)
+
+TEST_PROGS=test_lite test_image test_table 
+
+## The libh5test.a library provides common support code for the tests. We link
+## this library statically because some systems can only link executables to
+## a single shared library and libhdf5 is much bigger than libh5test.
+LIBHDF5=$(top_builddir)/src/libhdf5.la
+LIBHDF5_HL=../src/libhdf5_hl.la
+LIB_SRC=
+LIB_OBJ=$(LIB_SRC:.c=.lo)
+PUB_LIB=
+
+## Temporary files.  These files are the ones created by setting the
+## HDF5_NOCLEANUP environment variable and running `make test' without
+## specifying a file prefix or low-level driver.  Changing the file
+## prefix or low-level driver with environment variables will influence 
+## the temporary file name in ways that the makefile is not aware of.
+MOSTLYCLEAN=$(TEST_PROGS)
+CLEAN=*.h5
+
+## Source and object files for programs...  The TEST_SRC list contains all the
+## source files and is used for things like dependencies, archiving, etc.  The
+## other source lists are for the individual tests, the files of which may
+## overlap with other tests.
+
+TEST_SRC=test_lite.c test_image.c test_table.c
+
+TEST_OBJ=$(TEST_SRC:.c=.lo)
+
+## Private header files (not to be installed)...
+PRIVATE_HDR=
+
+## How to build the tests...  They all depend on the hdf5_hl and hdf5
+## libraries.
+$(TEST_PROGS): $(LIBHDF5_HL)
+
+test_lite: test_lite.lo
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ test_lite.lo $(LIBHDF5_HL) $(LIBHDF5) $(LDFLAGS) $(LIBS)
+
+test_image: test_image.lo
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ test_image.lo $(LIBHDF5_HL) $(LIBHDF5)  $(LDFLAGS) $(LIBS)
+
+test_table: test_table.lo
+	@$(LT_LINK_EXE) $(CFLAGS) -o $@ test_table.lo $(LIBHDF5_HL) $(LIBHDF5)  $(LDFLAGS) $(LIBS)
+
+	
+@CONCLUDE@
diff --git a/hl/test/test_image.c b/hl/test/test_image.c
new file mode 100644
index 0000000..aad9d95
--- /dev/null
+++ b/hl/test/test_image.c
@@ -0,0 +1,196 @@
+
+/****************************************************************************
+ * NCSA HDF                                                                 *
+ * Scientific Data Technologies                                             *
+ * National Center for Supercomputing Applications                          *
+ * University of Illinois at Urbana-Champaign                               *
+ * 605 E. Springfield, Champaign IL 61820                                   *
+ *                                                                          *
+ * For conditions of distribution and use, see the accompanying             *
+ * hdf/COPYING f.                                                        *
+ *                                                                          *
+ ****************************************************************************/
+
+
+#include "H5HL.h"
+
+#define FILE_NAME "test_image.h5"
+#define WIDTH  (hsize_t)500
+#define HEIGHT (hsize_t)200
+unsigned char image_in1 [ WIDTH*HEIGHT ];
+unsigned char image_out1[ WIDTH*HEIGHT ];
+unsigned char image_in2 [ WIDTH*HEIGHT*3 ];
+unsigned char image_out2[ WIDTH*HEIGHT*3 ];
+
+
+/*-------------------------------------------------------------------------
+ * the main program
+ *-------------------------------------------------------------------------
+ */
+int main( void )
+{
+ hid_t         file_id;
+ herr_t        status;
+ hsize_t       width, height, planes;
+ hsize_t       pal_dims[] = {9,3};
+ hsize_t       pal_dims_out[2];
+ hsize_t       i;
+ char          interlace[20];
+ hssize_t      npals;
+ herr_t        is_image;
+ herr_t        is_palette;
+
+ unsigned char pal_data_out[9*3];
+ /* create a 9 entry grey palette */
+ unsigned char pal_data_in[9*3] = {0,0,0,
+ 25,25,25,
+ 50,50,50,
+ 75,75,75,
+ 100,100,100,
+ 125,125,125,
+ 150,150,150,
+ 175,175,175,
+ 200,200,200};
+    
+ for (i = 0; i < WIDTH*HEIGHT; i++ )
+  image_in1[i] = (unsigned char)i;
+ for (i = 0; i < WIDTH*HEIGHT*3; i++)
+  image_in2[i] = (unsigned char)i;
+ 
+ /* Create a new HDF5 file using default properties. */
+ file_id = H5Fcreate(FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
+
+/*-------------------------------------------------------------------------
+ * Indexed image test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("indexed image");
+
+ /* Write image */
+ if ( H5IMmake_image_8bit( file_id, "Image1", WIDTH, HEIGHT, image_in1 ) < 0 )
+  goto out;
+
+ /* Make a palette */
+ if ( H5IMmake_palette( file_id, "Pallete", pal_dims, pal_data_in ) < 0 )
+  goto out;
+
+  /* Attach a palette to the image dataset */
+ if ( H5IMlink_palette( file_id, "Image1", "Pallete" ) < 0 )
+  goto out;
+ 
+ /* Read image */
+ if ( H5IMget_image_info( file_id, "Image1", &width, &height, &planes, interlace, &npals ) < 0 )
+  goto out;
+
+ if ( H5IMread_image( file_id, "Image1", image_out1 ) < 0 )
+  goto out;
+
+ for (i = 0; i < height*width*planes; i++) {
+  if ( image_in1[i] != image_out1[i] ) {
+    goto out;
+
+  }
+ }
+
+ PASSED();
+
+/*-------------------------------------------------------------------------
+ * True color image test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("true color image");
+ 
+ /* Write image */
+ if ( H5IMmake_image_24bit( file_id, "Image2", WIDTH, HEIGHT, "INTERLACE_PIXEL", image_in2 ) )
+  goto out;
+
+ /* Read image */
+ if ( H5IMget_image_info( file_id, "Image2", &width, &height, &planes, interlace, &npals ) < 0 )
+  goto out;
+
+ if ( H5IMread_image( file_id, "Image2", image_out2 ) < 0 )
+  goto out;
+
+ for (i = 0; i < height*width*planes; i++) {
+  if ( image_in2[i] != image_out2[i] ) {
+    goto out;
+  }
+ }
+
+ PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5IMget_npalettes test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("pallete functions");
+
+ if ( H5IMget_npalettes( file_id, "Image1", &npals ) < 0 )
+  goto out;
+
+/*-------------------------------------------------------------------------
+ * H5IMget_palette_info test
+ *-------------------------------------------------------------------------
+ */
+
+ if ( H5IMget_palette_info( file_id, "Image1", 0, pal_dims_out ) < 0 )
+  goto out;
+
+ for (i = 0; i < 2; i++) {
+  if ( pal_dims[i] != pal_dims_out[i] ) {
+    goto out;
+  }
+ }
+
+/*-------------------------------------------------------------------------
+ * H5IMget_palette test
+ *-------------------------------------------------------------------------
+ */
+
+ if ( H5IMget_palette( file_id, "Image1", 0, pal_data_out ) < 0 )
+  goto out;
+
+ for (i = 0; i < 9*3; i++) {
+  if ( pal_data_in[i] != pal_data_out[i] ) {
+   goto out;
+  }
+ }
+
+/*-------------------------------------------------------------------------
+ * H5IMis_image test
+ *-------------------------------------------------------------------------
+ */
+
+ if ( (is_image = H5IMis_image( file_id, "Image1" )) < 0 )
+  goto out;
+
+ if ( (is_image = H5IMis_image( file_id, "Image2" )) < 0 )
+  goto out;
+
+/*-------------------------------------------------------------------------
+ * H5IMis_palette test
+ *-------------------------------------------------------------------------
+ */
+
+ if ( (is_palette = H5IMis_palette( file_id, "Pallete" )) < 0 )
+  goto out;
+
+/*-------------------------------------------------------------------------
+ * end tests
+ *-------------------------------------------------------------------------
+ */
+
+     /* Close the file. */
+ status = H5Fclose( file_id );
+
+ PASSED();
+ return 0;
+
+out:
+ H5_FAILED();
+ return 1;
+
+}
diff --git a/hl/test/test_lite.c b/hl/test/test_lite.c
new file mode 100644
index 0000000..56bad3a
--- /dev/null
+++ b/hl/test/test_lite.c
@@ -0,0 +1,1069 @@
+
+/****************************************************************************
+ * NCSA HDF                                                                 *
+ * Scientific Data Technologies                                             *
+ * National Center for Supercomputing Applications                          *
+ * University of Illinois at Urbana-Champaign                               *
+ * 605 E. Springfield, Champaign IL 61820                                   *
+ *                                                                          *
+ * For conditions of distribution and use, see the accompanying             *
+ * hdf/COPYING f.                                                           *
+ *                                                                          *
+ ****************************************************************************/
+
+#include <stdlib.h>
+
+#include "H5HL.h"
+
+#define FILE_NAME "test_lite1.h5"
+#define FILE_NAME2 "test_lite2.h5"
+
+#define DSET0_NAME "2D int array"
+#define DSET1_NAME "dataset char"
+#define DSET2_NAME "dataset short"
+#define DSET3_NAME "dataset int"
+#define DSET4_NAME "dataset long"
+#define DSET5_NAME "dataset float"
+#define DSET6_NAME "dataset double"
+#define DSET7_NAME "dataset string"
+
+#define DIM 6
+
+#define ATTR1_NAME "attr string"
+#define ATTR2_NAME "attr char"
+#define ATTR3_NAME "attr short"
+#define ATTR4_NAME "attr int"
+#define ATTR5_NAME "attr long"
+#define ATTR6_NAME "attr uchar"
+#define ATTR7_NAME "attr ushort"
+#define ATTR8_NAME "attr uint"
+#define ATTR9_NAME "attr ulong"
+#define ATTR10_NAME "attr float"
+#define ATTR11_NAME "attr double"
+
+static herr_t make_attributes( hid_t loc_id, const char* obj_name );
+
+
+
+/*-------------------------------------------------------------------------
+ * test dataset functions
+ *-------------------------------------------------------------------------
+ */
+
+static int test_dsets( void )
+{
+ int     rank     = 2;
+ hsize_t dims[2]  = {2,3};
+ hid_t   file_id;
+ hid_t   dataset_id;
+ char    data_char_in[DIM]    = {1,2,3,4,5,6};
+ char    data_char_out[DIM];
+ short   data_short_in[DIM]   = {1,2,3,4,5,6};
+ short   data_short_out[DIM];
+ int     data_int_in[DIM]     = {1,2,3,4,5,6};   
+ int     data_int_out[DIM];
+ long    data_long_in[DIM]    = {1,2,3,4,5,6};
+ long    data_long_out[DIM];
+ float   data_float_in[DIM]   = {1,2,3,4,5,6};
+ float   data_float_out[DIM];
+ double  data_double_in[DIM]  = {1,2,3,4,5,6};
+ double  data_double_out[DIM];
+	char    *data_string_in = "This is a string";
+	char    data_string_out[20];
+ int     i;
+
+ 
+ /* Create a new file using default properties. */
+ file_id = H5Fcreate( FILE_NAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
+
+/*-------------------------------------------------------------------------
+ * H5LTmake_dataset test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTmake_dataset");
+
+ /* Make dataset */
+ if ( H5LTmake_dataset( file_id, DSET0_NAME, rank, dims, H5T_NATIVE_INT, data_int_in ) < 0 )
+  goto out;
+
+ /* Read dataset using the basic HDF5 API */
+
+ if ( ( dataset_id = H5Dopen ( file_id, DSET0_NAME) ) < 0 ) 
+  goto out;
+
+ if ( H5Dread ( dataset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, data_int_out ) < 0 ) 
+  goto out;
+
+ if ( H5Dclose( dataset_id ) < 0 ) 
+  goto out;
+
+ for (i = 0; i < DIM; i++)
+ {
+  if ( data_int_in[i] != data_int_out[i] ) {
+    goto out;
+  }
+ }
+
+ PASSED();
+
+/*-------------------------------------------------------------------------
+ * read using the LT function H5LTread_dataset 
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTread_dataset");
+
+ if ( H5LTread_dataset( file_id, DSET0_NAME, H5T_NATIVE_INT, data_int_out ) < 0 )
+  goto out;
+
+ for (i = 0; i < DIM; i++)
+ {
+  if ( data_int_in[i] != data_int_out[i] ) {
+    goto out;
+  }
+ }
+
+ PASSED();
+ 
+/*-------------------------------------------------------------------------
+ * test the H5LTmake_dataset_ functions
+ *-------------------------------------------------------------------------
+ */
+
+
+/*-------------------------------------------------------------------------
+ * H5LTmake_dataset_char 
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTmake_dataset_char");
+
+ /* Make dataset char */
+ if ( H5LTmake_dataset_char( file_id, DSET1_NAME, rank, dims, data_char_in ) < 0 )
+  goto out;
+
+ /* Read dataset */
+ if ( H5LTread_dataset( file_id, DSET1_NAME, H5T_NATIVE_CHAR, data_char_out ) < 0 )
+  goto out;
+
+ for (i = 0; i < DIM; i++)
+ {
+  if ( data_char_in[i] != data_char_out[i] ) {
+    goto out;
+  }
+ }
+
+ /* Read dataset */
+ if ( H5LTread_dataset_char( file_id, DSET1_NAME, data_char_out ) < 0 )
+  goto out;
+
+ for (i = 0; i < DIM; i++)
+ {
+  if ( data_char_in[i] != data_char_out[i] ) {
+    goto out;
+  }
+ }
+
+ PASSED();
+
+
+/*-------------------------------------------------------------------------
+ * H5LTmake_dataset_short 
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTmake_dataset_short");
+
+ /* Make dataset short */
+ if ( H5LTmake_dataset_short( file_id, DSET2_NAME, rank, dims, data_short_in ) < 0 )
+  goto out;
+
+ /* Read dataset */
+ if ( H5LTread_dataset( file_id, DSET2_NAME, H5T_NATIVE_SHORT, data_short_out ) < 0 )
+  goto out;
+
+ for (i = 0; i < DIM; i++)
+ {
+  if ( data_short_in[i] != data_short_out[i] ) {
+    goto out;
+  }
+ }
+
+ /* Read dataset */
+ if ( H5LTread_dataset_short( file_id, DSET2_NAME, data_short_out ) < 0 )
+  goto out;
+
+ for (i = 0; i < DIM; i++)
+ {
+  if ( data_short_in[i] != data_short_out[i] ) {
+    goto out;
+  }
+ }
+
+ PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5LTmake_dataset_int 
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTmake_dataset_int");
+
+ /* Make dataset int */
+ if ( H5LTmake_dataset_int( file_id, DSET3_NAME, rank, dims, data_int_in ) < 0 )
+  goto out;
+
+ /* Read dataset */
+ if ( H5LTread_dataset( file_id, DSET3_NAME, H5T_NATIVE_INT, data_int_out ) < 0 )
+  goto out;
+ 
+ for (i = 0; i < DIM; i++)
+ {
+  if ( data_int_in[i] != data_int_out[i] ) {
+    goto out;
+  }
+ }
+ 
+ /* Read dataset */
+ if ( H5LTread_dataset_int( file_id, DSET3_NAME, data_int_out ) < 0 )
+  goto out;
+
+ for (i = 0; i < DIM; i++)
+ {
+  if ( data_int_in[i] != data_int_out[i] ) {
+    goto out;
+  }
+ }
+
+ PASSED();
+
+
+/*-------------------------------------------------------------------------
+ * H5LTmake_dataset_long 
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTmake_dataset_long");
+
+ /* Make dataset long */
+ if ( H5LTmake_dataset_long( file_id, DSET4_NAME, rank, dims, data_long_in ) < 0 )
+  goto out;
+
+ /* Read dataset */
+ if ( H5LTread_dataset( file_id, DSET4_NAME, H5T_NATIVE_LONG, data_long_out ) < 0 )
+  goto out;
+
+ for (i = 0; i < DIM; i++)
+ {
+  if ( data_long_in[i] != data_long_out[i] ) {
+    goto out;
+  }
+ }
+
+  /* Read dataset */
+ if ( H5LTread_dataset_long( file_id, DSET4_NAME, data_long_out ) < 0 )
+  goto out;
+
+ for (i = 0; i < DIM; i++)
+ {
+  if ( data_long_in[i] != data_long_out[i] ) {
+    goto out;
+  }
+ }
+
+ PASSED();
+
+
+/*-------------------------------------------------------------------------
+ * H5LTmake_dataset_float 
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTmake_dataset_float");
+
+ /* Make dataset float */
+ if ( H5LTmake_dataset_float( file_id, DSET5_NAME, rank, dims, data_float_in ) < 0 )
+  goto out;
+
+ /* Read dataset */
+ if ( H5LTread_dataset( file_id, DSET5_NAME, H5T_NATIVE_FLOAT, data_float_out ) < 0 )
+  goto out;
+
+ for (i = 0; i < DIM; i++)
+ {
+  if ( data_float_in[i] != data_float_out[i] ) {
+    goto out;
+  }
+ }
+
+  /* Read dataset */
+ if ( H5LTread_dataset_float( file_id, DSET5_NAME, data_float_out ) < 0 )
+  goto out;
+
+ for (i = 0; i < DIM; i++)
+ {
+  if ( data_float_in[i] != data_float_out[i] ) {
+    goto out;
+  }
+ }
+
+ PASSED();
+
+
+/*-------------------------------------------------------------------------
+ * H5LTmake_dataset_double 
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTmake_dataset_double");
+
+ /* Make dataset double */
+ if ( H5LTmake_dataset_double( file_id, DSET6_NAME, rank, dims, data_double_in ) < 0 )
+  goto out;
+
+ /* Read dataset */
+ if ( H5LTread_dataset( file_id, DSET6_NAME, H5T_NATIVE_DOUBLE, data_double_out ) < 0 )
+  goto out;
+ 
+ for (i = 0; i < DIM; i++)
+ {
+  if ( data_double_in[i] != data_double_out[i] ) {
+    goto out;
+  }
+ }
+
+  /* Read dataset */
+ if ( H5LTread_dataset_double( file_id, DSET6_NAME, data_double_out ) < 0 )
+  goto out;
+
+ for (i = 0; i < DIM; i++)
+ {
+  if ( data_double_in[i] != data_double_out[i] ) {
+    goto out;
+  }
+ }
+
+	PASSED();
+
+
+/*-------------------------------------------------------------------------
+ * H5LTmake_dataset_string 
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTmake_dataset_string");
+
+ /* Make dataset string */
+ if ( H5LTmake_dataset_string(file_id,DSET7_NAME,data_string_in) < 0 )
+  goto out;
+
+ /* Read dataset */
+ if ( H5LTread_dataset_string(file_id,DSET7_NAME,data_string_out) < 0 )
+  goto out;
+ 
+	if ( strcmp(data_string_in,data_string_out) != 0 ) 
+		goto out;
+ 
+
+ 
+/*-------------------------------------------------------------------------
+ * end tests
+ *-------------------------------------------------------------------------
+ */
+ 
+ /* Close the file. */
+ H5Fclose( file_id );
+
+ PASSED();
+
+
+ return 0;
+
+out:
+ /* Close the file. */
+ H5_FAILED();
+ return -1;
+}
+
+/*-------------------------------------------------------------------------
+ * test attribute functions
+ *-------------------------------------------------------------------------
+ */
+
+static int test_attr( void )
+{
+
+ hid_t   file_id;
+ hid_t   dataset_id;
+ hid_t   group_id;
+ hid_t   space_id;  
+ hsize_t dims[1] = { 5 };
+
+ /* Create a new file using default properties. */
+ file_id = H5Fcreate( FILE_NAME2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT );
+
+/*-------------------------------------------------------------------------
+ * Create a dataset named "dset" on the root group
+ *-------------------------------------------------------------------------
+ */
+
+ /* Create the data space  */
+ if ((space_id = H5Screate_simple( 1, dims, NULL ))<0) goto out;
+
+ /* Create the dataset */
+ if ((dataset_id = H5Dcreate( file_id , "dset", H5T_NATIVE_INT, space_id, 
+  H5P_DEFAULT ))<0) goto out;
+
+ /* Close */
+ H5Dclose( dataset_id );
+
+/*-------------------------------------------------------------------------
+ * Create a group named "grp" on the root group
+ *-------------------------------------------------------------------------
+ */
+
+ /* Create a group. */
+ if ((group_id = H5Gcreate( file_id, "grp", 0 ))<0) 
+  goto out;
+  
+ /* Close */
+ H5Gclose( group_id );
+	
+/*-------------------------------------------------------------------------
+ * 
+ * Create attributes in the root group
+	* Note that we are calling the H5LTset_attribute functions with the name "." 
+ * 
+ *-------------------------------------------------------------------------
+ */
+ if (make_attributes( file_id, "." )<0)
+  goto out;
+	
+/*-------------------------------------------------------------------------
+ * 
+ * Create attributes in the dataset "dset"
+ * 
+ *-------------------------------------------------------------------------
+ */
+ if (make_attributes( file_id, "dset" )<0)
+  goto out;
+	
+/*-------------------------------------------------------------------------
+ * 
+ * Create attributes in the group "grp"
+	*
+ *-------------------------------------------------------------------------
+ */
+ if (make_attributes( file_id, "grp" )<0)
+  goto out;
+
+/*-------------------------------------------------------------------------
+ * end
+ *-------------------------------------------------------------------------
+ */
+ /* Close the file. */
+ H5Fclose( file_id );
+
+ return 0;
+
+out:
+ /* Close the file. */
+	H5Fclose( file_id );
+ H5_FAILED();
+ return -1;
+}
+
+/*-------------------------------------------------------------------------
+ * make_attributes
+ *-------------------------------------------------------------------------
+ */
+
+static herr_t make_attributes( hid_t loc_id, const char* obj_name )
+{
+
+ int         rank_out;
+ hsize_t     *dims_out = 0;
+ H5T_class_t type_class;
+ size_t      type_size;
+ int         i;
+
+ char    attr_str_in[]     = {"My attribute"};
+ char    attr_str_out[20];
+ char    attr_char_in[5]   = {1,2,3,4,5};
+ char    attr_char_out[5];
+ short   attr_short_in[5]  = {1,2,3,4,5};
+ short   attr_short_out[5];
+ int     attr_int_in[5]    = {1,2,3,4,5};
+ int     attr_int_out[5];
+ long    attr_long_in[5]   = {1,2,3,4,5};
+ long    attr_long_out[5];
+ float   attr_float_in[5]  = {1,2,3,4,5};
+ float   attr_float_out[5];
+ double  attr_double_in[5] = {1,2,3,4,5};
+ double  attr_double_out[5];
+ unsigned char    attr_uchar_in[5]   = {1,2,3,4,5};
+ unsigned char    attr_uchar_out[5];
+ unsigned short   attr_ushort_in[5]  = {1,2,3,4,5};
+ unsigned short   attr_ushort_out[5];
+ unsigned int     attr_uint_in[5]    = {1,2,3,4,5};
+ unsigned int     attr_uint_out[5];
+ unsigned long    attr_ulong_in[5]   = {1,2,3,4,5};
+ unsigned long    attr_ulong_out[5];
+
+/*-------------------------------------------------------------------------
+ * H5LTset_attribute_string test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTset_attribute_string");
+ 
+ /* Set the attribute */
+ if ( H5LTset_attribute_string( loc_id, obj_name, ATTR1_NAME, attr_str_in ) < 0 )
+  return -1;
+
+	PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5LTset_attribute_string test
+ *-------------------------------------------------------------------------
+ */
+
+	TESTING("H5LTget_attribute_string");
+
+ 
+ /* Get the attribute */
+ if ( H5LTget_attribute_string( loc_id, obj_name, ATTR1_NAME, attr_str_out ) < 0 )
+  return -1;
+
+ if ( strcmp( attr_str_in, attr_str_out ) != 0 ) 
+ {
+  return -1;
+ }
+
+	PASSED();
+
+
+/*-------------------------------------------------------------------------
+ * H5LTset_attribute_char test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTset_attribute_char");
+
+ /* Set the attribute */
+ if ( H5LTset_attribute_char( loc_id, obj_name, ATTR2_NAME, attr_char_in, 5 ) < 0 )
+  return -1;
+
+	PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5LTget_attribute_char test
+ *-------------------------------------------------------------------------
+ */
+
+	TESTING("H5LTget_attribute_char");
+
+ /* Get the attribute */
+ if ( H5LTget_attribute_char( loc_id, obj_name, ATTR2_NAME, attr_char_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_char_in[i] != attr_char_out[i] ) {
+    return -1;
+   }
+  }
+
+	/* Get the attribute */
+ if ( H5LTget_attribute( loc_id, obj_name, ATTR2_NAME, H5T_NATIVE_CHAR, attr_char_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_char_in[i] != attr_char_out[i] ) {
+    return -1;
+   }
+  }
+
+ PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5LTset_attribute_short test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTset_attribute_short");
+
+ /* Set the attribute */
+ if ( H5LTset_attribute_short( loc_id, obj_name, ATTR3_NAME, attr_short_in, 5 ) < 0 )
+  return -1;
+
+	PASSED();
+
+
+/*-------------------------------------------------------------------------
+ * H5LTget_attribute_short test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTget_attribute_short");
+
+ /* Get the attribute */
+ if ( H5LTget_attribute_short( loc_id, obj_name, ATTR3_NAME, attr_short_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_short_in[i] != attr_short_out[i] ) {
+    return -1;
+   }
+  }
+
+	/* Get the attribute */
+ if ( H5LTget_attribute( loc_id, obj_name, ATTR3_NAME, H5T_NATIVE_SHORT, attr_short_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_short_in[i] != attr_short_out[i] ) {
+    return -1;
+   }
+  }
+
+ PASSED();
+
+
+/*-------------------------------------------------------------------------
+ * H5LTset_attribute_int test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTset_attribute_int");
+
+ /* Set the attribute */
+ if ( H5LTset_attribute_int( loc_id, obj_name, ATTR4_NAME, attr_int_in, 5 ) < 0 )
+  return -1;
+
+	PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5LTget_attribute_int test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTget_attribute_int");
+
+ /* Get the attribute */
+ if ( H5LTget_attribute_int( loc_id, obj_name, ATTR4_NAME, attr_int_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_int_in[i] != attr_int_out[i] ) {
+    return -1;
+   }
+  }
+
+	/* Get the attribute */
+ if ( H5LTget_attribute( loc_id, obj_name, ATTR4_NAME, H5T_NATIVE_INT, attr_int_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_int_in[i] != attr_int_out[i] ) {
+    return -1;
+   }
+  }
+
+ PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5LTset_attribute_long test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTset_attribute_long");
+
+ /* Set the attribute */
+ if ( H5LTset_attribute_long( loc_id, obj_name, ATTR5_NAME, attr_long_in, 5 ) < 0 )
+  return -1;
+
+	PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5LTget_attribute_long test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTget_attribute_long");
+
+ /* Get the attribute */
+ if ( H5LTget_attribute_long( loc_id, obj_name, ATTR5_NAME, attr_long_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_long_in[i] != attr_long_out[i] ) {
+    return -1;
+   }
+  }
+
+	/* Get the attribute */
+ if ( H5LTget_attribute( loc_id, obj_name, ATTR5_NAME, H5T_NATIVE_LONG, attr_long_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_long_in[i] != attr_long_out[i] ) {
+    return -1;
+   }
+  }
+
+ PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5LTset_attribute_uchar test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTset_attribute_uchar");
+
+ /* Set the attribute */
+ if ( H5LTset_attribute_uchar( loc_id, obj_name, ATTR6_NAME, attr_uchar_in, 5 ) < 0 )
+  return -1;
+
+	PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5LTget_attribute_uchar test
+ *-------------------------------------------------------------------------
+ */
+
+	TESTING("H5LTget_attribute_uchar");
+
+ /* Get the attribute */
+ if ( H5LTget_attribute_uchar( loc_id, obj_name, ATTR6_NAME, attr_uchar_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_uchar_in[i] != attr_uchar_out[i] ) {
+    return -1;
+   }
+  }
+
+	/* Get the attribute */
+ if ( H5LTget_attribute( loc_id, obj_name, ATTR6_NAME, H5T_NATIVE_UCHAR, attr_uchar_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_uchar_in[i] != attr_uchar_out[i] ) {
+    return -1;
+   }
+  }
+
+ PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5LTset_attribute_ushort test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTset_attribute_ushort");
+
+ /* Set the attribute */
+ if ( H5LTset_attribute_ushort( loc_id, obj_name, ATTR7_NAME, attr_ushort_in, 5 ) < 0 )
+  return -1;
+
+	PASSED();
+
+
+/*-------------------------------------------------------------------------
+ * H5LTget_attribute_ushort test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTget_attribute_ushort");
+
+ /* Get the attribute */
+ if ( H5LTget_attribute_ushort( loc_id, obj_name, ATTR7_NAME, attr_ushort_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_ushort_in[i] != attr_ushort_out[i] ) {
+    return -1;
+   }
+  }
+
+	/* Get the attribute */
+ if ( H5LTget_attribute( loc_id, obj_name, ATTR7_NAME, H5T_NATIVE_USHORT, attr_ushort_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_ushort_in[i] != attr_ushort_out[i] ) {
+    return -1;
+   }
+  }
+
+ PASSED();
+
+
+/*-------------------------------------------------------------------------
+ * H5LTset_attribute_int test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTset_attribute_uint");
+
+ /* Set the attribute */
+ if ( H5LTset_attribute_uint( loc_id, obj_name, ATTR8_NAME, attr_uint_in, 5 ) < 0 )
+  return -1;
+
+	PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5LTget_attribute_int test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTget_attribute_uint");
+
+ /* Get the attribute */
+ if ( H5LTget_attribute_uint( loc_id, obj_name, ATTR8_NAME, attr_uint_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_uint_in[i] != attr_uint_out[i] ) {
+    return -1;
+   }
+  }
+
+	/* Get the attribute */
+ if ( H5LTget_attribute( loc_id, obj_name, ATTR8_NAME, H5T_NATIVE_UINT, attr_uint_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_uint_in[i] != attr_uint_out[i] ) {
+    return -1;
+   }
+  }
+
+ PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5LTset_attribute_ulong test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTset_attribute_ulong");
+
+ /* Set the attribute */
+ if ( H5LTset_attribute_ulong( loc_id, obj_name, ATTR9_NAME, attr_ulong_in, 5 ) < 0 )
+  return -1;
+
+	PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5LTget_attribute_long test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTget_attribute_ulong");
+
+ /* Get the attribute */
+ if ( H5LTget_attribute_ulong( loc_id, obj_name, ATTR9_NAME, attr_ulong_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_ulong_in[i] != attr_ulong_out[i] ) {
+    return -1;
+   }
+  }
+
+	/* Get the attribute */
+ if ( H5LTget_attribute( loc_id, obj_name, ATTR9_NAME, H5T_NATIVE_ULONG, attr_ulong_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_ulong_in[i] != attr_ulong_out[i] ) {
+    return -1;
+   }
+  }
+
+ PASSED();
+
+
+/*-------------------------------------------------------------------------
+ * H5LTset_attribute_float test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTset_attribute_float");
+
+ /* Set the attribute */
+ if ( H5LTset_attribute_float( loc_id, obj_name, ATTR10_NAME, attr_float_in, 5 ) < 0 )
+  return -1;
+
+	PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5LTget_attribute_float test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTget_attribute_float");
+
+
+ /* Get the attribute */
+ if ( H5LTget_attribute_float( loc_id, obj_name, ATTR10_NAME, attr_float_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_float_in[i] != attr_float_out[i] ) {
+    return -1;
+   }
+  }
+
+	/* Get the attribute */
+ if ( H5LTget_attribute( loc_id, obj_name, ATTR10_NAME, H5T_NATIVE_FLOAT, attr_float_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_float_in[i] != attr_float_out[i] ) {
+    return -1;
+   }
+  }
+
+ PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5LTset_attribute_double test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTset_attribute_double");
+
+ /* Set the attribute */
+ if ( H5LTset_attribute_double( loc_id, obj_name, ATTR11_NAME, attr_double_in, 5 ) < 0 )
+  return -1;
+
+	PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5LTget_attribute_double test
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTget_attribute_double");
+
+ /* Get the attribute */
+ if ( H5LTget_attribute_double( loc_id, obj_name, ATTR11_NAME, attr_double_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_double_in[i] != attr_double_out[i] ) {
+    return -1;
+   }
+  }
+
+ /* Get the attribute */
+ if ( H5LTget_attribute( loc_id, obj_name, ATTR11_NAME, H5T_NATIVE_DOUBLE, attr_double_out ) < 0 )
+  return -1;
+
+ for (i = 0; i < 5; i++)
+  {
+   if ( attr_double_in[i] != attr_double_out[i] ) {
+    return -1;
+   }
+  }
+
+ PASSED();
+
+
+/*-------------------------------------------------------------------------
+ * H5LTget_attribute_ndims test 
+ *-------------------------------------------------------------------------
+ */
+
+
+ TESTING("H5LTget_attribute_ndims");
+ 
+ if ( H5LTget_attribute_ndims( loc_id, obj_name, ATTR2_NAME, &rank_out ) < 0 )
+  return -1;
+
+ if ( rank_out != 1 ) {
+  return -1;
+ }
+
+ PASSED();
+
+/*-------------------------------------------------------------------------
+ * H5LTget_attribute_info test 
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING("H5LTget_attribute_info");
+
+ dims_out = malloc( sizeof(hsize_t) * rank_out );
+
+ if ( H5LTget_attribute_info( loc_id, obj_name, ATTR2_NAME, dims_out, &type_class,
+       &type_size) < 0 )
+  return -1;
+
+  for (i = 0; i < rank_out; i++)
+  {
+   if ( dims_out[i] != 5 ) {
+    return -1;
+   }
+  }
+
+ if ( type_class != H5T_INTEGER ) {
+   return -1;
+  }
+
+ if ( dims_out )
+  free( dims_out );
+
+  PASSED();
+
+ return 0;
+}
+
+/*-------------------------------------------------------------------------
+ * the main program
+ *-------------------------------------------------------------------------
+ */
+
+int main( void )
+{
+ int  nerrors=0;
+
+ /* test dataset functions */
+ nerrors += test_dsets();
+
+ /* test attribute functions */
+ nerrors += test_attr();
+
+ /* check for errors */
+ if (nerrors)
+  goto error;
+ 
+ return 0;
+ 
+error:
+ return 1;
+
+ 
+}
+
diff --git a/hl/test/test_table.c b/hl/test/test_table.c
new file mode 100644
index 0000000..5dd4855
--- /dev/null
+++ b/hl/test/test_table.c
@@ -0,0 +1,1589 @@
+
+/****************************************************************************
+ * NCSA HDF                                                                 *
+ * Scientific Data Technologies                                             *
+ * National Center for Supercomputing Applications                          *
+ * University of Illinois at Urbana-Champaign                               *
+ * 605 E. Springfield, Champaign IL 61820                                   *
+ *                                                                          *
+ * For conditions of distribution and use, see the accompanying             *
+ * hdf/COPYING f.                                                           *
+ *                                                                          *
+ ****************************************************************************/
+
+#include "H5HL.h"
+#include <stdlib.h>
+#include <assert.h>
+
+/*-------------------------------------------------------------------------
+ * Table API test
+ *
+ * Functions tested:
+ *
+ * H5TBmake_table 
+ * H5TBread_table
+ * H5TBwrite_records
+ * H5TBread_records
+ * H5TBappend_records
+ * H5TBinsert_record
+ * H5TBdelete_record
+ * H5TBcombine_tables
+ * H5TBwrite_fields_name
+ * H5TBread_fields_name
+ * H5TBwrite_fields_index
+ * H5TBinsert_field
+ * H5TBdelete_field
+ * H5TBget_table_info
+ * H5TBget_field_info
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#define TITLE "Title"
+#define NFIELDS  (hsize_t)5
+#define NRECORDS (hsize_t)8
+#define TESTING2(WHAT) {printf("%-70s", "Testing     " WHAT); fflush(stdout);}
+
+/*-------------------------------------------------------------------------
+ * structure used for all tests, a particle with properties
+ *-------------------------------------------------------------------------
+ */
+typedef struct particle_t 
+{
+ char   name[16];
+ long   longi;
+ float  pressure;
+ double temperature; 
+ int    lati;
+} particle_t;
+
+/*-------------------------------------------------------------------------
+ * local auxiliary functions
+ *-------------------------------------------------------------------------
+ */
+
+static hid_t h5file_open(const char *fname, unsigned flags);
+static int cmp_par(hsize_t i, hsize_t j, particle_t *rbuf, particle_t *wbuf );
+static int compare_deleted(hsize_t rrecords, hsize_t dstart, hsize_t drecords, 
+                           particle_t *rbuf, particle_t *wbuf);
+
+/*-------------------------------------------------------------------------
+ * a subset of particle_t, with latitude and longitude fields
+ *-------------------------------------------------------------------------
+ */
+ typedef struct position_t 
+ {
+  long   longi;
+  int    lati;
+ } position_t;
+
+/*-------------------------------------------------------------------------
+ * a subset of particle_t, with name and pressure fields 
+ *-------------------------------------------------------------------------
+ */
+ typedef struct namepressure_t 
+ {
+  char   name[16];
+  float  pressure;
+ } namepressure_t;
+
+/*-------------------------------------------------------------------------
+ * an extended particle, used in the insert field test
+ *-------------------------------------------------------------------------
+ */
+ typedef struct particle2_t
+ {
+  char   name[16];
+  long   longi;
+  float  pressure;
+  double temperature;
+  int    lati;
+  int    new_field;
+ } particle2_t;
+
+/*-------------------------------------------------------------------------
+ * a particle with one field less, used in the delete field test
+ *-------------------------------------------------------------------------
+ */
+ typedef struct particle3_t
+ {
+  char   name[16];
+  long   longi;
+  double temperature; 
+  int    lati;
+ } particle3_t;
+
+
+/*-------------------------------------------------------------------------
+ * the test program
+ *-------------------------------------------------------------------------
+ */
+
+int test_table(hid_t fid, int write)
+{
+ /* identifiers */
+ hid_t       fid1;
+ hid_t       fid2;
+ hsize_t     chunk_size=10;
+ int         compress=0;
+ int         *fill=NULL;
+ particle_t  fill1[1] = { {"no data",-1, -99.0f, -99.0, -1} };
+ int         fill1_new[1] = { -100 };
+ hsize_t     position;
+ char        tname[20];
+
+ /* write, read, append, delete, insert some records and fields */
+ hsize_t start;
+ hsize_t wstart;
+ hsize_t rstart;
+ hsize_t istart;
+ hsize_t dstart;
+ hsize_t nrecords;
+ hsize_t rrecords;
+ hsize_t wrecords;
+ hsize_t arecords;
+ hsize_t irecords;
+ hsize_t drecords;
+ hsize_t nfields;
+ hsize_t rfields;
+ hsize_t i, j;
+ hsize_t start1;      /* record to start reading from 1st table */
+ hsize_t start2;      /* record to start writing in 2nd table */
+
+/*-------------------------------------------------------------------------
+ * read, write, insert, append buffers 
+ *-------------------------------------------------------------------------
+ */
+ particle_t  rbuf[NRECORDS+4];
+ particle2_t rbuf2[NRECORDS];
+ particle3_t rbuf3[NRECORDS];
+ particle_t  rbufc[NRECORDS*2];
+ particle_t  abuf[2]={{"eight",80,8.0f,80.0,80},{"nine",90,9.0f,90.0,90}};
+ particle_t  ibuf[2]={{"zero", 0, 0.0f, 0.0, 0},{"zero", 0, 0.0f, 0.0, 0}};
+ particle_t  wbufd[NRECORDS];
+ particle_t  wbuf[NRECORDS] = { 
+ {"zero", 0, 0.0f, 0.0, 0,},
+ {"one",  10, 1.0f, 10.0, 10},
+ {"two",  20, 2.0f, 20.0, 20},
+ {"three",30, 3.0f, 30.0, 30},
+ {"four", 40, 4.0f, 40.0, 40},
+ {"five", 50, 5.0f, 50.0, 50},
+ {"six",  60, 6.0f, 60.0, 60},
+ {"seven",70, 7.0f, 70.0, 70}
+  };
+ /* buffers for the field "Pressure" and "New_field" */
+ float           pressure_in [NRECORDS] = { 0.0f,1.0f,2.0f,3.0f,4.0f,5.0f,6.0f,7.0f };
+ float           pressure_out [NRECORDS];
+ int             buf_new[NRECORDS] = { 0,1,2,3,4,5,6,7 };
+ /* buffers for the fields "Latitude,Longitude"  */
+ position_t      position_out[NRECORDS];
+ position_t      position_in[NRECORDS] = { {0,0},
+ {10,10},
+ {20,20}, 
+ {30,30}, 
+ {40,40},
+ {50,50}, 
+ {60,60},    
+ {70,70} };
+ /* buffers for the fields "Name,Pressure"  */
+ namepressure_t   namepre_out[NRECORDS];
+ namepressure_t   namepre_in[NRECORDS] = 
+ { {"zero",0.0f},
+ {"one",   1.0f}, 
+ {"two",   2.0f}, 
+ {"three", 3.0f}, 
+ {"four",  4.0f},
+ {"five",  5.0f},
+ {"six",   6.0f}, 
+ {"seven", 7.0f}, 
+  };
+
+
+/*-------------------------------------------------------------------------
+ * initialize table parameters
+ * field offsets and sizes used in the fields functions
+ *-------------------------------------------------------------------------
+ */
+
+ size_t field_offset_pos[2]=
+ {
+  HOFFSET( position_t, longi ),
+  HOFFSET( position_t, lati )
+ };
+ size_t field_offset_namepre[2]=
+ { 
+  HOFFSET( namepressure_t, name ),
+  HOFFSET( namepressure_t, pressure )
+ };
+ size_t field_sizes_pos[2]=
+ {
+  sizeof(position_in[0].longi),
+  sizeof(position_in[0].lati)
+ };
+ size_t field_sizes_namepre[2]=
+ { 
+  sizeof(namepre_in[0].name),
+  sizeof(namepre_in[0].pressure)
+ };
+ size_t field_sizes_pre[1]=
+ { 
+  sizeof(namepre_in[0].pressure)
+ };
+
+/*-------------------------------------------------------------------------
+ * query table test
+ *-------------------------------------------------------------------------
+ */
+  char    **names_out;
+  size_t  sizes_out[NFIELDS];
+  size_t  offset_out[NFIELDS];
+  size_t  size_out;
+
+/*-------------------------------------------------------------------------
+ * initialize table parameters
+ * field indexes (zero based) used in the fields functions
+ * "Name 0","Longitude 1","Pressure 2","Temperature 3","Latitude 4"
+ *-------------------------------------------------------------------------
+ */
+ int    field_index_pre[1]     = { 2 };
+ int    field_index_pos[2]     = { 1,4 };
+ int    field_index_namepre[2] = { 0,2 };
+ int    field_index[NFIELDS]   = { 0,1,2,3,4 };
+
+/*-------------------------------------------------------------------------
+ * initialize table parameters
+ * size and the offsets of struct members in memory
+ * define the inserted field HDF5 type and buffers
+ * these are used for the insert field test
+ *-------------------------------------------------------------------------
+ */
+ hid_t   field_type_new = H5T_NATIVE_INT;
+ size_t  dst_size2 =  sizeof( particle2_t );
+ size_t  dst_offset2[NFIELDS+1] = { HOFFSET( particle2_t, name ),
+                                  HOFFSET( particle2_t, longi ),
+                                  HOFFSET( particle2_t, pressure ),
+                                  HOFFSET( particle2_t, temperature ),
+                                  HOFFSET( particle2_t, lati ),
+                                  HOFFSET( particle2_t, new_field )};
+ size_t dst_sizes2[NFIELDS+1] = { sizeof( rbuf2[0].name),
+                                  sizeof( rbuf2[0].longi),
+                                  sizeof( rbuf2[0].pressure),
+                                  sizeof( rbuf2[0].temperature),
+                                  sizeof( rbuf2[0].lati),
+                                  sizeof( rbuf2[0].new_field)};
+/*-------------------------------------------------------------------------
+ * initialize table parameters
+ * size and the offsets of struct members in memory
+ * these are used for the delete field test
+ *-------------------------------------------------------------------------
+ */
+ size_t dst_size3 =  sizeof( particle3_t );
+ size_t dst_offset3[NFIELDS-1] = { HOFFSET( particle3_t, name ),
+                                   HOFFSET( particle3_t, longi ),
+                                   HOFFSET( particle3_t, temperature ),
+                                   HOFFSET( particle3_t, lati )};
+
+ size_t dst_sizes3[NFIELDS-1] = { sizeof( rbuf3[0].name),
+                                  sizeof( rbuf3[0].longi),
+                                  sizeof( rbuf3[0].temperature),
+                                  sizeof( rbuf3[0].lati)};
+  
+
+/*-------------------------------------------------------------------------
+ * initialize table parameters
+ * 1) size and the offsets of struct members in memory
+ * 2) field names
+ * 3) define a HDF5 type for the fields
+ *-------------------------------------------------------------------------
+ */
+
+ size_t type_size_mem =  sizeof( particle_t );
+ size_t field_offset[NFIELDS]= 
+ {
+  HOFFSET( particle_t, name ),
+  HOFFSET( particle_t, longi ),
+  HOFFSET( particle_t, pressure ),
+  HOFFSET( particle_t, temperature ),
+  HOFFSET( particle_t, lati )
+ };
+ size_t field_size[NFIELDS] = 
+ {
+  sizeof( rbuf[0].name),
+  sizeof( rbuf[0].longi),
+  sizeof( rbuf[0].pressure),
+  sizeof( rbuf[0].temperature),
+  sizeof( rbuf[0].lati) 
+ };
+ const char *field_names[NFIELDS]  = 
+  { "Name","Longitude","Pressure","Temperature","Latitude" };
+ hid_t field_type[NFIELDS]; 
+ hid_t string_type = H5Tcopy( H5T_C_S1 );
+ H5Tset_size( string_type, 16 );
+ field_type[0] = string_type;
+ field_type[1] = H5T_NATIVE_LONG;
+ field_type[2] = H5T_NATIVE_FLOAT;
+ field_type[3] = H5T_NATIVE_DOUBLE;
+ field_type[4] = H5T_NATIVE_INT;
+
+/*-------------------------------------------------------------------------
+ *
+ * Functions tested:
+ *
+ * H5TBmake_table 
+ * H5TBread_table
+ *
+ *-------------------------------------------------------------------------
+ */
+ if (write)
+ {
+ TESTING2("making table");
+
+ if (H5TBmake_table(TITLE,fid,"table1",NFIELDS,NRECORDS,type_size_mem,
+                    field_names,field_offset,field_type,
+                    chunk_size,fill,compress,wbuf)<0) 
+                    goto out;
+ PASSED();
+ }
+
+
+ TESTING2("reading table");
+ 
+/*-------------------------------------------------------------------------
+ * read the table
+ *-------------------------------------------------------------------------
+ */
+ 
+ if (H5TBread_table(fid,"table1",type_size_mem,field_offset,field_size,rbuf)<0) 
+  goto out;
+ 
+ /* compare the extracted table with the original array */
+ for( i = 0; i < NRECORDS; i++ ) 
+ {
+  if (cmp_par(i,i,rbuf,wbuf)<0) 
+   goto out;
+ }
+ 
+ PASSED();
+
+
+/*-------------------------------------------------------------------------
+ *
+ * Functions tested:
+ *
+ * H5TBwrite_records
+ *
+ *-------------------------------------------------------------------------
+ */
+ if (write) 
+ {
+ TESTING2("writing records");
+
+ /* create an empty table */
+ if (H5TBmake_table(TITLE,fid,"table2",NFIELDS,NRECORDS,type_size_mem,
+                    field_names,field_offset,field_type,
+                    chunk_size,fill,compress,0)<0) 
+                    goto out;
+
+/*-------------------------------------------------------------------------
+ * write records, start at 0, write 8
+ * pos = 0 1 2 3 4 5 6 7  
+ * data= 0 1 2 3 4 5 6 7 
+ *-------------------------------------------------------------------------
+ */
+ wstart=0; wrecords=8;
+ if (H5TBwrite_records(fid,"table2",wstart,wrecords,type_size_mem,field_offset,
+  field_size,wbuf)<0) 
+  goto out;
+
+ /* read it back */
+ if (H5TBread_table(fid,"table2",type_size_mem,field_offset,field_size,rbuf)<0) 
+  goto out;
+ 
+ /* compare  */
+ for( i = 0; i < NRECORDS; i++ ) 
+ {
+  if (cmp_par(i,i,rbuf,wbuf)<0) 
+   goto out;
+ }
+
+ PASSED();
+ }
+
+/*-------------------------------------------------------------------------
+ *
+ * Functions tested:
+ *
+ * H5TBread_records
+ *
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING2("reading records");
+ 
+/*-------------------------------------------------------------------------
+ * read records, start at 0, read 8
+ * pos = 0 1 2 3 4 5 6 7  
+ * data= 0 1 2 3 4 5 6 7
+ *-------------------------------------------------------------------------
+ */
+ 
+/*-------------------------------------------------------------------------
+ * for the read test we cannot use "table2" because it has been appended
+ * we use the original "table1" instead
+ *-------------------------------------------------------------------------
+ */
+ if(write)
+  strcpy(tname,"table2");
+ else
+  strcpy(tname,"table1");
+ 
+ rstart=0; rrecords=8;
+ if (H5TBread_records(fid,tname,rstart,rrecords,type_size_mem,field_offset,
+  field_size,rbuf)<0) 
+  goto out;
+
+ /* compare */
+ for( i=rstart; i<rrecords; i++) 
+ {
+  if (cmp_par(i,i,rbuf,wbuf)<0) 
+   goto out;
+ }
+ PASSED();
+
+/*-------------------------------------------------------------------------
+ *
+ * Functions tested:
+ *
+ * H5TBappend_records
+ * H5TBread_records
+ *
+ *-------------------------------------------------------------------------
+ */
+ if (write)
+ {
+ TESTING2("appending records");
+
+/*-------------------------------------------------------------------------
+ * append 2 records
+ * pos = 0 1 2 3 4 5 6 7 8 9 
+ * data= 0 1 2 3 4 5 6 7 8 9
+ *-------------------------------------------------------------------------
+ */
+ arecords=2;
+ if (H5TBappend_records(fid,"table2",arecords,type_size_mem,field_offset,field_size,abuf)<0) 
+  return 1;
+
+ if (H5TBget_table_info(fid,"table2",&rfields,&rrecords)<0) 
+  return 1;
+
+ rstart=0; rrecords=NRECORDS+arecords;
+ if (H5TBread_records(fid,"table2",rstart,rrecords,type_size_mem,field_offset,
+  field_size,rbuf)<0) 
+  return 1;
+
+ /* compare */
+ wrecords=8;
+ for( i=rstart; i<wrecords; i++) 
+ {
+  if (cmp_par(i,i,rbuf,wbuf)<0) 
+   goto out;
+ }
+ for( i=wrecords, j=0; i<rrecords; i++,j++) 
+ {
+  if (cmp_par(i,j,rbuf,abuf)<0) 
+   goto out;
+ }
+ PASSED();
+ }
+
+/*-------------------------------------------------------------------------
+ *
+ * Functions tested:
+ *
+ * H5TBinsert_record
+ * H5TBread_records
+ *
+ *-------------------------------------------------------------------------
+ */
+ if (write)
+ {
+ TESTING2("inserting records");
+
+/*-------------------------------------------------------------------------
+ * insert 2 records
+ * pos = 0 1 2 3 4 5 6 7 8 9 10 11
+ * data= 0 0 0 1 2 3 4 5 6 7 8  9 
+ *-------------------------------------------------------------------------
+ */
+ istart=1; irecords=2;
+ if (H5TBinsert_record(fid,"table2",istart,irecords,type_size_mem,field_offset,field_size,ibuf)<0) 
+  return 1;
+
+ if (H5TBget_table_info(fid,"table2",&rfields,&rrecords)<0) 
+  return 1;
+
+ if (H5TBread_records(fid,"table2",rstart,rrecords,type_size_mem,field_offset,
+  field_size,rbuf)<0) 
+  return 1;
+
+ /* compare */
+ for( i=0; i<12; i++) 
+ {
+  if (i<istart)
+  {
+   if (cmp_par(i,i,rbuf,wbuf)<0) 
+    goto out;
+  }
+  else if (i>=istart && i<istart+irecords)
+  {
+   j=i-istart;
+   if (cmp_par(i,j,rbuf,ibuf)<0) 
+    goto out;
+  }
+  else if (i>=istart+irecords && i<10)
+  {
+   j=i-irecords;
+   if (cmp_par(i,j,rbuf,wbuf)<0) 
+    goto out;
+  }
+  else 
+  {
+   j=i-10;
+   if (cmp_par(i,j,rbuf,abuf)<0) 
+    goto out;
+  }
+ }
+ PASSED();
+ }
+
+/*-------------------------------------------------------------------------
+ *
+ * Functions tested:
+ *
+ * H5TBdelete_record
+ * H5TBread_records
+ *
+ *-------------------------------------------------------------------------
+ */
+ if (write)
+ {
+ TESTING2("deleting records");
+
+/*-------------------------------------------------------------------------
+ * Create a table
+ * pos = 0 1 2 3 4 5 6 7  
+ * data= 0 1 2 3 4 5 6 7 
+ *-------------------------------------------------------------------------
+ */
+ for( i=0; i<NRECORDS; i++) 
+  wbufd[i] = wbuf[i];
+
+ if (H5TBmake_table(TITLE,fid,"table3",NFIELDS,NRECORDS,type_size_mem,
+                    field_names,field_offset,field_type,
+                    chunk_size,fill,compress,wbufd)<0) 
+                    goto out;
+
+/*-------------------------------------------------------------------------
+ * Delete records, start at 2, delete 3
+ * pos = 0 1 2 3 4 
+ * data= 0 1 5 6 7  
+ *-------------------------------------------------------------------------
+ */
+ dstart=2; drecords=3;
+ if (H5TBdelete_record(fid,"table3",dstart,drecords)<0) 
+  goto out;
+
+ if (H5TBget_table_info(fid,"table3",&rfields,&rrecords)<0) 
+  goto out;
+
+ rstart=0; 
+ if (H5TBread_records(fid,"table3",rstart,rrecords,type_size_mem,field_offset,
+  field_size,rbuf)<0) 
+  goto out;
+
+ /* Compare */
+ nrecords=NRECORDS; 
+ assert(rrecords == nrecords-drecords);
+ if (compare_deleted(rrecords,dstart,drecords,rbuf,wbufd)<0) 
+  goto out;
+ 
+/*-------------------------------------------------------------------------
+ * reset compare buffer
+ *-------------------------------------------------------------------------
+ */
+ nrecords=rrecords; 
+ for( i=0; i<nrecords; i++) 
+  wbufd[i] = rbuf[i];
+
+/*-------------------------------------------------------------------------
+ * Delete records, start at 0, delete 2
+ * pos = 0 1 2  
+ * data= 5 6 7  
+ *-------------------------------------------------------------------------
+ */
+ dstart=0; drecords=2;
+ if (H5TBdelete_record(fid,"table3",dstart,drecords)<0) 
+  goto out;
+
+ if (H5TBget_table_info(fid,"table3",&rfields,&rrecords)<0) 
+  goto out;
+
+ rstart=0; 
+ if (H5TBread_records(fid,"table3",rstart,rrecords,type_size_mem,field_offset,
+  field_size,rbuf)<0) 
+  goto out;
+
+ /* Compare */
+ assert(rrecords == nrecords-drecords);
+ if (compare_deleted(rrecords,dstart,drecords,rbuf,wbufd)<0) 
+  goto out;
+
+/*-------------------------------------------------------------------------
+ * reset compare buffer
+ *-------------------------------------------------------------------------
+ */
+ nrecords=rrecords; 
+ for( i=0; i<nrecords; i++) 
+  wbufd[i] = rbuf[i];
+
+/*-------------------------------------------------------------------------
+ * Delete records, start at 1, delete 1
+ * pos = 0 1   
+ * data= 5 7 
+ *-------------------------------------------------------------------------
+ */
+ dstart=1; drecords=1;
+ if (H5TBdelete_record(fid,"table3",dstart,drecords)<0) 
+  goto out;
+
+ if (H5TBget_table_info(fid,"table3",&rfields,&rrecords)<0) 
+  goto out;
+
+ rstart=0; 
+ if (H5TBread_records(fid,"table3",rstart,rrecords,type_size_mem,field_offset,
+  field_size,rbuf)<0) 
+  goto out;
+
+ /* Compare */
+ assert(rrecords == nrecords-drecords);
+ if (compare_deleted(rrecords,dstart,drecords,rbuf,wbufd)<0) 
+  goto out;
+
+/*-------------------------------------------------------------------------
+ * reset compare buffer
+ *-------------------------------------------------------------------------
+ */
+ nrecords=rrecords; 
+ for( i=0; i<nrecords; i++) 
+  wbufd[i] = rbuf[i];
+
+/*-------------------------------------------------------------------------
+ * Delete records, start at 0, delete 1
+ * pos = 0    
+ * data= 7 
+ *-------------------------------------------------------------------------
+ */
+ dstart=0; drecords=1;
+ if (H5TBdelete_record(fid,"table3",dstart,drecords)<0) 
+  goto out;
+
+ if (H5TBget_table_info(fid,"table3",&rfields,&rrecords)<0) 
+  goto out;
+
+ rstart=0; 
+ if (H5TBread_records(fid,"table3",rstart,rrecords,type_size_mem,field_offset,
+  field_size,rbuf)<0) 
+  goto out;
+
+ /* Compare */
+ assert(rrecords == nrecords-drecords);
+ if (compare_deleted(rrecords,dstart,drecords,rbuf,wbufd)<0) 
+  goto out;
+
+/*-------------------------------------------------------------------------
+ * reset compare buffer
+ *-------------------------------------------------------------------------
+ */
+ nrecords=rrecords; 
+ for( i=0; i<nrecords; i++) 
+  wbufd[i] = rbuf[i];
+
+ /* Read complete table */
+ if (H5TBread_table(fid,"table3",type_size_mem,field_offset,field_size,rbuf)<0) 
+  goto out;
+
+ /* Compare */
+ for( i=0; i<rrecords; i++) 
+ {
+  if (cmp_par(i,i,rbuf,wbufd)<0) 
+   goto out;
+ }
+
+ PASSED();
+ }
+
+/*-------------------------------------------------------------------------
+ *
+ * Functions tested:
+ *
+ * H5TBadd_records_from
+ * H5TBread_records
+ *
+ *-------------------------------------------------------------------------
+ */
+ 
+ if (write)
+ {
+ TESTING2("adding records");
+
+ /* create 2 tables */
+ if (H5TBmake_table(TITLE,fid,"table4",NFIELDS,NRECORDS,type_size_mem,
+                    field_names,field_offset,field_type,
+                    chunk_size,fill,compress,wbuf)<0) 
+                    goto out;
+ if (H5TBmake_table(TITLE,fid,"table5",NFIELDS,NRECORDS,type_size_mem,
+                    field_names,field_offset,field_type,
+                    chunk_size,fill,compress,wbuf)<0) 
+                    goto out;
+
+ /* add the records from "table4" to "table5"  */
+ start1    = 3;      
+ nrecords  = 2; 
+ start2    = 6;      
+ if ( H5TBadd_records_from(fid,"table4",start1,nrecords,"table5",start2)<0)
+  goto out;
+
+ /* read final table */
+ if (H5TBread_table(fid,"table5",type_size_mem,field_offset,field_size,rbuf)<0) 
+  goto out;
+
+ /* compare */
+ for( i = 0; i < NRECORDS+2; i++ ) 
+ {
+  if ( i < start2 )
+  {
+   if (cmp_par(i,i,rbuf,wbuf)<0) 
+    goto out;
+  }
+  else if ( i < start2+nrecords )
+  {
+   j = i-start1;
+   if (cmp_par(i,j,rbuf,wbuf)<0) 
+    goto out;
+  }
+  else 
+  {
+   j = i-nrecords;
+   if (cmp_par(i,j,rbuf,wbuf)<0) 
+    goto out;
+  }
+ }
+
+ PASSED();
+ }
+
+/*-------------------------------------------------------------------------
+ *
+ * Functions tested:
+ *
+ * H5TBcombine_tables
+ * H5TBread_table
+ *
+ *-------------------------------------------------------------------------
+ */
+ 
+ if (write)
+ {
+ TESTING2("combining tables");
+
+ /* create 2 tables */
+ if (H5TBmake_table(TITLE,fid,"table6",NFIELDS,NRECORDS,type_size_mem,
+                    field_names,field_offset,field_type,
+                    chunk_size,fill,compress,wbuf)<0) 
+                    goto out;
+ if (H5TBmake_table(TITLE,fid,"table7",NFIELDS,NRECORDS,type_size_mem,
+                    field_names,field_offset,field_type,
+                    chunk_size,fill,compress,wbuf)<0) 
+                    goto out;
+
+ /* combine the two tables into a third  */
+ if ( H5TBcombine_tables(fid,"table6",fid,"table7","table8")<0)
+  goto out;
+
+ /* read merged table */
+ if (H5TBread_table(fid,"table8",type_size_mem,field_offset,field_size,rbufc)<0) 
+  goto out;
+
+ /* compare  */
+ for( i = 0; i < NRECORDS*2; i++ ) 
+ {
+  if ( i < NRECORDS )
+  {
+   if (cmp_par(i,i,rbufc,wbuf)<0) 
+    goto out;
+  }
+  else
+  {
+   if (cmp_par(i,i-NRECORDS,rbufc,wbuf)<0) 
+    goto out;
+  }
+ }
+
+/*-------------------------------------------------------------------------
+ * multi file test
+ *-------------------------------------------------------------------------
+ */
+
+ /* create 2 files using default properties. */
+ fid1 = H5Fcreate("combine_tables1.h5",H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT);
+ fid2 = H5Fcreate("combine_tables2.h5",H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT);
+  
+ /* create 2 tables, one in each file */
+ if (H5TBmake_table(TITLE,fid1,"table1",NFIELDS,NRECORDS,type_size_mem,
+                    field_names,field_offset,field_type,
+                    chunk_size,fill,compress,wbuf)<0) 
+                    goto out;
+ if (H5TBmake_table(TITLE,fid2,"table2",NFIELDS,NRECORDS,type_size_mem,
+                    field_names,field_offset,field_type,
+                    chunk_size,fill,compress,wbuf)<0) 
+                    goto out;
+
+ /* combine the two tables into a third  */
+ if ( H5TBcombine_tables(fid1,"table1",fid2,"table2","table3")<0)
+  goto out;
+
+ /* read merged table */
+ if (H5TBread_table(fid1,"table3",type_size_mem,field_offset,field_size,rbufc)<0) 
+  goto out;
+
+ /* compare  */
+ for( i = 0; i < NRECORDS*2; i++ ) 
+ {
+  if ( i < NRECORDS )
+  {
+   if (cmp_par(i,i,rbufc,wbuf)<0) 
+    goto out;
+  }
+  else
+  {
+   if (cmp_par(i,i-NRECORDS,rbufc,wbuf)<0) 
+    goto out;
+  }
+ }
+
+ /* close files */
+ H5Fclose(fid1);
+ H5Fclose(fid2);
+
+ PASSED();
+ }
+
+
+/*-------------------------------------------------------------------------
+ *
+ * Functions tested:
+ *
+ * H5TBwrite_fields_name
+ *
+ *-------------------------------------------------------------------------
+ */
+ if (write)
+ {
+ TESTING2("writing fields by name");
+
+ /* make an empty table with fill values */
+ if (H5TBmake_table(TITLE,fid,"table9",NFIELDS,NRECORDS,type_size_mem,
+                    field_names,field_offset,field_type,
+                    chunk_size,fill1,compress,0)<0) 
+                    goto out;
+
+ /* write the pressure field starting at record 2 */
+ start    = 2;      
+ nrecords = 3; 
+ if (H5TBwrite_fields_name(fid,"table9","Pressure",start,nrecords,sizeof(float),
+  0,field_sizes_pre,pressure_in)<0)
+  goto out;
+
+ /* write the new longitude and latitude information starting at record 2 */
+ start    = 2;      
+ nrecords = 3;
+ if (H5TBwrite_fields_name(fid,"table9","Latitude,Longitude",start,nrecords,sizeof(position_t),
+  field_offset_pos,field_sizes_pos,position_in)<0)
+  goto out;
+
+ /* read back the all table */
+ start    = 0;      
+ nrecords = NRECORDS; 
+ if (H5TBread_table(fid,"table9",type_size_mem,field_offset,field_size,rbuf)<0) 
+  goto out;
+
+ /* compare the read values with the initial values */
+ for( i = 0; i < NRECORDS; i++ ) 
+ {
+  if ( i >= 2 && i <= 4 )
+  {
+    if ( rbuf[i].lati        != position_in[i].lati ||
+         rbuf[i].longi       != position_in[i].longi ||
+         rbuf[i].pressure    != pressure_in[i] ) 
+    {
+     fprintf(stderr,"%d %f %d\n",
+      rbuf[i].longi,rbuf[i].pressure,rbuf[i].lati);
+     fprintf(stderr,"%d %f %d\n",
+      position_in[i].longi,pressure_in[i],position_in[i].lati);
+      goto out;
+    }
+  }
+ }
+
+ PASSED();
+ } /*write*/
+
+/*-------------------------------------------------------------------------
+ *
+ * Functions tested:
+ *
+ * H5TBread_fields_name
+ *
+ *-------------------------------------------------------------------------
+ */
+ TESTING2("reading fields by name");
+ 
+/*-------------------------------------------------------------------------
+ * write and read the "Pressure" field
+ *-------------------------------------------------------------------------
+ */
+ if (write)
+ {
+  if (H5TBmake_table(TITLE,fid,"table10",NFIELDS,NRECORDS,type_size_mem,
+   field_names,field_offset,field_type,
+   chunk_size,fill1,compress,0)<0) 
+   goto out;
+  
+  /* write the pressure field to all the records */
+  start    = 0;      
+  nrecords = NRECORDS; 
+  if ( H5TBwrite_fields_name(fid,"table10","Pressure",start,nrecords, 
+   sizeof( float ),0,field_sizes_pre,pressure_in)<0)
+   goto out;
+ }
+ 
+ /* read the "Pressure" field */
+ start    = 0;      
+ nrecords = NRECORDS; 
+ if ( H5TBread_fields_name(fid,"table10","Pressure",start,nrecords, 
+  sizeof(float),0,field_sizes_pre,pressure_out)<0)
+  goto out;
+ 
+ /* Compare the extracted table with the initial values */
+ for( i = 0; i < NRECORDS; i++ ) 
+ {
+  if ( pressure_out[i] != pressure_in[i] ) {
+   goto out;
+  }
+ }
+ 
+/*-------------------------------------------------------------------------
+ * Write and read the "Latitude,Longitude" fields
+ *-------------------------------------------------------------------------
+ */
+ if (write)
+ {
+  /* Write the new longitude and latitude information to all the records */
+  start    = 0;      
+  nrecords = NRECORDS; 
+  if ( H5TBwrite_fields_name(fid,"table10", "Latitude,Longitude", start, nrecords, 
+   sizeof( position_t ), field_offset_pos, field_sizes_pos, position_in  ) < 0 )
+   goto out;
+ }/*write*/
+ 
+ /* Read the "Latitude,Longitude" fields */
+ start    = 0;      
+ nrecords = NRECORDS; 
+ if ( H5TBread_fields_name( fid, "table10", "Latitude,Longitude", 
+  start, nrecords, sizeof(position_t), field_offset_pos, field_sizes_pos, position_out ) < 0 )
+  goto out;
+ 
+ /* Compare the extracted table with the initial values */
+ for( i = 0; i < NRECORDS; i++ ) 
+ {
+  if ( position_out[i].lati  != position_in[i].lati ||
+   position_out[i].longi != position_in[i].longi ) 
+   goto out;
+ }
+  
+
+/*-------------------------------------------------------------------------
+ * Write and read the "Name,Pressure" fields
+ *-------------------------------------------------------------------------
+ */
+ if (write)
+ {
+ /* Write the new name and pressure information to all the records */
+ start    = 0;      
+ nrecords = NRECORDS; 
+ if ( H5TBwrite_fields_name( fid, "table10", "Name,Pressure", start, nrecords, 
+   sizeof( namepressure_t ), field_offset_namepre, field_sizes_namepre, namepre_in  ) < 0 )
+  goto out;
+ }/*write*/
+
+ /* Read the "Name,Pressure" fields */
+ start    = 0;      
+ nrecords = NRECORDS; 
+ if ( H5TBread_fields_name( fid, "table10", "Name,Pressure", 
+   start, nrecords, sizeof(namepressure_t), field_offset_namepre, field_sizes_namepre,
+   namepre_out ) < 0 )
+  goto out;
+
+ /* Compare the extracted table with the initial values */
+ for( i = 0; i < NRECORDS; i++ ) 
+ {
+  if ( ( strcmp( namepre_out[i].name,  namepre_in[i].name ) != 0 ) ||
+         namepre_out[i].pressure != namepre_in[i].pressure ) {
+   goto out;
+  }
+ }
+ /* reset buffer */
+ for( i = 0; i < NRECORDS; i++ ) 
+ {
+  strcpy( namepre_out[i].name,  "\0" );
+  namepre_out[i].pressure = -1;
+ }
+
+/*-------------------------------------------------------------------------
+ * read only 3 records of the "Name,Pressure" fields, starting at record 2
+ *-------------------------------------------------------------------------
+ */
+ start    = 2;      
+ nrecords = 3; 
+ if ( H5TBread_fields_name( fid, "table10", "Name,Pressure", 
+   start, nrecords, sizeof(namepressure_t), field_offset_namepre, 
+   field_sizes_namepre, namepre_out ) < 0 )
+  goto out;
+
+ /* Compare the extracted table with the initial values */
+ for( i = 0; i < 3; i++ ) 
+ {
+  if ( ( strcmp( namepre_out[i].name,  namepre_in[start+i].name ) != 0 ) ||
+         namepre_out[i].pressure != namepre_in[start+i].pressure ) {
+   goto out;
+  }
+ }
+ PASSED();
+
+/*-------------------------------------------------------------------------
+ *
+ * Functions tested:
+ *
+ * H5TBwrite_fields_index
+ *
+ *-------------------------------------------------------------------------
+ */
+ if (write)
+ {
+ TESTING2("writing fields by index");
+
+ /* make an empty table */
+ if (H5TBmake_table(TITLE,fid,"table11",NFIELDS,NRECORDS,type_size_mem,
+                    field_names,field_offset,field_type,
+                    chunk_size,fill,compress,NULL)<0) 
+                    goto out;
+
+ /* write the pressure field starting at record 2 */
+ nfields  = 1;
+ start    = 2;      
+ nrecords = 3; 
+ if ( H5TBwrite_fields_index(fid, "table11", nfields, field_index_pre, start, nrecords, 
+   sizeof( float ), 0, field_sizes_pre, pressure_in  ) < 0 )
+  goto out;
+
+
+ /* write the new longitude and latitude information starting at record 2  */
+ nfields  = 2;
+ start    = 2;      
+ nrecords = 3; 
+ if ( H5TBwrite_fields_index(fid, "table11", nfields, field_index_pos, start, nrecords, 
+   sizeof( position_t ), field_offset_pos, field_sizes_pos, position_in  ) < 0 )
+  goto out;
+
+ /* read back the all table */
+ nfields  = 5;
+ start    = 0;      
+ nrecords = NRECORDS; 
+ if ( H5TBread_fields_index(fid, "table11", nfields, field_index, 
+                            start, nrecords, type_size_mem, field_offset, field_size, rbuf ) < 0 )
+  goto out;
+
+ /* Compare the extracted table with the initial values */
+ for( i = 0; i < NRECORDS; i++ ) 
+ {
+  if ( i >= 2 && i <= 4 )
+  {
+    if ( rbuf[i].lati        != position_in[i].lati ||
+         rbuf[i].longi       != position_in[i].longi ||
+         rbuf[i].pressure    != pressure_in[i] ) 
+   goto out;
+  }
+ }
+
+ PASSED();
+ }
+
+
+/*-------------------------------------------------------------------------
+ *
+ * Functions tested:
+ *
+ * H5TBread_fields_index
+ *
+ *-------------------------------------------------------------------------
+ */
+ 
+ TESTING2("reading fields by index");
+
+ if (write)
+ {
+ /* make an empty table */
+ if (H5TBmake_table(TITLE,fid,"table12",NFIELDS,NRECORDS,type_size_mem,
+                    field_names,field_offset,field_type,
+                    chunk_size,fill,compress,NULL)<0) 
+                    goto out;
+ 
+/*-------------------------------------------------------------------------
+ * write and read the "Pressure" field
+ *-------------------------------------------------------------------------
+ */
+
+ /* write the pressure field to all the records */
+ nfields  = 1;
+ start    = 0;      
+ nrecords = NRECORDS; 
+ if ( H5TBwrite_fields_index(fid, "table12", nfields, field_index_pre, start, nrecords, 
+   sizeof( float ), 0, field_sizes_pre, pressure_in  ) < 0 )
+  goto out;
+ }
+  
+ /* read the "Pressure" field */
+ nfields  = 1;
+ start    = 0;      
+ nrecords = NRECORDS; 
+ if ( H5TBread_fields_index(fid, "table12", nfields, field_index_pre, 
+   start, nrecords, sizeof(float), 0, field_sizes_pre, pressure_out ) < 0 )
+  goto out;
+
+ /* compare the extracted table with the initial values */
+ for( i = 0; i < NRECORDS; i++ ) 
+ {
+  if ( pressure_out[i] != pressure_in[i] ) {
+   goto out;
+  }
+ }
+ 
+/*-------------------------------------------------------------------------
+ * write and read the "Latitude,Longitude" fields
+ *-------------------------------------------------------------------------
+ */
+ if (write)
+ {
+ /* write the new longitude and latitude information to all the records */
+ nfields = 2;
+ start    = 0;      
+ nrecords = NRECORDS; 
+ if ( H5TBwrite_fields_index(fid, "table12", nfields, field_index_pos, start, nrecords, 
+   sizeof( position_t ), field_offset_pos, field_sizes_pos, position_in  ) < 0 )
+  goto out;
+ } /*write*/
+
+ /* read the "Latitude,Longitude" fields */
+ nfields = 2;
+ start    = 0;      
+ nrecords = NRECORDS; 
+ if ( H5TBread_fields_index(fid, "table12", nfields, field_index_pos, 
+   start, nrecords, sizeof(position_t), field_offset_pos, field_sizes_pos, position_out ) < 0 )
+  goto out;
+
+ /* compare the extracted table with the initial values */
+ for( i = 0; i < NRECORDS; i++ ) 
+ {
+  if ( position_out[i].lati  != position_in[i].lati ||
+       position_out[i].longi != position_in[i].longi ) {
+   goto out;
+  }
+ }
+
+/*-------------------------------------------------------------------------
+ * write and read the "Name,Pressure" fields
+ *-------------------------------------------------------------------------
+ */
+
+ if (write)
+ {
+ /* write the new name and pressure information to all the records */
+ nfields = 2;
+ start    = 0;      
+ nrecords = NRECORDS; 
+ if ( H5TBwrite_fields_index(fid, "table12", nfields, field_index_namepre, start, nrecords, 
+   sizeof( namepressure_t ), field_offset_namepre, field_sizes_namepre, namepre_in  ) < 0 )
+  goto out;
+ }
+
+ /* read the "Name,Pressure" fields */
+ nfields = 2;
+ start    = 0;      
+ nrecords = NRECORDS; 
+ if ( H5TBread_fields_index(fid, "table12", nfields, field_index_namepre, 
+   start, nrecords, sizeof(namepressure_t), field_offset_namepre, 
+   field_sizes_namepre, namepre_out ) < 0 )
+  goto out;
+
+ /* compare the extracted table with the initial values */
+ for( i = 0; i < NRECORDS; i++ ) 
+ {
+  if ( ( strcmp( namepre_out[i].name,  namepre_in[i].name ) != 0 ) ||
+         namepre_out[i].pressure != namepre_in[i].pressure ) {
+   goto out;
+  }
+ }
+
+ /* reset buffer */
+ for( i = 0; i < NRECORDS; i++ ) 
+ {
+  strcpy( namepre_out[i].name,  "\0" );
+  namepre_out[i].pressure = -1;
+ }
+
+/*-------------------------------------------------------------------------
+ * read only 3 records of the "Name,Pressure" fields, starting at record 2
+ *-------------------------------------------------------------------------
+ */
+ 
+ /* write the new name and pressure information to all the records */
+ nfields  = 2;
+ start    = 2;      
+ nrecords = 3; 
+ if ( H5TBread_fields_index(fid, "table12", nfields, field_index_namepre, 
+   start, nrecords, sizeof(namepressure_t), field_offset_namepre, 
+   field_sizes_namepre, namepre_out ) < 0 )
+  goto out;
+
+ /* compare the extracted table with the initial values */
+ for( i = 0; i < 3; i++ ) 
+ {
+  if ( ( strcmp( namepre_out[i].name,  wbuf[start+i].name ) != 0 ) ||
+   namepre_out[i].pressure != wbuf[start+i].pressure ) {
+   goto out;
+  }
+ }
+
+ PASSED();
+
+
+/*-------------------------------------------------------------------------
+ *
+ * Functions tested:
+ *
+ * H5TBinsert_field
+ *
+ *-------------------------------------------------------------------------
+ */
+ 
+ if (write)
+ {
+ TESTING2("inserting fields");
+
+ /* make a table */
+ if (H5TBmake_table(TITLE,fid,"table13",NFIELDS,NRECORDS,type_size_mem,
+                    field_names,field_offset,field_type,
+                    chunk_size,fill1,compress,wbuf)<0) 
+                    goto out;
+ 
+ /* insert the new field at the end of the field list */
+ position = NFIELDS;
+ if ( H5TBinsert_field( fid, "table13", "New Field", field_type_new, position, 
+                        fill1_new, buf_new ) < 0 )
+  goto out;
+
+ /* read the table */
+ if ( H5TBread_table( fid, "table13", dst_size2, dst_offset2, dst_sizes2, rbuf2 ) < 0 )
+  goto out;
+
+ /* compare the extracted table with the original array */
+ for( i = 0; i < NRECORDS; i++ ) 
+ {
+  if ( ( strcmp( rbuf2[i].name,  wbuf[i].name ) != 0 ) ||
+   rbuf2[i].lati          != wbuf[i].lati ||
+   rbuf2[i].longi         != wbuf[i].longi ||
+   rbuf2[i].pressure      != wbuf[i].pressure ||
+   rbuf2[i].temperature   != wbuf[i].temperature ||
+   rbuf2[i].new_field     != buf_new[i] ) {
+   goto out;
+  }
+ }
+ PASSED();
+ }
+
+
+/*-------------------------------------------------------------------------
+ *
+ * Functions tested:
+ *
+ * H5TBdelete_field
+ *
+ *-------------------------------------------------------------------------
+ */
+ if (write)
+ {
+ TESTING2("deleting fields");
+
+  /* make a table */
+ if (H5TBmake_table(TITLE,fid,"table14",NFIELDS,NRECORDS,type_size_mem,
+                    field_names,field_offset,field_type,
+                    chunk_size,fill,compress,wbuf)<0) 
+                    goto out;
+
+
+ /* delete the field */
+ if ( H5TBdelete_field(fid, "table14", "Pressure" ) < 0 )
+  goto out;
+
+ /* read the table */
+ if ( H5TBread_table(fid, "table14", dst_size3, dst_offset3, dst_sizes3, rbuf3 ) < 0 )
+  goto out;
+ 
+ /* compare the extracted table with the original array */
+ for( i = 0; i < NRECORDS; i++ ) 
+ {
+  if ( ( strcmp( rbuf3[i].name, wbuf[i].name ) != 0 ) ||
+         rbuf3[i].lati != wbuf[i].lati ||
+         rbuf3[i].longi != wbuf[i].longi ||
+         rbuf3[i].temperature != wbuf[i].temperature ) {
+   goto out;
+  }
+ }
+
+ PASSED();
+ }
+
+/*-------------------------------------------------------------------------
+ *
+ * Functions tested:
+ *
+ * H5TBget_table_info
+ * H5TBget_field_info
+ *
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING2("getting table info");
+
+ /* get table info  */
+ if ( H5TBget_table_info (fid, "table1", &rfields, &rrecords ) < 0 )
+  goto out;
+
+ if ( NFIELDS != rfields || rrecords != NRECORDS  ) {
+  goto out;
+ }
+
+ PASSED();
+
+/*-------------------------------------------------------------------------
+ *
+ * Functions tested:
+ *
+ * H5TBget_field_info
+ *
+ *-------------------------------------------------------------------------
+ */
+
+ TESTING2("getting field info");
+ 
+ /* alocate */
+ names_out = malloc( sizeof(char*) * (size_t)NFIELDS );
+ for ( i = 0; i < NFIELDS; i++) 
+ {
+  names_out[i] = malloc( sizeof(char) * 255 );
+ }
+
+ /* Get field info */
+ if ( H5TBget_field_info(fid, "table1", names_out, sizes_out, offset_out, &size_out ) < 0 )
+  goto out;
+
+ for ( i = 0; i < NFIELDS; i++) 
+ {
+  if ( (strcmp( field_names[i], names_out[i] ) != 0)) {
+   goto out;
+  }
+ }
+
+ /* release */
+ for ( i = 0; i < NFIELDS; i++) 
+ {
+  free ( names_out[i] );
+ }
+ free ( names_out );
+
+ PASSED();
+
+/*-------------------------------------------------------------------------
+ * end
+ *-------------------------------------------------------------------------
+ */
+ return 0;
+out:
+ H5_FAILED();
+ return -1;
+}
+
+
+/*-------------------------------------------------------------------------
+ * the main program
+ *-------------------------------------------------------------------------
+ */
+
+int main(void)
+{
+ hid_t    fid;  /* identifier for the file */
+ unsigned flags=H5F_ACC_RDONLY;
+
+/*-------------------------------------------------------------------------
+ * test1: create a file for the write/read test
+ *-------------------------------------------------------------------------
+ */  
+
+ /* create a file using default properties */
+ fid=H5Fcreate("test_table.h5",H5F_ACC_TRUNC,H5P_DEFAULT,H5P_DEFAULT);
+
+ puts("Testing table with file creation mode (read/write in native architecture):");
+
+ /* test, do write */
+ if (test_table(fid,1)<0)
+  goto out;
+
+ /* close */
+ H5Fclose(fid);
+
+/*-------------------------------------------------------------------------
+ * test2: open a file written in test1 on a big-endian machine
+ *-------------------------------------------------------------------------
+ */  
+ puts("Testing table with file open mode (read big-endian data):");
+
+ fid=h5file_open("test_table_be.hdf5",flags);
+
+ /* test, do not write */
+ if (test_table(fid,0)<0)
+  goto out;
+
+ /* close */
+ H5Fclose(fid);
+
+/*-------------------------------------------------------------------------
+ * test3: open a file written in test1 on a little-endian machine
+ *-------------------------------------------------------------------------
+ */
+ puts("Testing table with file open mode (read little-endian data):");
+
+ fid=h5file_open("test_table_le.hdf5",flags);
+
+ /* test, do not write */
+ if (test_table(fid,0)<0)
+  goto out;
+
+ /* close */
+ H5Fclose(fid);
+
+/*-------------------------------------------------------------------------
+ * test4: open a file written in test1 on the Cray T3 machine
+ *-------------------------------------------------------------------------
+ */
+ puts("Testing table with file open mode (read Cray data):");
+
+ fid=h5file_open("test_table_cray.hdf5",flags);
+
+ /* test, do not write */
+ if (test_table(fid,0)<0)
+  goto out;
+
+ /* close */
+ H5Fclose(fid);
+
+ return 0;
+out:
+ H5Fclose(fid);
+ return 1;
+}
+
+
+/*-------------------------------------------------------------------------
+ * function to open an HDF5 file and return its file identifier
+ *-------------------------------------------------------------------------
+ */
+static hid_t h5file_open(const char *fname, unsigned flags)
+{
+ 
+ hid_t fid;                        /* identifier for the file */
+ char  *srcdir = getenv("srcdir"); /* the source directory */
+ char  data_file[512]="";          /* buffer to hold name of existing file */
+ 
+ /* compose the name of the file to open, using the srcdir, if appropriate */
+ if (srcdir){
+  strcpy(data_file,srcdir);
+  strcat(data_file,"/");
+ } 
+ strcat(data_file,fname);
+ 
+ /* open */
+ if((fid=H5Fopen(data_file,flags,H5P_DEFAULT))<0) {
+  fprintf(stderr,"Error: Cannot open file <%s>\n",data_file );
+  exit(1);
+ }
+
+ return fid;
+}
+
+/*-------------------------------------------------------------------------
+ * function that compares one particle
+ *-------------------------------------------------------------------------
+ */
+static int cmp_par(hsize_t i, hsize_t j, particle_t *rbuf, particle_t *wbuf )
+{
+ if ( ( strcmp( rbuf[i].name, wbuf[j].name ) != 0 ) ||
+  rbuf[i].lati != wbuf[j].lati ||
+  rbuf[i].longi != wbuf[j].longi ||
+  rbuf[i].pressure != wbuf[j].pressure ||
+  rbuf[i].temperature != wbuf[j].temperature ) {
+  fprintf(stderr,"read and write buffers have differences\n");
+  fprintf(stderr,"%s %d %f %f %d\n",
+   rbuf[i].name,rbuf[i].longi,rbuf[i].pressure,rbuf[i].temperature,rbuf[i].lati);
+  fprintf(stderr,"%s %d %f %f %d\n",
+   wbuf[j].name,wbuf[j].longi,wbuf[j].pressure,wbuf[j].temperature,wbuf[j].lati);
+  return -1;
+ }
+ return 0;
+}
+
+/*-------------------------------------------------------------------------
+ * function to compare deleted records
+ *-------------------------------------------------------------------------
+ */
+static int compare_deleted(hsize_t rrecords, hsize_t dstart, hsize_t drecords, 
+                           particle_t *rbuf, particle_t *wbuf)
+{
+ hsize_t i,j;
+ for( i=0; i<rrecords; i++) 
+ {
+  if (i<dstart)
+  {
+   if (cmp_par(i,i,rbuf,wbuf)<0) 
+    return -1;
+  }
+  else
+  {
+   j=i+drecords;
+   if (cmp_par(i,j,rbuf,wbuf)<0) 
+    return -1;
+  }
+ }
+ return 0;
+}
+
+
diff --git a/hl/test/test_table_be.hdf5 b/hl/test/test_table_be.hdf5
new file mode 100644
index 0000000..3639695
--- /dev/null
+++ b/hl/test/test_table_be.hdf5
diff --git a/hl/test/test_table_cray.hdf5 b/hl/test/test_table_cray.hdf5
new file mode 100644
index 0000000..d22dce3
--- /dev/null
+++ b/hl/test/test_table_cray.hdf5
diff --git a/hl/test/test_table_le.hdf5 b/hl/test/test_table_le.hdf5
new file mode 100644
index 0000000..6c330fd
--- /dev/null
+++ b/hl/test/test_table_le.hdf5