[svn-r22509] Merged changes from the trunk into the branch:

svn merge -r 22163:22479 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran

Fixed merged issue with fortran/test/tH5E_F03.f90 (missing part of the file) and
changed Makefile.am accordingly. 

4 files changed, 225 insertions, 12 deletions

diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am
index d8cdef9..b261785 100644
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@@ -67,12 +67,8 @@ fortranlib_test_1_8_SOURCES = fortranlib_test_1_8.f90 \
         tH5F.f90 tH5O.f90 tH5A_1_8.f90 tH5G_1_8.f90
 
 if FORTRAN_2003_CONDITIONAL_F
-# NAG compiler doesn't like the current tH5E_F03.f90 file since it has only comments
-# and no executable statements.
-# Removed from the list of modules to build. EIP 2012-06-28
-#	tH5F.f90 tH5E_F03.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90
    fortranlib_test_F03_SOURCES = fortranlib_test_F03.f90 \
-	tH5F.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90
+	tH5F.f90 tH5E_F03.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90
 endif
 
 
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index d13aca4..27198a8 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -118,9 +118,10 @@ fortranlib_test_1_8_LDADD = $(LDADD)
 fortranlib_test_1_8_DEPENDENCIES = libh5test_fortran.la $(LIBH5TEST) \
 	$(LIBH5F) $(LIBHDF5)
 am__fortranlib_test_F03_SOURCES_DIST = fortranlib_test_F03.f90 \
-	tH5F.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90
+	tH5F.f90 tH5E_F03.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90
 @FORTRAN_2003_CONDITIONAL_F_TRUE@am_fortranlib_test_F03_OBJECTS = fortranlib_test_F03.$(OBJEXT) \
 @FORTRAN_2003_CONDITIONAL_F_TRUE@	tH5F.$(OBJEXT) \
+@FORTRAN_2003_CONDITIONAL_F_TRUE@	tH5E_F03.$(OBJEXT) \
 @FORTRAN_2003_CONDITIONAL_F_TRUE@	tH5L_F03.$(OBJEXT) \
 @FORTRAN_2003_CONDITIONAL_F_TRUE@	tH5P_F03.$(OBJEXT) \
 @FORTRAN_2003_CONDITIONAL_F_TRUE@	tH5T_F03.$(OBJEXT)
@@ -491,13 +492,8 @@ fortranlib_test_SOURCES = fortranlib_test.f90 \
 fortranlib_test_1_8_SOURCES = fortranlib_test_1_8.f90 \
         tH5F.f90 tH5O.f90 tH5A_1_8.f90 tH5G_1_8.f90
 
-
-# NAG compiler doesn't like the current tH5E_F03.f90 file since it has only comments
-# and no executable statements.
-# Removed from the list of modules to build. EIP 2012-06-28
-#	tH5F.f90 tH5E_F03.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90
 @FORTRAN_2003_CONDITIONAL_F_TRUE@fortranlib_test_F03_SOURCES = fortranlib_test_F03.f90 \
-@FORTRAN_2003_CONDITIONAL_F_TRUE@	tH5F.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90
+@FORTRAN_2003_CONDITIONAL_F_TRUE@	tH5F.f90 tH5E_F03.f90 tH5L_F03.f90 tH5P_F03.f90 tH5T_F03.f90
 
 fflush1_SOURCES = fflush1.f90
 fflush2_SOURCES = fflush2.f90
diff --git a/fortran/test/tH5E_F03.f90 b/fortran/test/tH5E_F03.f90
index e378aa7..04e3190 100644
--- a/fortran/test/tH5E_F03.f90
+++ b/fortran/test/tH5E_F03.f90
@@ -24,11 +24,187 @@
 ! * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 !
 ! USES
+!  liter_cb_mod
 !
 ! CONTAINS SUBROUTINES
+!  test_error
 !
 !*****
 
 ! *****************************************
 ! ***        H 5 E   T E S T S
 ! *****************************************
