[svn-r6894] Purpose:

changes of input/ output  format

Description:
on web page /RFC/h5diff

Solution:

Platforms tested:

Windows 2000 (octopus)
Linux 2.4 (rockaway)
SunOS 5.7 (arabica)
IRIX 6.5 (modi4)


Misc. update:

1 files changed, 410 insertions, 580 deletions

diff --git a/tools/h5diff/h5difftst.c b/tools/h5diff/h5difftst.c
index 5eb2b8b..844d534 100644
--- a/tools/h5diff/h5difftst.c
+++ b/tools/h5diff/h5difftst.c
@@ -18,508 +18,429 @@
 #include "hdf5.h"
 
 
-/* diff tst*/
-int do_test_files(void);
+
+/* diff test*/
+int do_test_1(const char *file1, const char *file2);
+int do_test_2(const char *file1, const char *file2);
+int do_test_3(const char *file1, const char *file2);
+int do_test_4(const char *file1, const char *file2);
+int do_test_5(const char *file1, const char *file2);
 int write_dataset( hid_t loc_id, int rank, hsize_t *dims, const char *dset_name,
-                   hid_t type_id, void *data );
+                   hid_t type_id, void *buf );
 
 
 int main(int argc, const char *argv[])
 {
  
- do_test_files();
+ do_test_1("file1.h5","file2.h5");
+ do_test_2("file3.h5",NULL);
+ do_test_3("file4.h5",NULL);
+ do_test_4("file5.h5",NULL);
+ do_test_5("file6.h5",NULL);
  return 0;
 }
 
 
 
-
 /*-------------------------------------------------------------------------
- * these command line options are tested in ./testh5diff.sh
+ * Function: write_dataset
+ *
+ * Purpose: utility function to write a dataset
+ *
+ * Return: 
+ *
+ * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
+ *
+ * Date: April 7, 2003
+ *
  *-------------------------------------------------------------------------
  */
 
-/*
+int write_dataset( hid_t loc_id, int rank, hsize_t *dims, const char *dset_name,
+                   hid_t type_id, void *buf )
+{
+ hid_t   dataset_id;
+ hid_t   space_id;  
+ herr_t  status;
 
-##############################################################################
-# tests 0., Check for individual options
-##############################################################################
+ /* Create a buf space  */
+ space_id = H5Screate_simple(rank,dims,NULL);
 
-# test 0.1: Check if the command line number of arguments is less than 3
-h5diff_test1.h5 
+ /* Create a dataset */
+ dataset_id = H5Dcreate(loc_id,dset_name,type_id,space_id,H5P_DEFAULT);
+  
+ /* Write the buf */
+ if ( buf )
+  status = H5Dwrite(dataset_id,type_id,H5S_ALL,H5S_ALL,H5P_DEFAULT,buf);
 
-# test 0.2: Check for invalid options
--x h5diff_test1.h5 h5diff_test2.h5
+ /* Close */
+ status = H5Dclose(dataset_id);
+ status = H5Sclose(space_id);
 
-# test 0.3.1: Check for -h option
--h h5diff_test1.h5 h5diff_test2.h5
+ return status;
 
-# test 0.3.3: Check for -r option
--r h5diff_test1.h5 h5diff_test2.h5
+}
 
