Normalize Fortran code with develop (#1600)

16 files changed, 92 insertions, 65 deletions

diff --git a/fortran/test/H5_test_buildiface.F90 b/fortran/test/H5_test_buildiface.F90
index 94beab1..302fa38 100644
--- a/fortran/test/H5_test_buildiface.F90
+++ b/fortran/test/H5_test_buildiface.F90
@@ -14,7 +14,7 @@
 !
 ! NOTES
 !  This program uses the Fortran 2008 intrinsic function STORAGE_SIZE or SIZEOF
-!  depending on availablity.It generates code that makes use of
+!  depending on availability.It generates code that makes use of
 !  STORAGE_SIZE/SIZEOF in H5fortran_detect.f90. STORAGE_SIZE is standard
 !  compliant and should always be chosen over SIZEOF.
 !
diff --git a/fortran/test/fflush1.F90 b/fortran/test/fflush1.F90
index c192d93..5684f81 100644
--- a/fortran/test/fflush1.F90
+++ b/fortran/test/fflush1.F90
@@ -88,7 +88,7 @@
      data_dims(2) = NY
 
      !
-     !Initialize FORTRAN predifined datatypes
+     !Initialize FORTRAN predefined datatypes
      !
      CALL h5open_f(error)
           CALL check("h5open_f",error,total_error)
diff --git a/fortran/test/fflush2.F90 b/fortran/test/fflush2.F90
index dc3bc85..a6e16c1 100644
--- a/fortran/test/fflush2.F90
+++ b/fortran/test/fflush2.F90
@@ -81,7 +81,7 @@ PROGRAM FFLUSH2EXAMPLE
   data_dims(2) = NY
 
   !
-  !Initialize FORTRAN predifined datatypes
+  !Initialize FORTRAN predefined datatypes
   !
   CALL h5open_f(error)
   CALL check("h5open_f",error,total_error)
@@ -163,7 +163,7 @@ PROGRAM FFLUSH2EXAMPLE
   CALL check("h5fclose_f",error,total_error)
 
   !
-  !Close FORTRAN predifined datatypes
+  !Close FORTRAN predefined datatypes
   !
   CALL h5_cleanup_f(filename, H5P_DEFAULT_F, error)
   CALL h5close_f(error)
diff --git a/fortran/test/tH5A.F90 b/fortran/test/tH5A.F90
index d5ce9a2..2e76dad 100644
--- a/fortran/test/tH5A.F90
+++ b/fortran/test/tH5A.F90
@@ -81,7 +81,7 @@ CONTAINS
      INTEGER(HID_T) :: atype5_id      !Integer Attribute Datatype identifier
      INTEGER(HSIZE_T), DIMENSION(1) :: adims = (/2/) ! Attribute dimension
      INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
-     INTEGER     ::   arank = 1                      ! Attribure rank
+     INTEGER     ::   arank = 1                      ! Attribute rank
      INTEGER(SIZE_T) :: attrlen    ! Length of the attribute string
 
      INTEGER(HID_T) :: attr_space     !Returned String Attribute Space identifier
diff --git a/fortran/test/tH5A_1_8.F90 b/fortran/test/tH5A_1_8.F90
index 4e02c58..cd8a981 100644
--- a/fortran/test/tH5A_1_8.F90
+++ b/fortran/test/tH5A_1_8.F90
@@ -64,7 +64,7 @@ SUBROUTINE attribute_test_1_8(cleanup, total_error)
   INTEGER :: ret_total_error
 
 ! ********************
-! test_attr equivelent
+! test_attr equivalent
 ! ********************
 
 !  WRITE(*,*) "TESTING ATTRIBUTES"
@@ -776,8 +776,7 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
 
   INTEGER :: Input1
   INTEGER(HSIZE_T) :: hzero = 0_HSIZE_T
-  INTEGER :: minusone = -1
-  INTEGER(HSIZE_T) :: htmp
+  INTEGER, PARAMETER :: minusone = -1
 
   data_dims = 0
 
@@ -840,10 +839,6 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
            my_dataset = dset3
         END SELECT
 
-        !  Check for query on non-existant attribute
-
-        n = 0
-
         ! -- CHECK PASSING AN INTEGER CONSTANT IN DIFFERENT FORMS --
 
         ! 1) call by passing an integer with the _hsize_t declaration
