Brings fortran changes from develop

4 files changed, 15 insertions, 15 deletions

diff --git a/fortran/test/fortranlib_test.F90 b/fortran/test/fortranlib_test.F90
index 214f3c2..1fb3e68 100644
--- a/fortran/test/fortranlib_test.F90
+++ b/fortran/test/fortranlib_test.F90
@@ -183,7 +183,7 @@ PROGRAM fortranlibtest
   CALL write_test_status(ret_total_error, ' Multi file driver test', total_error)
 
   ret_total_error = 0
-  CALL test_chunk_cache (cleanup, ret_total_error)
+  CALL test_chunk_cache(cleanup, ret_total_error)
   CALL write_test_status(ret_total_error, ' Dataset chunk cache configuration', total_error)
 
   ret_total_error = 0
diff --git a/fortran/test/fortranlib_test_F03.F90 b/fortran/test/fortranlib_test_F03.F90
index b8b4f4f..377645d 100644
--- a/fortran/test/fortranlib_test_F03.F90
+++ b/fortran/test/fortranlib_test_F03.F90
@@ -153,7 +153,7 @@ PROGRAM fortranlibtest_F03
 
 !     write(*,*)
 !     write(*,*) '========================================='
-!     write(*,*) 'Testing GROUP interface             '
+!     write(*,*) 'Testing OBJECT interface                 '
 !     write(*,*) '========================================='
 
   ret_total_error = 0
@@ -161,11 +161,11 @@ PROGRAM fortranlibtest_F03
   CALL write_test_status(ret_total_error, ' Testing object functions ', total_error)
 
   ret_total_error = 0
-  CALL obj_visit(ret_total_error)
+  CALL test_obj_visit(ret_total_error)
   CALL write_test_status(ret_total_error, ' Testing object visiting functions ', total_error)
 
   ret_total_error = 0
-  CALL obj_info(ret_total_error)
+  CALL test_obj_info(ret_total_error)
   CALL write_test_status(ret_total_error, ' Testing object info functions ', total_error)
 
   ret_total_error = 0
diff --git a/fortran/test/tH5G_1_8.F90 b/fortran/test/tH5G_1_8.F90
index 618e9d1..c2b1104 100644
--- a/fortran/test/tH5G_1_8.F90
+++ b/fortran/test/tH5G_1_8.F90
@@ -669,7 +669,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
      INTEGER(SIZE_T) :: val_size ! If the link is a symbolic link, val_size will be the length of the link value
 
 
-!     WRITE(*,*) "link creation (w/new group format)"
+     WRITE(*,*) "link creation (w/new group format)"
 
      !  Create a file
      CALL h5fcreate_f(FileName, H5F_ACC_TRUNC_F, file, error, H5P_DEFAULT_F, fapl)
@@ -1357,11 +1357,11 @@ SUBROUTINE delete_by_idx(cleanup, fapl, total_error)
 
            ! Close the group creation property list
            CALL H5Pclose_f(gcpl_id, error)
-           CALL check("delete_by_idx.H5Gclose_f", error, total_error)
+           CALL check("delete_by_idx.H5Pclose_f", error, total_error)
 
            ! Close the file
            CALL H5Fclose_f(file_id, error)
-           CALL check("delete_by_idx.H5Gclose_f", error, total_error)
+           CALL check("delete_by_idx.H5Fclose_f", error, total_error)
 
            IF(cleanup) CALL h5_cleanup_f("file0", H5P_DEFAULT_F, error)
            CALL check("h5_cleanup_f", error, total_error)
diff --git a/fortran/test/tH5O_F03.F90 b/fortran/test/tH5O_F03.F90
index a39cb2b..7532047 100644
--- a/fortran/test/tH5O_F03.F90
+++ b/fortran/test/tH5O_F03.F90
@@ -63,7 +63,7 @@ MODULE visit_cb
 
 CONTAINS
 
-! Compares the field values of a C h5O_info_t and a Fortran H5O_info_t.
+! Compares the field values of a C H5O_info_t and a Fortran H5O_info_t.
 
   INTEGER FUNCTION compare_h5o_info_t( oinfo_f, oinfo_c, field, full_f_field ) RESULT(status)
 
@@ -310,7 +310,7 @@ CONTAINS
 
     ENDIF
 
-    ! Check H5Oget_info_by_name_f; if partial field values where filled correctly
+    ! Check H5Oget_info_by_name_f; if partial field values were filled correctly
     CALL H5Oget_info_by_name_f(group_id, name2, oinfo_f, ierr);
     visit_obj_cb =  compare_h5o_info_t( oinfo_f, oinfo_c, op_data%field, .TRUE. )
     IF(visit_obj_cb.EQ.-1) RETURN
@@ -486,11 +486,11 @@ END SUBROUTINE test_h5o_refcount
 
 !****************************************************************
 !**
-!**  test_h5o_refcount(): Test H5O visit functions.
+!**  test_obj_visit(): Test H5O visit functions.
 !**
 !****************************************************************
 
-SUBROUTINE obj_visit(total_error)
+SUBROUTINE test_obj_visit(total_error)
 
   USE HDF5
   USE TH5_MISC
@@ -648,15 +648,15 @@ SUBROUTINE obj_visit(total_error)
   CALL h5fclose_f(fid, error)
   CALL check("h5fclose_f",error, total_error)
 
-END SUBROUTINE obj_visit
+END SUBROUTINE test_obj_visit
 
 !****************************************************************
 !**
-!**  test_h5o_refcount(): Test H5O info functions.
+!**  test_obj_info(): Test H5O info functions.
 !**
 !****************************************************************
 
-SUBROUTINE obj_info(total_error)
+SUBROUTINE test_obj_info(total_error)
 
   USE HDF5
   USE TH5_MISC
@@ -796,7 +796,7 @@ SUBROUTINE obj_info(total_error)
   CALL h5fclose_f(fid, error)
   CALL check("h5fclose_f", error, total_error)
 
-END SUBROUTINE obj_info
+END SUBROUTINE test_obj_info
 
 !-------------------------------------------------------------------------
 ! Function:    build_visit_file