The space difference in the Fortran examples must be fixed to match t…

…he expected output for compression filter examples.

HDF5Examples/FORTRAN/H5D/h5ex_d_checksum.F90

@@ -120,15 +120,17 @@ PROGRAM main
   !
   nelmts = 0
   CALL H5Pget_filter_f(dcpl, 0, flags, nelmts, cd_values, MaxChrLen, name, filter_id, hdferr)
-  WRITE(*,'("Filter type is: ")', ADVANCE='NO')
+  WRITE(*,'(A,1X)', ADVANCE='NO') "Filter type is:"
   IF(filter_id.EQ.H5Z_FILTER_DEFLATE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_DEFLATE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_DEFLATE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SHUFFLE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SHUFFLE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SHUFFLE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_FLETCHER32_F)THEN
-     WRITE(*,'(" H5Z_FILTER_FLETCHER32_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_FLETCHER32_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SZIP_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SZIP_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SZIP_F"
+  ELSE
+     WRITE(*,'(A)') "UNKNOWN"
   ENDIF
   !
   ! Read the data using the default properties.

HDF5Examples/FORTRAN/H5D/h5ex_d_gzip.F90

@@ -118,15 +118,17 @@ PROGRAM main
   !
   nelmts = 1
   CALL H5Pget_filter_f(dcpl, 0, flags, nelmts, cd_values, MaxChrLen, name, filter_id, hdferr)
-  WRITE(*,'("Filter type is: ")', ADVANCE='NO')
+  WRITE(*,'(A,1X)', ADVANCE='NO') "Filter type is:"
   IF(filter_id.EQ.H5Z_FILTER_DEFLATE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_DEFLATE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_DEFLATE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SHUFFLE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SHUFFLE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SHUFFLE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_FLETCHER32_F)THEN
-     WRITE(*,'(" H5Z_FILTER_FLETCHER32_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_FLETCHER32_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SZIP_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SZIP_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SZIP_F"
+  ELSE
+     WRITE(*,'(A)') "UNKNOWN"
   ENDIF
   !
   ! Read the data using the default properties.

HDF5Examples/FORTRAN/H5D/h5ex_d_nbit.F90

@@ -125,17 +125,19 @@ PROGRAM main
   ! first filter because we know that we only added one filter.
   !
   CALL H5Pget_filter_f(dcpl, 0, flags, nelmts, cd_values, INT(MaxChrLen, SIZE_T), name, filter_id, hdferr)
-  WRITE(*,'("Filter type is: ")', ADVANCE='NO')
+  WRITE(*,'(A,1X)', ADVANCE='NO') "Filter type is:"
   IF(filter_id.EQ.H5Z_FILTER_DEFLATE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_DEFLATE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_DEFLATE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SHUFFLE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SHUFFLE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SHUFFLE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_FLETCHER32_F)THEN
-     WRITE(*,'(" H5Z_FILTER_FLETCHER32_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_FLETCHER32_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SZIP_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SZIP_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SZIP_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_NBIT_F)THEN
-     WRITE(*,'(" H5Z_FILTER_NBIT_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_NBIT_F"
+  ELSE
+     WRITE(*,'(A)') "UNKNOWN"
   ENDIF
   !
   ! Read the data using the default properties.

HDF5Examples/FORTRAN/H5D/h5ex_d_soint.F90

@@ -133,19 +133,21 @@ PROGRAM main
   !
   nelmts = 1
   CALL H5Pget_filter_f(dcpl, 0, flags, nelmts, cd_values, INT(MaxChrLen, SIZE_T), name, filter_id, hdferr)
-  WRITE(*,'("Filter type is: ")', ADVANCE='NO')
+  WRITE(*,'(A,1X)', ADVANCE='NO') "Filter type is:"
   IF(filter_id.EQ.H5Z_FILTER_DEFLATE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_DEFLATE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_DEFLATE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SHUFFLE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SHUFFLE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SHUFFLE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_FLETCHER32_F)THEN
-     WRITE(*,'(" H5Z_FILTER_FLETCHER32_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_FLETCHER32_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SZIP_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SZIP_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SZIP_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_NBIT_F)THEN
-     WRITE(*,'(" H5Z_FILTER_NBIT_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_NBIT_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SCALEOFFSET_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SCALEOFFSET_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SCALEOFFSET_F"
+  ELSE
+     WRITE(*,'(A)') "UNKNOWN"
   ENDIF
   !
   ! Read the data using the default properties.

HDF5Examples/FORTRAN/H5D/h5ex_d_szip.F90

@@ -119,15 +119,16 @@ PROGRAM main
 
   nelmts = 1
   CALL H5Pget_filter_f(dcpl, 0, flags, nelmts, cd_values, INT(MaxChrLen,SIZE_T), name, filter_id, hdferr)
-  WRITE(*,'("Filter type is: ")', ADVANCE='NO')
+  WRITE(*,'(A,1X)', ADVANCE='NO') "Filter type is:"
   IF(filter_id.EQ.H5Z_FILTER_DEFLATE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_DEFLATE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_DEFLATE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SHUFFLE_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SHUFFLE_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SHUFFLE_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_FLETCHER32_F)THEN
-     WRITE(*,'(" H5Z_FILTER_FLETCHER32_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_FLETCHER32_F"
   ELSE IF(filter_id.EQ.H5Z_FILTER_SZIP_F)THEN
-     WRITE(*,'(" H5Z_FILTER_SZIP_F")')
+     WRITE(*,'(A)') "H5Z_FILTER_SZIP_F"
+  ENDIF
 ! DEFINED ONLY IN F2003 hdf5 branch
 !  ELSE IF(filter_id.EQ.H5Z_FILTER_NBIT_F)THEN
 !     WRITE(*,'(" H5Z_FILTER_NBIT_F")')

HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_checksum.tst

@@ -1,2 +1,2 @@
-Filter type is:  H5Z_FILTER_FLETCHER32_F
+Filter type is: H5Z_FILTER_FLETCHER32_F
 Maximum value in DS1 is:       1984

HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_gzip.tst

@@ -1,2 +1,2 @@
-Filter type is:  H5Z_FILTER_DEFLATE_F
+Filter type is: H5Z_FILTER_DEFLATE_F
 Maximum value in DS1 is:       1890

HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_nbit.tst

@@ -1,2 +1,2 @@
-Filter type is:  H5Z_FILTER_NBIT_F
+Filter type is: H5Z_FILTER_NBIT_F
 Maximum value in DS1 is:       1890

HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_soint.tst

@@ -1,5 +1,5 @@
 Maximum value in write buffer is: 1890
 Minimum value in write buffer is:  -63
-Filter type is:  H5Z_FILTER_SCALEOFFSET_F
+Filter type is: H5Z_FILTER_SCALEOFFSET_F
 Maximum value in DS1 is: 1890
 Minimum value in DS1 is:  -63

HDF5Examples/FORTRAN/H5D/tfiles/18/h5ex_d_szip.tst

@@ -1,2 +1,2 @@
-Filter type is:  H5Z_FILTER_SZIP_F
+Filter type is: H5Z_FILTER_SZIP_F
 Maximum value in DS1 is:       1890