@@ -896,8 +891,8 @@ SUBROUTINE test_attr_info_by_idx(new_format, fcpl, fapl, total_error)
            !  Verify information for new attribute
 
 !EP        CALL attr_info_by_idx_check(my_dataset, attrname, INT(j,HSIZE_T), use_index(i), total_error )
-           htmp = j
-           CALL attr_info_by_idx_check(my_dataset, attrname, htmp, use_index(i), total_error )
+           n = INT(j, HSIZE_T)
+           CALL attr_info_by_idx_check(my_dataset, attrname, n, use_index(i), total_error )
 
            !CHECK(ret, FAIL, "attr_info_by_idx_check");
         ENDDO
@@ -1111,7 +1106,7 @@ SUBROUTINE test_attr_shared_rename( fcpl, fapl, total_error)
 
   INTEGER :: test_shared
   INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
-  INTEGER     ::   arank = 1                      ! Attribure rank
+  INTEGER     ::   arank = 1                      ! Attribute rank
 
   !  Initialize "big" attribute data
 
@@ -1427,7 +1422,7 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
   INTEGER :: u     !  Local index variable
   INTEGER :: Input1
   INTEGER(HSIZE_T) :: hzero = 0_HSIZE_T
-  INTEGER :: minusone = -1
+  INTEGER, PARAMETER :: minusone = -1
 
   data_dims = 0
 
@@ -1497,7 +1492,7 @@ SUBROUTINE test_attr_delete_by_idx(new_format, fcpl, fapl, total_error)
               END SELECT
 
 
-              !  Check for deleting non-existant attribute
+              !  Check for deleting non-existent attribute
 !EP              CALL H5Adelete_by_idx_f(my_dataset, '.', idx_type, order, 0_HSIZE_T,error, lapl_id=H5P_DEFAULT_F)
               CALL H5Adelete_by_idx_f(my_dataset, '.', idx_type, order, hzero,error, lapl_id=H5P_DEFAULT_F)
               CALL verify("H5Adelete_by_idx_f",error,minusone,total_error)
@@ -1773,7 +1768,7 @@ SUBROUTINE test_attr_shared_delete(fcpl, fapl, total_error)
 
   INTEGER :: test_shared
   INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
-  INTEGER     ::   arank = 1                      ! Attribure rank
+  INTEGER     ::   arank = 1                      ! Attribute rank
 
   !  Output message about test being performed
 
@@ -2268,7 +2263,7 @@ SUBROUTINE test_attr_corder_create_basic( fcpl, fapl, total_error )
   INTEGER :: error
 
   INTEGER :: crt_order_flags
-  INTEGER :: minusone = -1
+  INTEGER, PARAMETER :: minusone = -1
 
   !  Output message about test being performed
 !  WRITE(*,*) "     - Testing Basic Code for Attributes with Creation Order Info"
diff --git a/fortran/test/tH5D.F90 b/fortran/test/tH5D.F90
index 006d62a..eb9e831 100644
--- a/fortran/test/tH5D.F90
+++ b/fortran/test/tH5D.F90
@@ -187,7 +187,7 @@ CONTAINS
     DO i = 1, 4
        DO j = 1, 6
           IF (data_out(i,j) .NE. dset_data(i, j)) THEN
-             WRITE(*, *) "dataset test error occured"
+             WRITE(*, *) "dataset test error occurred"
              WRITE(*,*) "data read is not the same as the data written"
           END IF
        END DO
@@ -196,7 +196,7 @@ CONTAINS
     ! Check if no change to null_dset_data
     !
     IF (null_dset_data .NE. 1) THEN
-       WRITE(*, *) "null dataset test error occured"
+       WRITE(*, *) "null dataset test error occurred"
     END IF
     !
     ! End access to the dataset and release resources used by it.
@@ -258,7 +258,7 @@ CONTAINS
     INTEGER(HID_T) :: dset_id       ! Dataset identifier
     INTEGER(HID_T) :: dataspace     ! Dataspace identifier
     INTEGER(HID_T) :: memspace      ! memory Dataspace identifier
-    INTEGER(HID_T) :: crp_list        ! dataset creatation property identifier
+    INTEGER(HID_T) :: crp_list        ! dataset creation property identifier
 
     !
     !dataset dimensions at creation time
@@ -313,7 +313,7 @@ CONTAINS
     END DO
 
     !