+
+MODULE test_my_hdf5_error_handler
+
+  IMPLICIT NONE
+
+CONTAINS
+
+!/****************************************************************
+!**
+!**  my_hdf5_error_handler: Custom error callback routine.
+!**
+!****************************************************************/
+
+    INTEGER FUNCTION my_hdf5_error_handler(estack_id, data_inout) bind(C)
+
+    ! This error function handle works with only version 2 error stack
+
+    USE HDF5
+    USE ISO_C_BINDING
+    IMPLICIT NONE
+
+    ! estack_id is always passed from C as: H5E_DEFAULT
+    INTEGER(HID_T) :: estack_id 
+    ! data that was registered with H5Eset_auto_f
+!    INTEGER, DIMENSION(1:2) :: data_inout
+    INTEGER :: data_inout
+
+    PRINT*, " "
+    PRINT*, " Subtest: H5Eset_auto_f custom error message with callback, WITH DATA"
+    PRINT*, "         -This message should be written to standard out-  "
+    PRINT*, "          Data Values Passed In =", data_inout
+    PRINT*, " "
+
+    data_inout = 10*data_inout
+
+    my_hdf5_error_handler = 1 ! this is not used by the C routine
+
+  END FUNCTION my_hdf5_error_handler
+
+  INTEGER FUNCTION my_hdf5_error_handler_nodata(estack_id, data_inout) bind(C)
+
+    ! This error function handle works with only version 2 error stack
+
+    USE HDF5
+    USE ISO_C_BINDING
+    IMPLICIT NONE
+
+    ! estack_id is always passed from C as: H5E_DEFAULT
+    INTEGER(HID_T) :: estack_id 
+    ! data that was registered with H5Eset_auto_f
+    TYPE(C_PTR) :: data_inout
+    
+    PRINT*, " "
+    PRINT*, " Subtest: H5Eset_auto_f custom error message with callback, NO DATA"
+    PRINT*, "         -This message should be written to standard out-  "
+    PRINT*, " "
+
+    my_hdf5_error_handler_nodata = 1 ! this is not used by the C routine
+
+  END FUNCTION my_hdf5_error_handler_nodata
+  
+END MODULE test_my_hdf5_error_handler
+
+SUBROUTINE test_error(total_error)
+
+  USE HDF5 
+  USE ISO_C_BINDING
+  USE test_my_hdf5_error_handler
+
+  IMPLICIT NONE
+
+  INTEGER(hid_t), PARAMETER :: FAKE_ID = -1
+  INTEGER :: total_error
+  INTEGER(hid_t) :: file
+  INTEGER(hid_t) :: dataset, space
+  INTEGER(hid_t)  :: estack_id
+  INTEGER(hsize_t), DIMENSION(1:2) :: dims
+  CHARACTER(LEN=10) :: FUNC_test_error = "test_error"
+  TYPE(C_FUNPTR) :: old_func
+  TYPE(C_PTR) :: old_data, null_data
+  INTEGER :: error
+  TYPE(C_FUNPTR) :: op
+  INTEGER, DIMENSION(1:100,1:200), TARGET :: ipoints2
+  !!    INTEGER, DIMENSION(1:2), TARGET :: my_hdf5_error_handler_data
+  INTEGER, DIMENSION(:), POINTER :: ptr_data
+  INTEGER, TARGET :: my_hdf5_error_handler_data
+  TYPE(C_PTR) :: f_ptr
+  TYPE(C_FUNPTR) :: func
+
+  TYPE(C_PTR), TARGET :: f_ptr1
+  TYPE(C_FUNPTR), TARGET :: func1
+
+  INTEGER, DIMENSION(1:1) :: array_shape
+  LOGICAL :: is_associated
+
+  !    my_hdf5_error_handler_data(1:2) =(/1,2/)
+  my_hdf5_error_handler_data = 99
+  CALL h5fcreate_f("terror.h5", H5F_ACC_TRUNC_F, file, error)
+  CALL check("h5fcreate_f", error, total_error)
+
+  ! Create the data space
+  dims(1) = 10
+  dims(2) = 20
+  CALL H5Screate_simple_f(2, dims, space, error)
+  CALL check("h5screate_simple_f", error, total_error)
+
+  ! ** SET THE CUSTOMIZED PRINTING OF ERROR STACK **
+
+  ! set the customized error handling routine
+  func = c_funloc(my_hdf5_error_handler)
+
+  ! set the data sent to the customized routine
+  f_ptr = c_loc(my_hdf5_error_handler_data)
+
+  ! turn on automatic printing, and use a custom error routine with input data
+  CALL H5Eset_auto_f(1, error, H5E_DEFAULT_F, func, f_ptr)
+
+  ! Create the erring dataset
+  CALL h5dcreate_f(FAKE_ID,"a_dataset",H5T_NATIVE_INTEGER, space, dataset, error)
+  CALL VERIFY("h5dcreate_f", error, -1, total_error)
+
+!!$    CALL VERIFY("H5Eset_auto_f",my_hdf5_error_handler_data(1),10, total_error)
+!!$    CALL VERIFY("H5Eset_auto_f",my_hdf5_error_handler_data(2),20, total_error)
+
+!!$  ! Test enabling and disabling default printing
+!!$
+!!$  CALL H5Eget_auto_f(H5E_DEFAULT_F, func1, f_ptr1, error)
+!!$  CALL VERIFY("H5Eget_auto_f", error, 0, total_error)
+
+  !    PRINT*,c_associated(f_ptr1)
+
+  ALLOCATE(ptr_data(1:2))
+  ptr_data = 0
+  array_shape(1) = 2
+  CALL C_F_POINTER(f_ptr1, ptr_data, array_shape)
+
+  !    ptr_data => f_ptr1(1)
+
+  !    PRINT*,ptr_data(1)
+
+!!$    if(old_data != NULL)
+!!$	TEST_ERROR;
+!!$#ifdef H5_USE_16_API
+!!$    if (old_func != (H5E_auto_t)H5Eprint)
+!!$	TEST_ERROR;
+!!$#else /* H5_USE_16_API */
+!!$    if (old_func != (H5E_auto2_t)H5Eprint2)
+!!$	TEST_ERROR;
+!!$#endif /* H5_USE_16_API */
+
+
+  ! set the customized error handling routine
+  func = c_funloc(my_hdf5_error_handler_nodata)
+  ! set the data sent to the customized routine as null
+  f_ptr = C_NULL_PTR
+  ! turn on automatic printing, and use a custom error routine with no input data
+  CALL H5Eset_auto_f(1, error, H5E_DEFAULT_F, func, f_ptr)
+
+  CALL h5dcreate_f(FAKE_ID,"a_dataset",H5T_NATIVE_INTEGER, space, dataset, error)
+  CALL VERIFY("h5dcreate_f", error, -1, total_error)
+
+
+  ! turn on automatic printing with h5eprint_f which prints an error stack in the default manner.
+
+  !    func = c_funloc(h5eprint_f)
+  !    CALL H5Eset_auto_f(0, error, H5E_DEFAULT_F, func, C_NULL_PTR)
+
+  CALL H5Eset_auto_f(0, error)
+  CALL h5dcreate_f(FAKE_ID,"a_dataset",H5T_NATIVE_INTEGER, space, dataset, error)
+
+  CALL H5Eset_auto_f(1, error)
+  CALL h5dcreate_f(FAKE_ID,"a_dataset",H5T_NATIVE_INTEGER, space, dataset, error)
+
+END SUBROUTINE test_error
diff --git a/fortran/test/tH5T.f90 b/fortran/test/tH5T.f90
index 6af1ba6..9605c45 100644
--- a/fortran/test/tH5T.f90
+++ b/fortran/test/tH5T.f90
@@ -108,6 +108,51 @@
      INTEGER(HID_T) :: decoded_sid1
      INTEGER(HID_T) :: decoded_tid1
 
