From ae818ca9df9e12f4ba32e85de2f49ce164a0095f Mon Sep 17 00:00:00 2001 From: Elena Pourmal Date: Fri, 31 May 2002 15:11:54 -0500 Subject: [PATCH] [svn-r5492] Purpose: Code clean up. Description: Many F90 compilers were not happy about character*(*) declarations. Solution: Used F90 character(len=*) declarations. Platforms tested: Solaris 2.7 and Linux 2.4 --- fortran/examples/attrexample.f90 | 4 +--- fortran/examples/compound.f90 | 4 ++-- fortran/test/fortranlib_test.f90 | 8 ++++---- fortran/test/tH5A.f90 | 6 +++--- fortran/test/tH5G.f90 | 4 ++-- fortran/test/tH5P.f90 | 2 +- fortran/test/tH5T.f90 | 6 +++--- 7 files changed, 16 insertions(+), 18 deletions(-) diff --git a/fortran/examples/attrexample.f90 b/fortran/examples/attrexample.f90 index 99ff789388..0ac5cf8be5 100644 --- a/fortran/examples/attrexample.f90 +++ b/fortran/examples/attrexample.f90 @@ -24,8 +24,7 @@ INTEGER :: arank = 1 ! Attribure rank INTEGER(SIZE_T) :: attrlen ! Length of the attribute string -! CHARACTER*27, DIMENSION(2) :: attr_data ! Attribute data - CHARACTER*80, DIMENSION(2) :: attr_data ! Attribute data + CHARACTER(LEN=80), DIMENSION(2) :: attr_data ! Attribute data INTEGER :: error ! Error flag INTEGER, DIMENSION(7) :: data_dims @@ -36,7 +35,6 @@ ! attr_data(1) = "Dataset character attribute" attr_data(2) = "Some other string here " -! attrlen = 27 attrlen = 80 ! ! Initialize FORTRAN interface. diff --git a/fortran/examples/compound.f90 b/fortran/examples/compound.f90 index 0bb6672ea7..0ef22e60df 100644 --- a/fortran/examples/compound.f90 +++ b/fortran/examples/compound.f90 @@ -42,8 +42,8 @@ INTEGER(SIZE_T) :: type_sized ! Size of the double precision datatype INTEGER(SIZE_T) :: type_sizer ! Size of the real datatype INTEGER(SIZE_T) :: offset ! Member's offset - CHARACTER*2, DIMENSION(dimsize) :: char_member - CHARACTER*2, DIMENSION(dimsize) :: char_member_out ! Buffer to read data out + CHARACTER(LEN=2), DIMENSION(dimsize) :: char_member + CHARACTER(LEN=2), DIMENSION(dimsize) :: char_member_out ! Buffer to read data out INTEGER, DIMENSION(dimsize) :: int_member DOUBLE PRECISION, DIMENSION(dimsize) :: double_member REAL, DIMENSION(dimsize) :: real_member diff --git a/fortran/test/fortranlib_test.f90 b/fortran/test/fortranlib_test.f90 index 13e96b0c65..2c5c13a871 100644 --- a/fortran/test/fortranlib_test.f90 +++ b/fortran/test/fortranlib_test.f90 @@ -26,10 +26,10 @@ INTEGER :: identifier_total_error = 0 INTEGER :: group_total_error = 0 INTEGER :: error_total_error = 0 - CHARACTER*8 error_string - CHARACTER*8 :: success = ' PASSED ' - CHARACTER*8 :: failure = '*FAILED*' - CHARACTER*4 :: e_format ='(8a)' + CHARACTER(LEN=8) error_string + CHARACTER(LEN=8) :: success = ' PASSED ' + CHARACTER(LEN=8) :: failure = '*FAILED*' + CHARACTER(LEN=4) :: e_format ='(8a)' CALL h5open_f(error) write(*,*) ' ========================== ' diff --git a/fortran/test/tH5A.f90 b/fortran/test/tH5A.f90 index e5c5ad398f..cec25deb52 100644 --- a/fortran/test/tH5A.f90 +++ b/fortran/test/tH5A.f90 @@ -60,11 +60,11 @@ INTEGER(HID_T) :: attr4_type !Returned REAL Attribute Datatype identifier INTEGER(HID_T) :: attr5_type !Returned INTEGER Attribute Datatype identifier INTEGER :: num_attrs !number of attributes - CHARACTER*256 :: attr_name !buffer to put attr_name + CHARACTER(LEN=256) :: attr_name !buffer to put attr_name INTEGER(SIZE_T) :: name_size = 80 !attribute name length - CHARACTER*35, DIMENSION(2) :: attr_data ! String attribute data - CHARACTER*35, DIMENSION(2) :: aread_data ! Buffer to put read back + CHARACTER(LEN=35), DIMENSION(2) :: attr_data ! String attribute data + CHARACTER(LEN=35), DIMENSION(2) :: aread_data ! Buffer to put read back ! string attr data CHARACTER :: attr_character_data = 'A' DOUBLE PRECISION, DIMENSION(1) :: attr_double_data = 3.459 diff --git a/fortran/test/tH5G.f90 b/fortran/test/tH5G.f90 index 5486bb824e..8200f6bc16 100644 --- a/fortran/test/tH5G.f90 +++ b/fortran/test/tH5G.f90 @@ -37,8 +37,8 @@ INTEGER :: rank = 1 ! Datasets rank INTEGER :: error ! Error flag INTEGER(SIZE_T) :: namesize = 100 !size for symbolic object - CHARACTER*100 :: name !name to put symbolic object - CHARACTER*100 :: commentout !comment to the file + CHARACTER(LEN=100) :: name !name to put symbolic object + CHARACTER(LEN=100) :: commentout !comment to the file INTEGER :: nmembers INTEGER :: obj_type INTEGER, DIMENSION(7) :: data_dims diff --git a/fortran/test/tH5P.f90 b/fortran/test/tH5P.f90 index ed7ca60aad..0567b21bfa 100644 --- a/fortran/test/tH5P.f90 +++ b/fortran/test/tH5P.f90 @@ -16,7 +16,7 @@ INTEGER(HID_T) :: dataset_id INTEGER(HSIZE_T), DIMENSION(1) :: cur_size !data space current size INTEGER(HSIZE_T), DIMENSION(1) :: max_size !data space maximum size - CHARACTER*256 :: name !external file name + CHARACTER(LEN=256) :: name !external file name INTEGER :: file_offset !external file offset INTEGER(HSIZE_T) :: file_size !sizeof external file segment INTEGER :: error !error code diff --git a/fortran/test/tH5T.f90 b/fortran/test/tH5T.f90 index 0f9a39c329..43c3a9e499 100644 --- a/fortran/test/tH5T.f90 +++ b/fortran/test/tH5T.f90 @@ -51,8 +51,8 @@ INTEGER(SIZE_T) :: type_sizer ! Size of the real datatype INTEGER(SIZE_T) :: offset ! Member's offset INTEGER(SIZE_T) :: offset_out ! Member's offset - CHARACTER*2, DIMENSION(dimsize) :: char_member - CHARACTER*2, DIMENSION(dimsize) :: char_member_out ! Buffer to read data out + CHARACTER(LEN=2), DIMENSION(dimsize) :: char_member + CHARACTER(LEN=2), DIMENSION(dimsize) :: char_member_out ! Buffer to read data out INTEGER, DIMENSION(dimsize) :: int_member INTEGER, DIMENSION(dimsize) :: int_member_out DOUBLE PRECISION, DIMENSION(dimsize) :: double_member @@ -62,7 +62,7 @@ INTEGER :: i INTEGER :: class ! Datatype class INTEGER :: num_members ! Number of members in the compound datatype - CHARACTER*256 :: member_name + CHARACTER(LEN=256) :: member_name INTEGER :: len ! Lenght of the name of the compound datatype member LOGICAL :: flag INTEGER(HSIZE_T), DIMENSION(3) :: array_dims=(/2,3,4/)