-    !Initialize FORTRAN predifined datatypes
+    !Initialize FORTRAN predefined datatypes
     !
 !          CALL h5init_types_f(error)
 !               CALL check("h5init_types_f",error,total_error)
@@ -347,7 +347,7 @@ CONTAINS
     CALL check("h5pset_chunk_f",error,total_error)
 
     !
-    !Create a dataset with 3X3 dimensions using cparms creation propertie .
+    !Create a dataset with 3X3 dimensions using cparms creation properties .
     !
     CALL h5dcreate_f(file_id, dsetname, H5T_NATIVE_INTEGER, dataspace, dset_id, error, crp_list )
     CALL check("h5dcreate_f",error,total_error)
@@ -426,7 +426,7 @@ CONTAINS
     CALL h5sget_simple_extent_ndims_f(dataspace, rankr, error)
     CALL check("h5sget_simple_extent_ndims_f",error,total_error)
     IF (rankr .NE. RANK) THEN
-       WRITE(*,*) "dataset rank error occured"
+       WRITE(*,*) "dataset rank error occurred"
        STOP
     END IF
 
@@ -436,7 +436,7 @@ CONTAINS
     CALL h5sget_simple_extent_dims_f(dataspace, dimsr, maxdimsr, error)
     CALL check("h5sget_simple_extent_dims_f",error,total_error)
     IF ((dimsr(1) .NE. dims1(1)) .OR. (dimsr(2) .NE. dims1(2))) THEN
-       WRITE(*,*) "dataset dimensions error occured"
+       WRITE(*,*) "dataset dimensions error occurred"
        STOP
     END IF
 
@@ -466,7 +466,7 @@ CONTAINS
     DO ih = 1, dims1(1)
        DO jh = 1, dims1(2)
           IF (data_out(ih,jh) .NE. data_in(ih, jh)) THEN
-             WRITE(*, *) "extend dataset test error occured"
+             WRITE(*, *) "extend dataset test error occurred"
              WRITE(*, *) "read value is not the same as the written values"
           END IF
        END DO
diff --git a/fortran/test/tH5F.F90 b/fortran/test/tH5F.F90
index 06dc6de..8d4845d 100644
--- a/fortran/test/tH5F.F90
+++ b/fortran/test/tH5F.F90
@@ -554,7 +554,7 @@ CONTAINS
           do i = 1, NX
               do j = 1, NY
                   IF (data_out(i,j) .NE. dset_data(i, j)) THEN
-                      write(*, *) "reopen test error occured"
+                      write(*, *) "reopen test error occurred"
                   END IF
               end do
           end do
@@ -584,17 +584,23 @@ CONTAINS
 !    The following subroutine checks that h5fget_name_f produces
 !    correct output for a given obj_id and filename.
 !
-        SUBROUTINE check_get_name(obj_id, fix_filename, total_error)
+        SUBROUTINE check_get_name(obj_id, fix_filename, len_filename, total_error)
           USE HDF5  ! This module contains all necessary modules
           USE TH5_MISC
           IMPLICIT NONE
           INTEGER(HID_T) :: obj_id                          ! Object identifier
           CHARACTER(LEN=80), INTENT(IN) :: fix_filename     ! Expected filename
+          INTEGER, INTENT(IN) :: len_filename               ! The length of the filename
           INTEGER, INTENT(INOUT) :: total_error             ! Error count
 
           CHARACTER(LEN=80):: file_name  ! Filename buffer
           INTEGER:: error                ! HDF5 error code
           INTEGER(SIZE_T):: name_size    ! Filename length
+
+          INTEGER, PARAMETER :: sm_len = 2
+          CHARACTER(LEN=len_filename) :: filename_exact
+          CHARACTER(LEN=len_filename-sm_len) :: filename_sm
+
           !
           !Get file name from the dataset identifier
           !
@@ -637,6 +643,30 @@ CONTAINS
             total_error = total_error + 1
          END IF
 