-##############################################################################
-# Test -d option
-##############################################################################
+/*
 
+# ##############################################################################
+# # Common usage
+# ##############################################################################
 
-# test 0.4.1: no value
--d  h5diff_test1.h5 h5diff_test2.h5
 
-# test 0.4.2: negative value
--d -4 h5diff_test1.h5 h5diff_test2.h5
+# 1.0
+ -h
 
-# test 0.4.3: zero
--d 0 h5diff_test1.h5 h5diff_test2.h5
+# 1.1
+ file1.h5 file2.h5 g1/dset1 g1/dset2
 
-# test 0.4.4: non number
--d u h5diff_test1.h5 h5diff_test2.h5
+# 1.2
+ file1.h5 file2.h5 -n 2 g1/dset1 g1/dset2
 
-# test 0.4.5: hexadecimal
--d 0x1 h5diff_test1.h5 h5diff_test2.h5
+# 1.3
+ file1.h5 file2.h5 -d 5 g1/dset3 g1/dset4
 
-# test 0.4.6: string which is a number
--d "1" h5diff_test1.h5 h5diff_test2.h5
+# 1.4
+ file1.h5 file2.h5 -p 0.05 g1/dset3 g1/dset4
 
-# test 0.4.7: repeated value
--d 1 -d 2 h5diff_test1.h5 h5diff_test2.h5
+# 1.5
+ file1.h5 file2.h5 -r g1/dset1 g1/dset2
 
-# test 0.4.8: number larger than biggest difference
-dset2.1a dset2.1b -d 7 h5diff_test1.h5 h5diff_test2.h5
+# 1.6
+ file1.h5 file2.h5 
 
-# test 0.4.9: number smaller than smallest difference
-dset2.1a dset2.1b -d 1 h5diff_test1.h5 h5diff_test2.h5
+# ##############################################################################
+# # not comparable types
+# ##############################################################################
 
-# test 0.4.10: non-integer
-dset2.1a dset2.1b -d 2.3 h5diff_test1.h5 h5diff_test2.h5
+# 2.0
+ file3.h5 file3.h5 dset group
 
+# 2.1
+ file3.h5 file3.h5 dset link
 
-##############################################################################
-# Test -p option
-##############################################################################
+# 2.2
+ file3.h5 file3.h5 dset type
 
+# 2.3
+ file3.h5 file3.h5 group group
 
-# test 0.5.1: no value
--p  h5diff_test1.h5 h5diff_test2.h5
+# 2.4
+ file3.h5 file3.h5 type type
 
-# test 0.5.2: negative value
--p -4 h5diff_test1.h5 h5diff_test2.h5
+# 2.5
+ file3.h5 file3.h5 link link
 
-# test 0.5.3: zero
--p 0 h5diff_test1.h5 h5diff_test2.h5
+# ##############################################################################
+# # Class issues
+# ##############################################################################
 
-# test 0.5.4: non number
--p u h5diff_test1.h5 h5diff_test2.h5
 
-# test 0.5.5: hexadecimal
--p 0x1 h5diff_test1.h5 h5diff_test2.h5
+# 3.0
+ file4.h5 file4.h5 string 
 
-# test 0.5.6: string
--p "1" h5diff_test1.h5 h5diff_test2.h5
+# 3.1
+ file4.h5 file4.h5 bitfield 
 
-# test 0.5.7: repeated value
--p 1 -p 2 h5diff_test1.h5 h5diff_test2.h5
+# 3.2
+ file4.h5 file4.h5 opaque
 
-# test 0.5.8: number larger than biggest difference
-dset2.1a dset2.1b -p 7 h5diff_test1.h5 h5diff_test2.h5
+# 3.3
+ file4.h5 file4.h5 compound
 
-# test 0.5.9: number smaller than smallest difference
-dset2.1a dset2.1b -p 1 h5diff_test1.h5 h5diff_test2.h5
+# 3.4
+ file4.h5 file4.h5 ref
 
-# test 0.5.10: non-integer
-dset2.1a dset2.1b -p 2.3 h5diff_test1.h5 h5diff_test2.h5
+# 3.5
+ file4.h5 file4.h5 enum
 
-##############################################################################
-# Test -n option
-##############################################################################
+# 3.6
+ file4.h5 file4.h5 vlen
 
+# 3.7
+ file4.h5 file4.h5 array
 
-# test 0.6.1: no value
--n  h5diff_test1.h5 h5diff_test2.h5
+# 3.8
+ file4.h5 file4.h5 integer float
 
-# test 0.6.2: negative value
--n -4 h5diff_test1.h5 h5diff_test2.h5
+# ##############################################################################
+# # Dimensions
+# ##############################################################################
 
-# test 0.6.3: zero
--n 0 h5diff_test1.h5 h5diff_test2.h5
+# 4.0
+ file5.h5 file5.h5 dset1 dset2
 
-# test 0.6.4: non number
--n u h5diff_test1.h5 h5diff_test2.h5
+# 4.1
+ file5.h5 file5.h5 dset3 dset4
 
-# test 0.6.5: hexadecimal
--n 0x1 h5diff_test1.h5 h5diff_test2.h5
+# 4.2
+ file5.h5 file5.h5 dset5 dset6
 
-# test 0.6.6: string
--n "1" h5diff_test1.h5 h5diff_test2.h5
 
-# test 0.6.7: repeated value
--n 1 -n 2 h5diff_test1.h5 h5diff_test2.h5
+# ##############################################################################
+# # Dataset types
+# ##############################################################################
 
-# test 0.6.8: number larger than biggest difference
-dset2.1a dset2.1b -n 7 h5diff_test1.h5 h5diff_test2.h5
+# 5.0
+ file6.h5 file6.h5 dset0a dset0b
 
-# test 0.6.9: number smaller than smallest difference
-dset2.1a dset2.1b -n 1 h5diff_test1.h5 h5diff_test2.h5
+# 5.1
+ file6.h5 file6.h5 dset1a dset1b
 
-# test 0.6.10: non-integer
-dset2.1a dset2.1b -n 2.3 h5diff_test1.h5 h5diff_test2.h5
+# 5.2
+ file6.h5 file6.h5 dset2a dset2b
 
-##############################################################################
-# Test valid files
-##############################################################################
+# 5.3
+ file6.h5 file6.h5 dset3a dset4b
 
-# test 0.7: Check if the file names supplied are valid files
-h5diff_test1.h6 h5diff_test2.h6
+# 5.4
+ file6.h5 file6.h5 dset4a dset4b
 
+# 5.5
+ file6.h5 file6.h5 dset5a dset5b
 
-##############################################################################
-# Check for not comparable issues
-##############################################################################
+# 5.6
+ file6.h5 file6.h5 dset6a dset6b
 
-##############################################################################
-# Different types
-##############################################################################
+# ##############################################################################
+# # Error messages
+# ##############################################################################
 
-# test 1.1.1: Compare a dataset with a group
-dset1.1 g1.1 h5diff_test1.h5 h5diff_test2.h5
 
-# test 1.1.2 Dataset vs Link
-dset1.1 soft h5diff_test1.h5 h5diff_test1.h5
+# 6.0: Check if the command line number of arguments is less than 3
+ h5diff_test1.h5 
 
-# test 1.1.3 Dataset vs Named type
-dset1.1 compound h5diff_test1.h5 h5diff_test1.h5
+# 6.1: Check for invalid options
+ h5diff_test1.h5 h5diff_test2.h5 -x 
 
-##############################################################################
-# not comparable types
-##############################################################################
+# ##############################################################################
+# # -d 
+# ##############################################################################
 
-# test 1.2.1: Group vs Group
-g1.1 g1.1 h5diff_test1.h5 h5diff_test2.h5
+# 6.2: no value
+ file1.h5 file2.h5 -d g1/dset3 g1/dset4
 
-# test 1.2.2: Type vs Type
-compound h5diff_test1.h5 h5diff_test2.h5
+# 6.3: negative value
+ file1.h5 file2.h5 -d -4 g1/dset3 g1/dset4
 
-# test 1.2.3: Link vs Link
-soft soft h5diff_test1.h5 h5diff_test1.h5
+# 6.4: zero
+ file1.h5 file2.h5 -d 0 g1/dset3 g1/dset4
 
+# 6.5: non number
+ file1.h5 file2.h5 -d u g1/dset3 g1/dset4
 
-##############################################################################
-# Class issues
-##############################################################################
+# 6.6: hexadecimal
+ file1.h5 file2.h5 -d 0x1 g1/dset3 g1/dset4
 
-# test 1.3.1: H5T_STRING
-dset1.3.1 h5diff_test1.h5 h5diff_test1.h5
+# 6.7: string
+ file1.h5 file2.h5 -d "1" g1/dset3 g1/dset4
 
-# test 1.3.2: H5T_BITFIELD
-dset1.3.2 h5diff_test1.h5 h5diff_test1.h5
+# 6.8: repeated option
+ file1.h5 file2.h5 -d 1 -d 2 g1/dset3 g1/dset4
 
-# test 1.3.3: H5T_OPAQUE
-dset1.3.3 h5diff_test1.h5 h5diff_test1.h5
+# 6.9: number larger than biggest difference
+ file1.h5 file2.h5 -d 200 g1/dset3 g1/dset4
 
-# test 1.3.4: H5T_COMPOUND
-dset1.3.4 h5diff_test1.h5 h5diff_test1.h5
+# 6.10: number smaller than smallest difference
+ file1.h5 file2.h5 -d 1 g1/dset3 g1/dset4
 
-# test 1.3.5: H5T_REFERENCE
-dset1.3.5 h5diff_test1.h5 h5diff_test1.h5
 
-# test 1.3.6: H5T_ENUM
-dset1.3.6 h5diff_test1.h5 h5diff_test1.h5
+# ##############################################################################
+# # -p
+# ##############################################################################
 
-# test 1.3.7: H5T_VLEN
-dset1.3.7 h5diff_test1.h5 h5diff_test1.h5
 
-# test 1.3.8: H5T_ARRAY
-dset1.3.8 h5diff_test1.h5 h5diff_test1.h5
+# 6.11: no value
+ file1.h5 file2.h5 -p g1/dset3 g1/dset4
 
+# 6.12: negative value
+ file1.h5 file2.h5 -p -4 g1/dset3 g1/dset4
 
-# test 1.4: Compare integer with float
-dset1.1 dset1.4 h5diff_test1.h5 h5diff_test2.h5
+# 6.13: zero
+ file1.h5 file2.h5 -p 0 g1/dset3 g1/dset4
 
-# test 1.5 : Check for the same rank, for datasets
-dset1.1 dset1.5 h5diff_test1.h5 h5diff_test2.h5
+# 6.14: non number
+ file1.h5 file2.h5 -p u g1/dset3 g1/dset4
 
-# test 1.6: Check for the same current dimensions. Only compare if they are the same.
-dset1.1 dset1.6 h5diff_test1.h5 h5diff_test2.h5
+# 6.15: hexadecimal
+ file1.h5 file2.h5 -p 0x1 g1/dset3 g1/dset4
 
-# test 1.7: Check for the same maximum dimensions. Give a warning if they are different. 
-dset1.7 dset1.7 h5diff_test1.h5 h5diff_test2.h5
+# 6.16: string
+ file1.h5 file2.h5 -p "0.21" g1/dset3 g1/dset4
 
-# test 1.8: Check for the same storage datatype. Give a warning if they are different. 
-dset1.8 dset1.8 h5diff_test1.h5 h5diff_test2.h5
+# 6.17: repeated option
+ file1.h5 file2.h5 -p 0.21 -p 0.22 g1/dset3 g1/dset4
 
+# 6.18: number larger than biggest difference
+ file1.h5 file2.h5 -p 2 g1/dset3 g1/dset4
 
-#######################################################
-# Different datatype sizes and different mix of options 
-#######################################################
+# 6.19: number smaller than smallest difference
+ file1.h5 file2.h5 -p 0.005 g1/dset3 g1/dset4
 
-##############################################################################
-# H5T_NATIVE_CHAR
-##############################################################################
 
-# test 2.1.0
-dset2.1a dset2.1b h5diff_test1.h5 h5diff_test2.h5
-# test 2.1.1
-dset2.1a dset2.1b -n 2 h5diff_test1.h5 h5diff_test2.h5
-# test 2.1.2
-dset2.1a dset2.1b -d 3 h5diff_test1.h5 h5diff_test2.h5
-# test 2.1.3
-dset2.1a dset2.1b -p 3 h5diff_test1.h5 h5diff_test2.h5
 
-##############################################################################
-# H5T_NATIVE_SHORT
-##############################################################################
+# ##############################################################################
+# # -n
+# ##############################################################################
 
-# test 2.2.0
-dset2.2a dset2.2b h5diff_test1.h5 h5diff_test2.h5
-# test 2.2.1
-dset2.2a dset2.2b -n 2 h5diff_test1.h5 h5diff_test2.h5
-# test 2.2.2
-dset2.2a dset2.2b -d 3 h5diff_test1.h5 h5diff_test2.h5
-# test 2.2.3
-dset2.2a dset2.2b -p 3 h5diff_test1.h5 h5diff_test2.h5
 
-##############################################################################
-# H5T_NATIVE_INT
-##############################################################################
+# 6.20: no value
+ file1.h5 file2.h5 -n g1/dset3 g1/dset4
 
-# test 2.3.0
-dset2.3a dset2.3b h5diff_test1.h5 h5diff_test2.h5
-# test 2.3.1
-dset2.3a dset2.3b -n 2 h5diff_test1.h5 h5diff_test2.h5
-# test 2.3.2
-dset2.3a dset2.3b -d 3 h5diff_test1.h5 h5diff_test2.h5
-# test 2.3.3
-dset2.3a dset2.3b -p 3 h5diff_test1.h5 h5diff_test2.h5
+# 6.21: negative value
+ file1.h5 file2.h5 -n -4 g1/dset3 g1/dset4
 
-##############################################################################
-# H5T_NATIVE_LONG
-##############################################################################
+# 6.22: zero
+ file1.h5 file2.h5 -n 0 g1/dset3 g1/dset4
 
-# test 2.4.0
-dset2.4a dset2.4b h5diff_test1.h5 h5diff_test2.h5
-# test 2.4.1
-dset2.4a dset2.4b -n 2 h5diff_test1.h5 h5diff_test2.h5
-# test 2.4.2
-dset2.4a dset2.4b -d 3 h5diff_test1.h5 h5diff_test2.h5
-# test 2.4.3
-dset2.4a dset2.4b -p 3 h5diff_test1.h5 h5diff_test2.h5
+# 6.23: non number
+ file1.h5 file2.h5 -n u g1/dset3 g1/dset4
 
-##############################################################################
-# H5T_NATIVE_FLOAT 
-##############################################################################
+# 6.24: hexadecimal
+ file1.h5 file2.h5 -n 0x1 g1/dset3 g1/dset4
 
-# test 2.5.0
-dset2.5a dset2.5b h5diff_test1.h5 h5diff_test2.h5
-# test 2.5.1
-dset2.5a dset2.5b -n 2 h5diff_test1.h5 h5diff_test2.h5
-# test 2.5.2
-dset2.5a dset2.5b -d 3 h5diff_test1.h5 h5diff_test2.h5
-# test 2.5.3
-dset2.5a dset2.5b -p 3 h5diff_test1.h5 h5diff_test2.h5
+# 6.25: string
+ file1.h5 file2.h5 -n "2" g1/dset3 g1/dset4
 
-##############################################################################
-# H5T_NATIVE_DOUBLE
-##############################################################################
-		
-# test 2.6.0
-dset2.6a dset2.6b h5diff_test1.h5 h5diff_test2.h5
-# test 2.6.1
-dset2.6a dset2.6b -n 2 h5diff_test1.h5 h5diff_test2.h5
-# test 2.6.2
-dset2.6a dset2.6b -d 3 h5diff_test1.h5 h5diff_test2.h5
-# test 2.6.3
-dset2.6a dset2.6b -p 3 h5diff_test1.h5 h5diff_test2.h5
-
-#######################################################
-# Different combination of objects
-#######################################################
-
-# test 3.0
-h5diff_test3.h5 h5diff_test4.h5
-
-# test 3.1
-dset_A dset_A h5diff_test3.h5 h5diff_test4.h5
-
-# test 3.2
-dset_A dset_B h5diff_test3.h5 h5diff_test4.h5
-
-# test 3.3
-dset_C dset_A h5diff_test3.h5 h5diff_test4.h5
-
-# test 3.4
-dset_C dset_C h5diff_test3.h5 h5diff_test4.h5
-
-#######################################################
-# reverse direction
-#######################################################
-
-# test 3.5
-h5diff_test4.h5 h5diff_test3.h5
-
-#######################################################
-# Different paths
-#######################################################
-
-# test 4.0: should find
-g1/dset1 g2/dset1 h5diff_test5.h5 h5diff_test6.h5
-
-# test 4.1.1: should NOT find
-dset1 dset1 h5diff_test5.h5 h5diff_test6.h5
-
-# test 4.1.2: should NOT find
-/g1/dset1 dset1 h5diff_test5.h5 h5diff_test6.h5
-
-# test 4.1.3: should NOT find
-/g1/dset1 /g1/dset1 h5diff_test5.h5 h5diff_test6.h5
-
-#######################################################
-# paths with several components
-#######################################################
-
-# test 4.2.1: 
-/a/b/c /a/b/c h5diff_test5.h5 h5diff_test6.h5
-
-# test 4.2.2: 
-/x/a/c /a/b/c h5diff_test5.h5 h5diff_test6.h5
-
-*/
-
-
-int do_test_files(void)
-{
+# 6.26: repeated option
+ file1.h5 file2.h5 -n 2 -n 3 g1/dset3 g1/dset4
 
- hid_t   file1_id, file2_id, file3_id, file4_id; 
-	hid_t   file5_id, file6_id; 
- hid_t   dataset_id;
- hid_t   space_id;  
- hid_t   group_id, group2_id;
- hid_t   plist_id;
- hid_t   type_id, type2_id;  
- herr_t  status;
- int     val;
+# 6.27: number larger than biggest difference
+ file1.h5 file2.h5 -n 200 g1/dset3 g1/dset4
 
- /* Test 1. */
- hsize_t dims1  [1] = { 7 };
- hsize_t dims1_1[1] = { 8 };
- hsize_t maxdim [1] = { 8 }; 
- hsize_t dims0  [1] = { 1 };
- hsize_t dims2  [2] = { 3,2 };
- char    data1_3[]  = {"A string"};
- unsigned char data1_3_2[7] = {1,2,3,4,5,6,7};
- float   data1_4[7] = {1,1,3,4,5,6,7};
- 
- /* Compound datatype */
- typedef struct s_t 
- {
-  int    a;
-  float  b;
- } s_t;
+# 6.28: number smaller than smallest difference
+ file1.h5 file2.h5 -n 1 g1/dset3 g1/dset4
 
- typedef enum 
- {
-  E_RED,
-  E_GREEN
-} e_t;
+# ##############################################################################
+# # non valid files
+# ##############################################################################
 
- /* Test 2.1 */
- char    data2_1a[3][2] = {{1,1},{1,1},{1,1}};
- char    data2_1b[3][2] = {{1,1},{3,4},{5,6}};
- /* Test 2.2 */
- short   data2_2a[3][2] = {{1,1},{1,1},{1,1}};
- short   data2_2b[3][2] = {{1,1},{3,4},{5,6}};
- /* Test 2.3 */
- int    data2_3a[3][2] = {{1,1},{1,1},{1,1}};
- int    data2_3b[3][2] = {{1,1},{3,4},{5,6}};
- /* Test 2.4 */
- long   data2_4a[3][2] = {{1,1},{1,1},{1,1}};
- long   data2_4b[3][2] = {{1,1},{3,4},{5,6}};
- /* Test 2.5 */
- float  data2_5a[3][2] = {{1,1},{1,1},{1,1}};
- float  data2_5b[3][2] = {{1,1},{3,4},{5,6}};
- /* Test 2.6 */
- double  data2_6a[3][2] = {{1,1},{1,1},{1,1}};
- double  data2_6b[3][2] = {{1,1},{3,4},{5,6}};
+ file1.h6 file2.h6
 
+/*
 
 
 /*-------------------------------------------------------------------------
- * Create two files
+ * Basic review tests
  *-------------------------------------------------------------------------
  */
-  
- /* Create a file */
- file1_id = H5Fcreate ("h5diff_test1.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); 
 
- /* Create a file */
- file2_id = H5Fcreate ("h5diff_test2.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); 
+int do_test_1(const char *file1, const char *file2)
+{
+
+ hid_t   file1_id, file2_id; 
+ hid_t   group1_id, group2_id, group3_id;
+ herr_t  status;
+ hsize_t dims[2] = { 3,2 };
+
+ /* Test */
+ double  data1[3][2] = {{1,1},{1,1},{1,1}};
+ double  data2[3][2] = {{1,1.1},{1.01,1.001},{1.0001,1.000000001}};
+ double  data3[3][2] = {{100,110},{100,100},{100,100}};
+ double  data4[3][2] = {{110,100},{90,80},{140,200}};
 
 /*-------------------------------------------------------------------------
- * Test 1.1
- * Objects are not the same type (e.g try to compare a group with a dataset)
+ * Create two files
  *-------------------------------------------------------------------------
  */
+  
+ file1_id = H5Fcreate (file1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); 
+ file2_id = H5Fcreate (file2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); 
 
- /* Create a data space  */
- space_id = H5Screate_simple(1,dims1,NULL);
+ /* Create groups */
+ group1_id = H5Gcreate(file1_id, "g1", 0);
+ group2_id = H5Gcreate(file2_id, "g1", 0);
+ group3_id = H5Gcreate(file2_id, "g2", 0);
 
- /* Create a dataset "dset1.1" */
- dataset_id = H5Dcreate(file1_id,"dset1.1",H5T_NATIVE_INT,space_id,H5P_DEFAULT);
+ write_dataset(group1_id,2,dims,"dset1",H5T_NATIVE_DOUBLE,data1);
+ write_dataset(group2_id,2,dims,"dset2",H5T_NATIVE_DOUBLE,data2);
+ write_dataset(group1_id,2,dims,"dset3",H5T_NATIVE_DOUBLE,data3);
+ write_dataset(group2_id,2,dims,"dset4",H5T_NATIVE_DOUBLE,data4);
+ write_dataset(group2_id,2,dims,"dset1",H5T_NATIVE_DOUBLE,data2);
 
- /* Close */
- status = H5Dclose(dataset_id);
- status = H5Sclose(space_id);
+/*-------------------------------------------------------------------------
+ * Close 
+ *-------------------------------------------------------------------------
+ */
+ status = H5Gclose(group1_id);
+ status = H5Gclose(group2_id);
+ status = H5Gclose(group3_id);
+ status = H5Fclose(file1_id);
+ status = H5Fclose(file2_id);
+ return status;
+}
 
- /* Create a group "g1.1" on file2 */
- group_id = H5Gcreate(file2_id, "g1.1", 0);
+/*-------------------------------------------------------------------------
+ * Compare different types: H5G_DATASET, H5G_TYPE, H5G_GROUP, H5G_LINK
+ *-------------------------------------------------------------------------
+ */
 
- /* Close */
- status = H5Gclose(group_id);
+int do_test_2(const char *file1, const char *file2)
+{
+
+ hid_t   file1_id; 
+ hid_t   group_id;
+ hid_t   type_id;  
+ herr_t  status;
+ hsize_t dims[1]={1};
+ /* Compound datatype */
+ typedef struct s_t 
+ {
+  int    a;
+  float  b;
+ } s_t;
 
 /*-------------------------------------------------------------------------
- * Test 1.2
- * Objects are of classes H5G_TYPE and H5G_GROUP and their name is supplied
+ * Create one file
  *-------------------------------------------------------------------------
  */
+ file1_id = H5Fcreate (file1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); 
 
- /* Create a group "g1.1" on file1 */
- group_id = H5Gcreate(file1_id, "g1.1", 0);
+/*-------------------------------------------------------------------------
+ * H5G_DATASET
+ *-------------------------------------------------------------------------
+ */
+ write_dataset(file1_id,1,dims,"dset",H5T_NATIVE_INT,0);
 
- /* Close */
+/*-------------------------------------------------------------------------
+ * H5G_GROUP
+ *-------------------------------------------------------------------------
+ */
+ group_id = H5Gcreate(file1_id, "group", 0);
  status = H5Gclose(group_id);
 
- /* Create a memory compound datatype on file1 */
+/*-------------------------------------------------------------------------
+ * H5G_TYPE
+ *-------------------------------------------------------------------------
+ */
+
+ /* Create a memory compound datatype */
  type_id = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
  H5Tinsert(type_id, "a", HOFFSET(s_t, a), H5T_NATIVE_INT);
  H5Tinsert(type_id, "b", HOFFSET(s_t, b), H5T_NATIVE_FLOAT);
  /* Commit compound datatype and close it */
- H5Tcommit(file1_id, "compound", type_id);
- type2_id = H5Tcopy(type_id);
- H5Tcommit(file2_id, "compound", type2_id);
+ H5Tcommit(file1_id, "type", type_id);
  H5Tclose(type_id);
- H5Tclose(type2_id);
  
- /* Create a memory enum datatype on file1 */
- type_id = H5Tcreate(H5T_ENUM, sizeof(e_t));
- H5Tenum_insert(type_id, "RED",   (val = 0, &val));
- H5Tenum_insert(type_id, "GREEN", (val = 1, &val));
- type2_id = H5Tcopy(type_id);
-
- /* Commit enumeration datatype and close it */
- H5Tcommit(file1_id, "enum", type_id);
- H5Tcommit(file2_id, "enum", type2_id);
- H5Tclose(type_id);
- H5Tclose(type2_id);
-
 /*-------------------------------------------------------------------------
- * Test 1.2.3
- * Links
+ * H5G_LINK
  *-------------------------------------------------------------------------
  */
  
- /* Create a symbolic link */
- status = H5Glink(file1_id, H5G_LINK_SOFT, "dset1.1", "soft");
+ status = H5Glink(file1_id, H5G_LINK_SOFT, "dset", "link");
+
+/*-------------------------------------------------------------------------
+ * Close 
+ *-------------------------------------------------------------------------
+ */
+ status = H5Fclose(file1_id);
+ return status;
+}
+
+
+
 
 /*-------------------------------------------------------------------------
- * Tests 1.3.
  * Check for non supported classes. Supported classes are H5T_INTEGER and H5T_FLOAT
  * Non supported classes are
  * H5T_TIME, H5T_STRING, H5T_BITFIELD, H5T_OPAQUE, H5T_COMPOUND, H5T_REFERENCE,
@@ -527,54 +448,68 @@ int do_test_files(void)
  *-------------------------------------------------------------------------
  */
 
+int do_test_3(const char *file1, const char *file2)
+{
+
+ hid_t   file1_id; 
+ hid_t   dataset_id;
+ hid_t   space_id;  
+ hid_t   type_id;  
+ hsize_t dims[1]={1};
+ herr_t  status;
+ int     val;
+
+  /* Compound datatype */
+ typedef struct s_t 
+ {
+  int    a;
+  float  b;
+ } s_t;
+
+ typedef enum 
+ {
+  E_RED,
+  E_GREEN
+} e_t;
+
 /*-------------------------------------------------------------------------
- * Test 1.3.1
- * H5T_STRING
+ * Create a file
  *-------------------------------------------------------------------------
  */
+ file1_id = H5Fcreate (file1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); 
 
- /* Create a data space  */
+/*-------------------------------------------------------------------------
+ * H5T_STRING
+ *-------------------------------------------------------------------------
+ */
  space_id = H5Screate(H5S_SCALAR);
-
- /* Make a string type */
  type_id = H5Tcopy(H5T_C_S1);
- status = H5Tset_size (type_id, strlen(data1_3));
-
- /* Create a dataset "dset1.3" on file 1 */
- dataset_id = H5Dcreate(file1_id,"dset1.3.1",type_id,space_id,H5P_DEFAULT);
-  
- /* Write the data */
- status = H5Dwrite(dataset_id,type_id,H5S_ALL,H5S_ALL,H5P_DEFAULT,data1_3);
-
- /* Close */
+ dataset_id = H5Dcreate(file1_id,"string",type_id,space_id,H5P_DEFAULT);
  status = H5Dclose(dataset_id);
  status = H5Sclose(space_id);
  status = H5Tclose(type_id);
 
 /*-------------------------------------------------------------------------
- * Test 1.3.2
  * H5T_BITFIELD
  *-------------------------------------------------------------------------
  */
 
  type_id = H5Tcopy(H5T_STD_B8LE);
- write_dataset(file1_id,1,dims1,"dset1.3.2",type_id,data1_3_2);
+ write_dataset(file1_id,1,dims,"bitfield",type_id,0);
  status = H5Tclose(type_id);
 
 
 /*-------------------------------------------------------------------------
- * Test 1.3.3
  * H5T_OPAQUE
  *-------------------------------------------------------------------------
  */
 
  type_id = H5Tcreate(H5T_OPAQUE, 1);
  status = H5Tset_tag(type_id, "1-byte opaque type"); /* must set this */
- write_dataset(file1_id,1,dims1,"dset1.3.3",type_id,data1_3_2);
+ write_dataset(file1_id,1,dims,"opaque",type_id,0);
  status = H5Tclose(type_id);
 
 /*-------------------------------------------------------------------------
- * Test 1.3.4
  * H5T_COMPOUND
  *-------------------------------------------------------------------------
  */
@@ -582,314 +517,209 @@ int do_test_files(void)
  type_id = H5Tcreate (H5T_COMPOUND, sizeof(s_t));
  H5Tinsert(type_id, "a", HOFFSET(s_t, a), H5T_NATIVE_INT);
  H5Tinsert(type_id, "b", HOFFSET(s_t, b), H5T_NATIVE_FLOAT);
- write_dataset(file1_id,1,dims1,"dset1.3.4",type_id,0);
+ write_dataset(file1_id,1,dims,"compound",type_id,0);
  status = H5Tclose(type_id);
  
 /*-------------------------------------------------------------------------
- * Test 1.3.5
  * H5T_REFERENCE
  *-------------------------------------------------------------------------
  */
-
- write_dataset(file1_id,1,dims1,"dset1.3.5",H5T_STD_REF_OBJ,0);
-
+ write_dataset(file1_id,1,dims,"ref",H5T_STD_REF_OBJ,0);
 
 /*-------------------------------------------------------------------------
- * Test 1.3.6
  * H5T_ENUM
  *-------------------------------------------------------------------------
  */
-
  type_id = H5Tcreate(H5T_ENUM, sizeof(e_t));
  H5Tenum_insert(type_id, "RED",   (val = 0, &val));
  H5Tenum_insert(type_id, "GREEN", (val = 1, &val));
- write_dataset(file1_id,1,dims1,"dset1.3.6",type_id,0);
+ write_dataset(file1_id,1,dims,"enum",type_id,0);
  status = H5Tclose(type_id);
 
 /*-------------------------------------------------------------------------
- * Test 1.3.7
  * H5T_VLEN
  *-------------------------------------------------------------------------
  */
-
  type_id = H5Tvlen_create(H5T_NATIVE_INT);
- write_dataset(file1_id,1,dims1,"dset1.3.7",type_id,0);
+ write_dataset(file1_id,1,dims,"vlen",type_id,0);
  status = H5Tclose(type_id);
 
-
 /*-------------------------------------------------------------------------
- * Test 1.3.8
  * H5T_ARRAY
  *-------------------------------------------------------------------------
  */
-
- type_id = H5Tarray_create(H5T_NATIVE_INT,1,dims1,NULL);
- write_dataset(file1_id,1,dims1,"dset1.3.8",type_id,0);
+ type_id = H5Tarray_create(H5T_NATIVE_INT,1,dims,NULL);
+ write_dataset(file1_id,1,dims,"array",type_id,0);
  status = H5Tclose(type_id);
 
-
-
 /*-------------------------------------------------------------------------
- * Test 1.4
- * Datasets are not the same class type
- * Write a float dataset and compare with integer "dset1.1"
+ * H5T_INTEGER vs H5T_FLOAT
  *-------------------------------------------------------------------------
  */
 
- write_dataset(file2_id,1,dims1,"dset1.4",H5T_NATIVE_FLOAT,data1_4);
+ write_dataset(file1_id,1,dims,"integer",H5T_NATIVE_INT,0);
+ write_dataset(file1_id,1,dims,"float",H5T_NATIVE_FLOAT,0);
 
 /*-------------------------------------------------------------------------
- * Test 1.5
- * Datasets are not the same rank
+ * Close 
  *-------------------------------------------------------------------------
  */
+ status = H5Fclose(file1_id);
+ return status;
+}
 
- write_dataset(file2_id,2,dims2,"dset1.5",H5T_NATIVE_INT,NULL);
 
 /*-------------------------------------------------------------------------
- * Test 1.6
- * Check for the same current dimensions. Only compare if they are the same.
+ * Dimension issues
  *-------------------------------------------------------------------------
  */
 
- write_dataset(file2_id,1,dims1_1,"dset1.6",H5T_NATIVE_INT,NULL);
+int do_test_4(const char *file1, const char *file2)
+{
+
+ hid_t   file1_id; 
+ hid_t   dataset_id;
+ hid_t   space_id;
+ hid_t   plist_id;
+ herr_t  status;
+ hsize_t dims1 [1]={7};
+ hsize_t dims2 [4]={2,2,2,2};
+ hsize_t dims21[4]={2,2,2,3};
 
 /*-------------------------------------------------------------------------
- * Test 1.7
- * Check for the same maximum dimensions. Give a warning if they are different
+ * Create a file
  *-------------------------------------------------------------------------
  */
-
- space_id = H5Screate_simple(1,dims1,dims1);
- dataset_id = H5Dcreate(file1_id,"dset1.7",H5T_NATIVE_INT,space_id,H5P_DEFAULT);
- status = H5Dclose(dataset_id);
- status = H5Sclose(space_id);
- space_id = H5Screate_simple(1,dims1,maxdim);
- plist_id = H5Pcreate(H5P_DATASET_CREATE);
- status = H5Pset_chunk(plist_id,1,dims1);
- dataset_id = H5Dcreate(file2_id,"dset1.7",H5T_NATIVE_INT,space_id,plist_id);
- status = H5Dclose(dataset_id);
- status = H5Sclose(space_id);
+ file1_id = H5Fcreate (file1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); 
 
 /*-------------------------------------------------------------------------
- * Test 1.8
- * Check for different storage order. Give a warning if they are different
+ * rank
  *-------------------------------------------------------------------------
  */
+ write_dataset(file1_id,1,dims1,"dset1",H5T_NATIVE_INT,NULL);
+ write_dataset(file1_id,4,dims2,"dset2",H5T_NATIVE_INT,NULL);
 
- write_dataset(file1_id,1,dims1,"dset1.8",H5T_STD_I32BE,0);
- write_dataset(file2_id,1,dims1,"dset1.8",H5T_STD_I32LE,0);
+/*-------------------------------------------------------------------------
+ * current dimensions
+ *-------------------------------------------------------------------------
+ */
+ write_dataset(file1_id,4,dims2,"dset3",H5T_NATIVE_INT,NULL);
+ write_dataset(file1_id,4,dims21,"dset4",H5T_NATIVE_INT,NULL);
 
 /*-------------------------------------------------------------------------
- * Test 1.9
- * Check for H5S_SCALAR dataspace vs simple dataspace with 1 element     
+ * Check for the same maximum dimensions. Give a warning if they are different
  *-------------------------------------------------------------------------
  */
 
- space_id = H5Screate(H5S_SCALAR);
- dataset_id = H5Dcreate(file1_id,"dset1.9",H5T_NATIVE_INT,space_id,H5P_DEFAULT);
+ space_id = H5Screate_simple(4,dims2,dims2);
+ dataset_id = H5Dcreate(file1_id,"dset5",H5T_NATIVE_INT,space_id,H5P_DEFAULT);
  status = H5Dclose(dataset_id);
  status = H5Sclose(space_id);
- space_id = H5Screate_simple(0,dims0,NULL);
- dataset_id = H5Dcreate(file2_id,"dset1.9",H5T_NATIVE_INT,space_id,H5P_DEFAULT);
+ space_id = H5Screate_simple(4,dims2,dims21);
+ plist_id = H5Pcreate(H5P_DATASET_CREATE);
+ status = H5Pset_chunk(plist_id,4,dims2);
+ dataset_id = H5Dcreate(file1_id,"dset6",H5T_NATIVE_INT,space_id,plist_id);
  status = H5Dclose(dataset_id);
  status = H5Sclose(space_id);
 
 /*-------------------------------------------------------------------------
- * Test 2.1
- * Check H5T_NATIVE_CHAR data
+ * Close 
  *-------------------------------------------------------------------------
  */
+ status = H5Fclose(file1_id);
+ return status;
+}
 
- write_dataset(file1_id,2,dims2,"dset2.1a",H5T_NATIVE_CHAR,data2_1a);
- write_dataset(file2_id,2,dims2,"dset2.1b",H5T_NATIVE_CHAR,data2_1b);
 
-/*-------------------------------------------------------------------------
- * Test 2.2
- * Check H5T_NATIVE_SHORT data
- *-------------------------------------------------------------------------
- */
 
- write_dataset(file1_id,2,dims2,"dset2.2a",H5T_NATIVE_SHORT,data2_2a);
- write_dataset(file2_id,2,dims2,"dset2.2b",H5T_NATIVE_SHORT,data2_2b);
 
 /*-------------------------------------------------------------------------
- * Test 2.3
- * Check H5T_NATIVE_INT data
+ * Datasets datatypes 
  *-------------------------------------------------------------------------
  */
 
- write_dataset(file1_id,2,dims2,"dset2.3a",H5T_NATIVE_INT,data2_3a);
- write_dataset(file2_id,2,dims2,"dset2.3b",H5T_NATIVE_INT,data2_3b);
+int do_test_5(const char *file1, const char *file2)
+{
 
-/*-------------------------------------------------------------------------
- * Test 2.4
- * Check H5T_NATIVE_LONG data
- *-------------------------------------------------------------------------
- */
+ hid_t   file1_id; 
+ hsize_t dims[2]={3,2};
+ herr_t  status;
+ char    buf1a[3][2] = {{1,1},{1,1},{1,1}};
+ char    buf1b[3][2] = {{1,1},{3,4},{5,6}};
+ short   buf2a[3][2] = {{1,1},{1,1},{1,1}};
+ short   buf2b[3][2] = {{1,1},{3,4},{5,6}};
+ int     buf3a[3][2] = {{1,1},{1,1},{1,1}};
+ int     buf3b[3][2] = {{1,1},{3,4},{5,6}};
+ long    buf4a[3][2] = {{1,1},{1,1},{1,1}};
+ long    buf4b[3][2] = {{1,1},{3,4},{5,6}};
+ float   buf5a[3][2] = {{1,1},{1,1},{1,1}};
+ float   buf5b[3][2] = {{1,1},{3,4},{5,6}};
+ double  buf6a[3][2] = {{1,1},{1,1},{1,1}};
+ double  buf6b[3][2] = {{1,1},{3,4},{5,6}};
 
- write_dataset(file1_id,2,dims2,"dset2.4a",H5T_NATIVE_LONG,data2_4a);
- write_dataset(file2_id,2,dims2,"dset2.4b",H5T_NATIVE_LONG,data2_4b);
 
 /*-------------------------------------------------------------------------
- * Test 2.5
- * Check H5T_NATIVE_FLOAT data
+ * Create a file
  *-------------------------------------------------------------------------
  */
-
- write_dataset(file1_id,2,dims2,"dset2.5a",H5T_NATIVE_FLOAT,data2_5a);
- write_dataset(file2_id,2,dims2,"dset2.5b",H5T_NATIVE_FLOAT,data2_5b);
+ file1_id = H5Fcreate (file1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
 
 /*-------------------------------------------------------------------------
- * Test 2.4
- * Check H5T_NATIVE_DOUBLE data
+ * Check for different storage order. Give a warning if they are different
  *-------------------------------------------------------------------------
  */
 
- write_dataset(file1_id,2,dims2,"dset2.6a",H5T_NATIVE_DOUBLE,data2_6a);
- write_dataset(file2_id,2,dims2,"dset2.6b",H5T_NATIVE_DOUBLE,data2_6b);
-
-
-
-
+ write_dataset(file1_id,2,dims,"dset0a",H5T_STD_I16LE,buf2a);
+ write_dataset(file1_id,2,dims,"dset0b",H5T_STD_I32LE,buf3b);
+ 
 /*-------------------------------------------------------------------------
- * Create two files
+ * Check H5T_NATIVE_CHAR 
  *-------------------------------------------------------------------------
  */
-  
- /* Create a file */
- file3_id = H5Fcreate ("h5diff_test3.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); 
-
- /* Create a file */
- file4_id = H5Fcreate ("h5diff_test4.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); 
+ write_dataset(file1_id,2,dims,"dset1a",H5T_NATIVE_CHAR,buf1a);
+ write_dataset(file1_id,2,dims,"dset1b",H5T_NATIVE_CHAR,buf1b);
 
 /*-------------------------------------------------------------------------
- * Test 3.0
- * Check for different objects
+ * Check H5T_NATIVE_SHORT 
  *-------------------------------------------------------------------------
  */
-
- write_dataset(file3_id,1,dims1_1,"dset_A",H5T_NATIVE_INT,0);
- write_dataset(file4_id,1,dims1_1,"dset_A",H5T_NATIVE_INT,0);
- write_dataset(file3_id,1,dims1_1,"dset_B",H5T_NATIVE_INT,0);
- write_dataset(file4_id,1,dims1_1,"dset_C",H5T_NATIVE_INT,0);
-
+ write_dataset(file1_id,2,dims,"dset2a",H5T_NATIVE_SHORT,buf2a);
+ write_dataset(file1_id,2,dims,"dset2b",H5T_NATIVE_SHORT,buf2b);
 
 /*-------------------------------------------------------------------------
- * Create two files for path tests
+ * Check H5T_NATIVE_INT
  *-------------------------------------------------------------------------
  */
-  
- /* Create a file */
- file5_id = H5Fcreate ("h5diff_test5.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); 
-
- /* Create a file */
- file6_id = H5Fcreate ("h5diff_test6.h5", H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); 
+ write_dataset(file1_id,2,dims,"dset3a",H5T_NATIVE_INT,buf3a);
+ write_dataset(file1_id,2,dims,"dset3b",H5T_NATIVE_INT,buf3b);
 
 /*-------------------------------------------------------------------------
- * Test 4.1.x
- * Check for different paths
+ * Check H5T_NATIVE_LONG
  *-------------------------------------------------------------------------
  */
-
-	/* Create "g1/dset1" */
- group_id = H5Gcreate(file5_id, "g1", 0);
- write_dataset(group_id,1,dims1_1,"dset1",H5T_NATIVE_INT,0);
-	status = H5Gclose(group_id);
-
-	/* Create "g2/dset1" */
- group_id = H5Gcreate(file6_id, "g2", 0);
- write_dataset(group_id,1,dims1_1,"dset1",H5T_NATIVE_INT,0);
-	status = H5Gclose(group_id);
+ write_dataset(file1_id,2,dims,"dset4a",H5T_NATIVE_LONG,buf4a);
+ write_dataset(file1_id,2,dims,"dset4b",H5T_NATIVE_LONG,buf4b);
 
 /*-------------------------------------------------------------------------
- * Test 4.2.x
- * paths with several components
+ * Check H5T_NATIVE_FLOAT
  *-------------------------------------------------------------------------
  */
+ write_dataset(file1_id,2,dims,"dset5a",H5T_NATIVE_FLOAT,buf5a);
+ write_dataset(file1_id,2,dims,"dset5b",H5T_NATIVE_FLOAT,buf5b);
 
-	/* Create "/a/b/c" */
- group_id = H5Gcreate(file5_id, "a", 0);
-	group2_id = H5Gcreate(group_id, "b", 0);
- write_dataset(group2_id,1,dims1_1,"c",H5T_NATIVE_INT,0);
-	status = H5Gclose(group_id);
-	status = H5Gclose(group2_id);
-
-	/* Create "/a/b/c" */
- group_id = H5Gcreate(file6_id, "a", 0);
-	group2_id = H5Gcreate(group_id, "b", 0);
- write_dataset(group2_id,1,dims1_1,"c",H5T_NATIVE_INT,0);
-	status = H5Gclose(group_id);
-	status = H5Gclose(group2_id);
-
-	/* Create "/x/a/c" */
- group_id = H5Gcreate(file5_id, "x", 0);
-	group2_id = H5Gcreate(group_id, "a", 0);
- write_dataset(group2_id,1,dims1_1,"c",H5T_NATIVE_INT,0);
-	status = H5Gclose(group_id);
-	status = H5Gclose(group2_id);
-
-
-
- 
 /*-------------------------------------------------------------------------
- * Close files
+ * Check H5T_NATIVE_DOUBLE 
  *-------------------------------------------------------------------------
  */
- status = H5Fclose(file1_id);
- status = H5Fclose(file2_id);
- status = H5Fclose(file3_id);
- status = H5Fclose(file4_id);
-	status = H5Fclose(file5_id);
- status = H5Fclose(file6_id);
-
-
- return 0;
-
 
-}
+ write_dataset(file1_id,2,dims,"dset6a",H5T_NATIVE_DOUBLE,buf6a);
+ write_dataset(file1_id,2,dims,"dset6b",H5T_NATIVE_DOUBLE,buf6b);
 
 /*-------------------------------------------------------------------------
- * Function: write_dataset
- *
- * Purpose: utility function to write a dataset
- *
- * Return: 
- *
- * Programmer: Pedro Vicente, pvn@ncsa.uiuc.edu
- *
- * Date: April 7, 2003
- *
+ * Close 
  *-------------------------------------------------------------------------
  */
-
-int write_dataset( hid_t loc_id, int rank, hsize_t *dims, const char *dset_name,
-                   hid_t type_id, void *data )
-{
- hid_t   dataset_id;
- hid_t   space_id;  
- herr_t  status;
-
- /* Create a data space  */
- space_id = H5Screate_simple(rank,dims,NULL);
-
- /* Create a dataset */
- dataset_id = H5Dcreate(loc_id,dset_name,type_id,space_id,H5P_DEFAULT);
-  
- /* Write the data */
- if ( data )
-  status = H5Dwrite(dataset_id,type_id,H5S_ALL,H5S_ALL,H5P_DEFAULT,data);
-
- /* Close */
- status = H5Dclose(dataset_id);
- status = H5Sclose(space_id);
-
- return 0;
-
+ status = H5Fclose(file1_id);
+ return status;
 }
 
-
-
-
-
-