[svn-r14923] Maintenance: This check-in merges changes from the fortran_1_8 branch back into the trunk (up to revision 14921)

Platforms tested: kagiso with g95 and Intel compilers; more testing will be done after checking in a fresh
                  copy from the trunk. New code itself was tested with all Fortran compilers available at THG 

1 files changed, 124 insertions, 94 deletions

diff --git a/fortran/test/tf.f90 b/fortran/test/tf.f90
index 673a8e2..eb033b6 100644
--- a/fortran/test/tf.f90
+++ b/fortran/test/tf.f90
@@ -23,30 +23,60 @@
 !DEC$attributes dllexport :: check
 !DEC$endif
 
-         SUBROUTINE check(string,error,total_error)
-            CHARACTER(LEN=*) :: string
-            INTEGER :: error, total_error
-            if (error .lt. 0) then
-                total_error=total_error+1
-                write(*,*) string, " failed"
-            endif
-            RETURN
-         END SUBROUTINE check   
-
+SUBROUTINE check(string,error,total_error)
+  CHARACTER(LEN=*) :: string
+  INTEGER :: error, total_error
+  IF (error .LT. 0) THEN
+     total_error=total_error+1
+     WRITE(*,*) string, " FAILED"
+  ENDIF
+  RETURN
+END SUBROUTINE check
 
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: verify
 !DEC$endif
-         SUBROUTINE verify(string,value,correct_value,total_error)
-            CHARACTER(LEN=*) :: string
-            INTEGER :: value, correct_value, total_error
-            if (value .ne. correct_value) then
-                total_error=total_error+1
-                write(*,*) string
-            endif
-            RETURN
-         END SUBROUTINE verify
+SUBROUTINE VERIFY(string,value,correct_value,total_error)
+  CHARACTER(LEN=*) :: string
+  INTEGER :: value, correct_value, total_error
+  IF (value .NE. correct_value) THEN
+     total_error=total_error+1
+     WRITE(*,*) "ERROR: INCORRECT VALIDATION ", string
+  ENDIF
+  RETURN
+END SUBROUTINE verify
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: verifyLogical
+!DEC$endif
+SUBROUTINE verifyLogical(string,value,correct_value,total_error)
+  CHARACTER(LEN=*) :: string
+  LOGICAL :: value, correct_value
+  INTEGER :: total_error
+  IF (value .NEQV. correct_value) THEN
+     total_error = total_error + 1
+     WRITE(*,*) "ERROR: INCORRECT VALIDATION ", string
+  ENDIF
+  RETURN
+END SUBROUTINE verifyLogical
+
+!This definition is needed for Windows DLLs
+!DEC$if defined(BUILD_HDF5_DLL)
+!DEC$attributes dllexport :: verifyLogical
+!DEC$endif
+SUBROUTINE verifyString(string, value,correct_value,total_error)
+  CHARACTER(LEN=*) :: string
+  CHARACTER(LEN=*) :: value, correct_value
+  INTEGER :: total_error
+  IF (TRIM(value) .NE. TRIM(correct_value)) THEN
+     total_error = total_error + 1
+     WRITE(*,*) "ERROR: INCORRECT VALIDATION ", string
+  ENDIF
+  RETURN
+END SUBROUTINE verifyString
+
 
 !----------------------------------------------------------------------
 ! Name:		h5_fixname_f 
@@ -68,46 +98,46 @@
 !
 !
 !----------------------------------------------------------------------