+         ! Use a buffer which is the exact size needed to hold the filename
+         CALL h5fget_name_f(obj_id, filename_exact, name_size, error)
+         CALL check("h5fget_name_f",error,total_error)
+         IF(name_size .NE. len_filename)THEN
+            WRITE(*,*) "  file name size obtained from the object id is incorrect"
+            total_error = total_error + 1
+         ENDIF
+         IF(filename_exact .NE. TRIM(fix_filename)) THEN
+            WRITE(*,*) "  file name obtained from the object id is incorrect"
+            total_error = total_error + 1
+         END IF
+
+         ! Use a buffer which is smaller than needed to hold the filename
+         CALL h5fget_name_f(obj_id, filename_sm, name_size, error)
+         CALL check("h5fget_name_f",error,total_error)
+         IF(name_size .NE. len_filename)THEN
+            WRITE(*,*) "  file name size obtained from the object id is incorrect"
+            total_error = total_error + 1
+         ENDIF
+         IF(filename_sm(1:len_filename-sm_len) .NE. fix_filename(1:len_filename-sm_len)) THEN
+            WRITE(*,*) "  file name obtained from the object id is incorrect"
+            total_error = total_error + 1
+         END IF
+
         END SUBROUTINE check_get_name
 
 !    The following subroutine tests h5fget_name_f.
@@ -653,6 +683,7 @@ CONTAINS
 
           CHARACTER(LEN=*), PARAMETER :: filename = "filename"
           CHARACTER(LEN=80)  :: fix_filename
+          INTEGER :: len_filename
 
           INTEGER(HID_T) :: file_id          ! File identifier
           INTEGER(HID_T) :: g_id             ! Group identifier
@@ -679,8 +710,9 @@ CONTAINS
           CALL h5gopen_f(file_id,"/",g_id, error)
           CALL check("h5gopen_f",error,total_error)
 
-          CALL check_get_name(file_id, fix_filename, total_error)
-          CALL check_get_name(g_id, fix_filename, total_error)
+          len_filename = LEN_TRIM(fix_filename)
+          CALL check_get_name(file_id, fix_filename, len_filename, total_error)
+          CALL check_get_name(g_id, fix_filename, len_filename, total_error)
 
           ! Close the group.
           !
diff --git a/fortran/test/tH5G_1_8.F90 b/fortran/test/tH5G_1_8.F90
index 534a2d4..222ba9d 100644
--- a/fortran/test/tH5G_1_8.F90
+++ b/fortran/test/tH5G_1_8.F90
@@ -654,7 +654,7 @@ SUBROUTINE group_info(cleanup, fapl, total_error)
      INTEGER(HID_T) :: file, scalar, grp, d1
      CHARACTER(LEN=12), PARAMETER :: filename ='TestLinks.h5'
      INTEGER(HSIZE_T), DIMENSION(1) :: adims2 = (/1/) ! Attribute dimension
-     INTEGER ::   arank = 1                      ! Attribure rank
+     INTEGER ::   arank = 1                      ! Attribute rank
      INTEGER :: error
 
      INTEGER :: cset ! Indicates the character set used for the link’s name.
diff --git a/fortran/test/tH5MISC_1_8.F90 b/fortran/test/tH5MISC_1_8.F90
index c294f21..e35ef1f 100644
--- a/fortran/test/tH5MISC_1_8.F90
+++ b/fortran/test/tH5MISC_1_8.F90
@@ -160,7 +160,7 @@ SUBROUTINE test_genprop_basic_class(total_error)
   CALL verify("H5Pequal_f", flag, .TRUE., total_error)
 
 
-  !  Make certain false postives aren't being returned
+  !  Make certain false positives aren't being returned
   CALL H5Pequal_f(cid2, H5P_FILE_CREATE_F, flag, error)
   CALL check("H5Pequal_f", error, total_error)
   CALL verify("H5Pequal_f", flag, .FALSE., total_error)
diff --git a/fortran/test/tH5P.F90 b/fortran/test/tH5P.F90
index 1d1208c..d664dd7 100644
--- a/fortran/test/tH5P.F90
+++ b/fortran/test/tH5P.F90
@@ -349,8 +349,8 @@ SUBROUTINE multi_file_test(cleanup, total_error)
   DO i = 1, 4
      DO j = 1, 6
         IF (data_out(i,j) .NE. dset_data(i, j)) THEN
-           WRITE(*, *) "dataset test error occured"
-           WRITE(*,*) "data read is not the same as the data writen"
+           WRITE(*, *) "dataset test error occurred"
+           WRITE(*,*) "data read is not the same as the data written"
         END IF
      END DO
   END DO
@@ -541,7 +541,7 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
   CALL H5Dclose_f(dsid, error)
   CALL H5Oopen_f(fid, "dset", dsid, error, dapl1)
 