+     INTEGER(HID_T) :: fixed_str1, fixed_str2
+     LOGICAL :: are_equal
+     INTEGER(SIZE_T), PARAMETER :: str_size = 10 
+     INTEGER(SIZE_T) :: query_size
+
+     ! Test h5tcreate_f with H5T_STRING_F option:
+     !   Create fixed-length string in two ways and make sure they are the same
+
+     CALL h5tcopy_f(H5T_FORTRAN_S1, fixed_str1, error)
+     CALL check("h5tcopy_f", error, total_error)
+     CALL h5tset_size_f(fixed_str1, str_size, error)
+     CALL check("h5tset_size_f", error, total_error)
+     CALL h5tset_strpad_f(fixed_str1, H5T_STR_NULLTERM_F, error)
+     CALL check("h5tset_strpad_f", error, total_error)
+     
+     CALL h5tcreate_f(H5T_STRING_F, str_size, fixed_str2, error)
+     CALL check("h5tcreate_f", error, total_error)
+     CALL h5tset_strpad_f(fixed_str2, H5T_STR_NULLTERM_F, error)
+     CALL check("h5tset_strpad_f", error, total_error)
+     
+     CALL h5tequal_f(fixed_str1, fixed_str2, are_equal, error)
+     IF(.NOT.are_equal)THEN
+        CALL check("h5tcreate_f", -1, total_error)
+     ENDIF
+     
+     CALL h5tget_size_f(fixed_str1, query_size, error)
+     CALL check("h5tget_size_f", error, total_error)
+     
+     IF(query_size.NE.str_size)THEN
+        CALL check("h5tget_size_f", -1, total_error)
+     ENDIF
+     
+     CALL h5tget_size_f(fixed_str2, query_size, error)
+     CALL check("h5tget_size_f", error, total_error)
+
+     IF(query_size.NE.str_size)THEN
+        CALL check("h5tget_size_f", -1, total_error)
+     ENDIF
+     
+     CALL h5tclose_f(fixed_str1,error)
+     CALL check("h5tclose_f", error, total_error)
+     
+     CALL h5tclose_f(fixed_str2,error)
+     CALL check("h5tclose_f", error, total_error)
+
      data_dims(1) = dimsize
      !
      ! Initialize data buffer.