-          SUBROUTINE h5_fixname_f(base_name, full_name, fapl, hdferr)
+SUBROUTINE h5_fixname_f(base_name, full_name, fapl, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5_fixname_f
 !DEC$endif
-            USE H5GLOBAL           
-            IMPLICIT NONE
-            CHARACTER(LEN=*), INTENT(IN) :: base_name   ! base name 
-            CHARACTER(LEN=*), INTENT(IN) :: full_name   ! full name 
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
-            INTEGER(HID_T), INTENT(IN) :: fapl ! file access property list
-
-            INTEGER(SIZE_T) :: base_namelen ! Length of the base name character string
-            INTEGER(SIZE_T) :: full_namelen ! Length of the full name character string
+  USE H5GLOBAL           
+  IMPLICIT NONE
+  CHARACTER(LEN=*), INTENT(IN) :: base_name   ! base name 
+  CHARACTER(LEN=*), INTENT(IN) :: full_name   ! full name 
+  INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+  INTEGER(HID_T), INTENT(IN) :: fapl ! file access property list
+  
+  INTEGER(SIZE_T) :: base_namelen ! Length of the base name character string
+  INTEGER(SIZE_T) :: full_namelen ! Length of the full name character string
 !            INTEGER(HID_T) :: fapl_default
 
-            INTERFACE
-              INTEGER FUNCTION h5_fixname_c(base_name, base_namelen, fapl, &
-                               full_name, full_namelen)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_FIXNAME_C':: h5_fixname_c
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: base_name 
-              !DEC$ATTRIBUTES reference :: full_name 
-              CHARACTER(LEN=*), INTENT(IN) :: base_name
-              INTEGER(SIZE_T) :: base_namelen
-              INTEGER(HID_T), INTENT(IN) :: fapl
-              CHARACTER(LEN=*), INTENT(IN) :: full_name
-              INTEGER(SIZE_T) :: full_namelen
-              END FUNCTION h5_fixname_c
-            END INTERFACE
-
-            base_namelen = LEN(base_name)
-            full_namelen = LEN(full_name)
-            hdferr = h5_fixname_c(base_name, base_namelen, fapl, &
-                     full_name, full_namelen) 
-
-          END SUBROUTINE h5_fixname_f
+  INTERFACE
+     INTEGER FUNCTION h5_fixname_c(base_name, base_namelen, fapl, &
+          full_name, full_namelen)
+       USE H5GLOBAL
+       !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+       !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_FIXNAME_C':: h5_fixname_c
+       !DEC$ ENDIF
+       !DEC$ATTRIBUTES reference :: base_name 
+       !DEC$ATTRIBUTES reference :: full_name 
+       CHARACTER(LEN=*), INTENT(IN) :: base_name
+       INTEGER(SIZE_T) :: base_namelen
+       INTEGER(HID_T), INTENT(IN) :: fapl
+       CHARACTER(LEN=*), INTENT(IN) :: full_name
+       INTEGER(SIZE_T) :: full_namelen
+     END FUNCTION h5_fixname_c
+  END INTERFACE
+  
+  base_namelen = LEN(base_name)
+  full_namelen = LEN(full_name)
+  hdferr = h5_fixname_c(base_name, base_namelen, fapl, &
+       full_name, full_namelen) 
+  
+END SUBROUTINE h5_fixname_f
           
 !----------------------------------------------------------------------
 ! Name:		h5_cleanup_f 
@@ -128,37 +158,37 @@
 !
 !
 !----------------------------------------------------------------------
-          SUBROUTINE h5_cleanup_f(base_name, fapl, hdferr)
+SUBROUTINE h5_cleanup_f(base_name, fapl, hdferr)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5_cleanup_f
 !DEC$endif
-            USE H5GLOBAL           
-            IMPLICIT NONE
-            CHARACTER(LEN=*), INTENT(IN) :: base_name   ! base name 
-            INTEGER, INTENT(OUT) :: hdferr         ! Error code 
-            INTEGER(HID_T), INTENT(IN) :: fapl ! file access property list
-
-            INTEGER(SIZE_T) :: base_namelen ! Length of the base name character string
-
-            INTERFACE
-              INTEGER FUNCTION h5_cleanup_c(base_name, base_namelen, fapl)
-              USE H5GLOBAL
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_CLEANUP_C':: h5_cleanup_c
-              !DEC$ ENDIF
-              !DEC$ATTRIBUTES reference :: base_name 
-              CHARACTER(LEN=*), INTENT(IN) :: base_name
-              INTEGER(SIZE_T) :: base_namelen
-              INTEGER(HID_T), INTENT(IN) :: fapl
-              END FUNCTION h5_cleanup_c
-            END INTERFACE
-
-            base_namelen = LEN(base_name)
-            hdferr = h5_cleanup_c(base_name, base_namelen, fapl)
-
-          END SUBROUTINE h5_cleanup_f
+  USE H5GLOBAL           
+  IMPLICIT NONE
+  CHARACTER(LEN=*), INTENT(IN) :: base_name   ! base name 
+  INTEGER, INTENT(OUT) :: hdferr         ! Error code 
+  INTEGER(HID_T), INTENT(IN) :: fapl ! file access property list
+  
+  INTEGER(SIZE_T) :: base_namelen ! Length of the base name character string
+  
+  INTERFACE
+     INTEGER FUNCTION h5_cleanup_c(base_name, base_namelen, fapl)
+       USE H5GLOBAL
+       !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+       !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_CLEANUP_C':: h5_cleanup_c
+       !DEC$ ENDIF
+       !DEC$ATTRIBUTES reference :: base_name 
+       CHARACTER(LEN=*), INTENT(IN) :: base_name
+       INTEGER(SIZE_T) :: base_namelen
+       INTEGER(HID_T), INTENT(IN) :: fapl
+     END FUNCTION h5_cleanup_c
+  END INTERFACE
+  
+  base_namelen = LEN(base_name)
+  hdferr = h5_cleanup_c(base_name, base_namelen, fapl)
+  
+END SUBROUTINE h5_cleanup_f
 
 !----------------------------------------------------------------------
 ! Name:		h5_exit_f 
@@ -180,25 +210,25 @@
 !
 !
 !----------------------------------------------------------------------
-          SUBROUTINE h5_exit_f(status)
+SUBROUTINE h5_exit_f(status)
 !
 !This definition is needed for Windows DLLs
 !DEC$if defined(BUILD_HDF5_DLL)
 !DEC$attributes dllexport :: h5_exit_f
 !DEC$endif
-            IMPLICIT NONE
-            INTEGER, INTENT(IN) :: status         ! Return code
-
-            INTERFACE
-              SUBROUTINE h5_exit_c(status)
-              !DEC$ IF DEFINED(HDF5F90_WINDOWS)
-              !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_EXIT_C':: h5_exit_c
-              !DEC$ ENDIF
-              INTEGER, INTENT(IN) :: status
-              END SUBROUTINE h5_exit_c
-            END INTERFACE
-
-            CALL h5_exit_c(status)
-
-          END SUBROUTINE h5_exit_f
+  IMPLICIT NONE
+  INTEGER, INTENT(IN) :: status         ! Return code
+  
+  INTERFACE
+     SUBROUTINE h5_exit_c(status)
+       !DEC$ IF DEFINED(HDF5F90_WINDOWS)
+       !DEC$ ATTRIBUTES C,reference,decorate,alias:'H5_EXIT_C':: h5_exit_c
+       !DEC$ ENDIF
+       INTEGER, INTENT(IN) :: status
+     END SUBROUTINE h5_exit_c
+  END INTERFACE
+  
+  CALL h5_exit_c(status)
+  
+END SUBROUTINE h5_exit_f