-  ! Retrieve dapl from dataset, verfiy cache values are the same as on dapl1
+  ! Retrieve dapl from dataset, verify cache values are the same as on dapl1
   !
   ! Note we rely on the knowledge that H5Pget_chunk_cache retrieves these
   ! values directly from the dataset structure, and not from a copy of the
@@ -563,7 +563,7 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
   CALL H5Oopen_f(fid, "dset", dsid, error)
   CALL check("H5Oopen_f", error, total_error)
 
-  ! Retrieve dapl from dataset, verfiy cache values are the same as on fapl_local
+  ! Retrieve dapl from dataset, verify cache values are the same as on fapl_local
 
   CALL H5Dget_access_plist_f(dsid, dapl2, error)
   CALL check("H5Dget_access_plist_f", error, total_error)
@@ -575,7 +575,7 @@ SUBROUTINE test_chunk_cache(cleanup, total_error)
   CALL H5Pclose_f(dapl2,error)
   CALL check("H5Pclose_f", error, total_error)
 
-  ! Similary, test use of H5Dcreate2 with H5P_DEFAULT
+  ! Similarly, test use of H5Dcreate2 with H5P_DEFAULT
   CALL H5Dclose_f(dsid, error)
   CALL check("H5Dclose_f", error, total_error)
 
diff --git a/fortran/test/tH5R.F90 b/fortran/test/tH5R.F90
index 5144d83..4e62b20 100644
--- a/fortran/test/tH5R.F90
+++ b/fortran/test/tH5R.F90
@@ -142,7 +142,7 @@ SUBROUTINE refobjtest(cleanup, total_error)
   CALL check("h5gclose_f",error,total_error)
 
   !
-  ! Craete references to two groups, integer dataset and shared datatype
+  ! Create references to two groups, integer dataset and shared datatype
   ! and write it to the dataset in the file
   !
   CALL h5rcreate_f(file_id, groupname1, ref(1), error)
diff --git a/fortran/test/tH5S.F90 b/fortran/test/tH5S.F90
index 08f0b59..302db51 100644
--- a/fortran/test/tH5S.F90
+++ b/fortran/test/tH5S.F90
@@ -151,7 +151,7 @@ CONTAINS
           CALL h5sget_simple_extent_dims_f(space2_id, dimsout, maxdimsout, error)
               CALL check("h5sget_simple_extent_dims_f", error, total_error)
           IF ((dimsout(1) .NE. dims1(1)) .OR. (dimsout(2) .NE. dims1(2)) ) THEN
-              write(*,*)"error occured, copied dims not same"
+              write(*,*)"error occurred, copied dims not same"
           END IF
 
           !
@@ -159,14 +159,14 @@ CONTAINS
           !
           CALL h5sget_simple_extent_ndims_f(space2_id, rank2, error)
               CALL check("h5sget_simple_extent_ndims_f", error, total_error)
-          IF (rank2 .NE. rank1) write(*,*)"error occured, copied ranks not same"
+          IF (rank2 .NE. rank1) write(*,*)"error occurred, copied ranks not same"
 
           !
           !get the copied space's number of elements.
           !
           CALL h5sget_simple_extent_npoints_f(space2_id, npoints, error)
               CALL check("h5sget_simple_extent_npoints_f", error, total_error)
-          IF (npoints .NE. 24) write(*,*)"error occured, number of elements not correct"
+          IF (npoints .NE. 24) write(*,*)"error occurred, number of elements not correct"
 
 
           !
@@ -194,7 +194,7 @@ CONTAINS
           CALL h5sget_simple_extent_dims_f(space2_id, dimsout, maxdimsout, error)
               CALL check("h5sget_simple_extent_dims_f", error, total_error)
           IF ((dimsout(1) .NE. dims2(1)) .OR. (dimsout(2) .NE. dims2(2)) ) THEN
-              write(*,*)"error occured, copied dims not same"
+              write(*,*)"error occurred, copied dims not same"
           END IF
 
           !
@@ -235,8 +235,8 @@ CONTAINS
           do i = 1, 4
               do j = 1, 6
                   IF (data1_out(i,j) .NE. data1_in(i, j)) THEN
-                      write(*, *) "dataset test error occured"
-                      write(*,*) "data read is not the same as the data writen"
+                      write(*, *) "dataset test error occurred"
+                      write(*,*) "data read is not the same as the data written"
                   END IF
               end do
           end do
@@ -256,8 +256,8 @@ CONTAINS
           do i = 1, 6
               do j = 1, 6
                   IF (data2_out(i,j) .NE. data2_in(i, j)) THEN
-                      write(*, *) "dataset test error occured"
-                      write(*,*) "data read is not the same as the data writen"
+                      write(*, *) "dataset test error occurred"
+                      write(*,*) "data read is not the same as the data written"
                   END IF
               end do
           end do
diff --git a/fortran/test/tH5Sselect.F90 b/fortran/test/tH5Sselect.F90
index 178ac32..41cd16f 100644
--- a/fortran/test/tH5Sselect.F90
+++ b/fortran/test/tH5Sselect.F90
@@ -149,7 +149,7 @@ CONTAINS
     !
 
     !
-    !Initialize FORTRAN predifined datatypes
+    !Initialize FORTRAN predefined datatypes
     !
 !    CALL h5init_types_f(error)
 !    CALL check("h5init_types_f", error, total_error)
@@ -430,7 +430,7 @@ CONTAINS
     end do
 
     !
-    !Initialize FORTRAN predifined datatypes
+    !Initialize FORTRAN predefined datatypes
     !
 !    CALL h5init_types_f(error)
 !    CALL check("h5init_types_f", error, total_error)
@@ -912,7 +912,7 @@ CONTAINS
      !
      CALL h5sget_select_hyper_nblocks_f(dataspace, num_blocks, error)
      CALL check("h5sget_select_hyper_nblocks_f", error, total_error)
-     IF (num_blocks .NE. 4) write (*,*) "error occured with num_blocks"
+     IF (num_blocks .NE. 4) write (*,*) "error occurred with num_blocks"
      !write(*,*) num_blocks
      !result of num_blocks is 4
 
@@ -945,11 +945,11 @@ CONTAINS
      CALL h5sget_select_bounds_f(dataspace, startout, endout, error)
      CALL check("h5sget_select_bounds_f", error, total_error)
      IF ( (startout(1) .ne. 1) .or. (startout(2) .ne. 1) ) THEN
-        write(*,*) "error occured to select_bounds's start position"
+        write(*,*) "error occurred to select_bounds's start position"
      END IF
 
      IF ( (endout(1) .ne. 5) .or. (endout(2) .ne. 5) ) THEN
-        write(*,*) "error occured to select_bounds's end position"
+        write(*,*) "error occurred to select_bounds's end position"
      END IF
      !write(*,*) (startout(i), i = 1, RANK)
      !result of startout is 0, 0
@@ -978,7 +978,7 @@ CONTAINS
      !
      CALL h5sget_select_elem_npoints_f(dataspace, num_points, error)
      CALL check("h5sget_select_elem_npoints_f", error, total_error)
-     IF (num_points .NE. 10) write(*,*) "error occured with num_points"
+     IF (num_points .NE. 10) write(*,*) "error occurred with num_points"
      !write(*,*) num_points
      ! result of num_points is 10
 
diff --git a/fortran/test/tH5T.F90 b/fortran/test/tH5T.F90
index 8b10136..d24ac89 100644
--- a/fortran/test/tH5T.F90
+++ b/fortran/test/tH5T.F90
@@ -72,7 +72,7 @@ CONTAINS
      INTEGER(HID_T) :: dt4_id      ! Memory datatype identifier (for real field)
      INTEGER(HID_T) :: dt5_id      ! Memory datatype identifier
      INTEGER(HID_T) :: membtype_id ! Datatype identifier
-     INTEGER(HID_T) :: plist_id    ! Dataset trasfer property
+     INTEGER(HID_T) :: plist_id    ! Dataset transfer property
 
 
      INTEGER(HSIZE_T), DIMENSION(1) :: dims = (/dimsize/) ! Dataset dimensions
@@ -98,7 +98,7 @@ CONTAINS
      INTEGER :: class ! Datatype class
      INTEGER :: num_members ! Number of members in the compound datatype
      CHARACTER(LEN=256) :: member_name
-     INTEGER :: len ! Lenght of the name of the compound datatype member
+     INTEGER :: len ! Length of the name of the compound datatype member
      INTEGER :: member_index ! index of the field
      INTEGER(HSIZE_T), DIMENSION(3) :: array_dims=(/2,3,4/)
      INTEGER :: array_dims_range = 3
@@ -219,9 +219,9 @@ CONTAINS
      CALL h5tcreate_f(H5T_COMPOUND_F, type_size, dtype_id, error)
      CALL check("h5tcreate_f", error, total_error)
      !
-     ! Insert memebers
+     ! Insert members
      !
-     ! CHARACTER*2 memeber
+     ! CHARACTER*2 member
      !
      offset = 0
      CALL h5tinsert_f(dtype_id, "char_field", offset, dt5_id, error)
@@ -229,13 +229,13 @@ CONTAINS
      !
      ! INTEGER member
      !
-     offset = offset + type_sizec ! Offset of the second memeber is 2
+     offset = offset + type_sizec ! Offset of the second member is 2
      CALL h5tinsert_f(dtype_id, "integer_field", offset, H5T_NATIVE_INTEGER, error)
      CALL check("h5tinsert_f", error, total_error)
      !
      ! DOUBLE PRECISION member
      !
-     offset = offset + type_sizei  ! Offset of the third memeber is 6
+     offset = offset + type_sizei  ! Offset of the third member is 6
      CALL h5tinsert_f(dtype_id, "double_field", offset, H5T_NATIVE_DOUBLE, error)
      CALL check("h5tinsert_f", error, total_error)
      !
@@ -416,7 +416,7 @@ CONTAINS
          CALL h5tequal_f(membtype_id, H5T_NATIVE_INTEGER, flag, error)
           CALL check("h5tequal_f", error, total_error)
              if(.not. flag) then
-                write(*,*) "Wrong member type returned for integer memebr"
+                write(*,*) "Wrong member type returned for integer member"
                 total_error = total_error + 1
              endif
          CALL h5tget_member_class_f(dtype_id, i-1, class, error)
@@ -435,7 +435,7 @@ CONTAINS
          CALL h5tequal_f(membtype_id, H5T_NATIVE_DOUBLE, flag, error)
           CALL check("h5tequal_f", error, total_error)
              if(.not. flag) then
-                write(*,*) "Wrong member type returned for double precision memebr"
+                write(*,*) "Wrong member type returned for double precision member"
                 total_error = total_error + 1
              endif
          CALL h5tget_member_class_f(dtype_id, i-1, class, error)
@@ -454,7 +454,7 @@ CONTAINS
          CALL h5tequal_f(membtype_id, H5T_NATIVE_REAL, flag, error)
           CALL check("h5tequal_f", error, total_error)
              if(.not. flag) then
-                write(*,*) "Wrong member type returned for real memebr"
+                write(*,*) "Wrong member type returned for real member"
                 total_error = total_error + 1
              endif
          CALL h5tget_member_class_f(dtype_id, i-1, class, error)
diff --git a/fortran/test/tH5VL.F90 b/fortran/test/tH5VL.F90
index 2269fec..eb0470c 100644
--- a/fortran/test/tH5VL.F90
+++ b/fortran/test/tH5VL.F90
@@ -147,7 +147,7 @@ CONTAINS
               CALL check("h5dvlen_get_max_len_f", error, total_error)
               if(max_len .ne. data_dims(1)) then
                       total_error = total_error + 1
-                      write(*,*) "Wrong number of elemets returned by h5dvlen_get_max_len_f"
+                      write(*,*) "Wrong number of elements returned by h5dvlen_get_max_len_f"
               endif
           !
           ! Read the dataset.
@@ -317,7 +317,7 @@ CONTAINS
               CALL check("h5dvlen_get_max_len_f", error, total_error)
               if(max_len .ne. data_dims(1)) then
                       total_error = total_error + 1
-                      write(*,*) "Wrong number of elemets returned by h5dvlen_get_max_len_f"
+                      write(*,*) "Wrong number of elements returned by h5dvlen_get_max_len_f"
               endif
           !
           ! Read the dataset.
diff --git a/fortran/test/tH5Z.F90 b/fortran/test/tH5Z.F90
index 8c39fea..799067a 100644
--- a/fortran/test/tH5Z.F90
+++ b/fortran/test/tH5Z.F90
@@ -374,7 +374,7 @@ CONTAINS
           do i = 1, N
               do j = 1, M
                   IF (data_out(i,j) .NE. dset_data(i, j)) THEN
-                      write(*, *) "dataset test error occured"
+                      write(*, *) "dataset test error occurred"
                       write(*,*) "data read is not the same as the data written"
                       num_errors = num_errors + 1
                       IF (num_errors .GE. 512) THEN