Commit 5ef9fd42 authored by Graham, Aaron's avatar Graham, Aaron
Browse files

Adds parameter lists support for 3D string arrays 

Adds full support and testing. Also adds support in HDF5 where PLs are read and written.
parent 2fe4025f

src/FileType_HDF5.f90

+5 −4
Original line number Diff line number Diff line
@@ -3723,6 +3723,7 @@ SUBROUTINE write_pList(thisHDF5File,dsetname,vals,gdims_in,first_dir) 
  INTEGER(SLK),ALLOCATABLE :: id3(:,:,:)

  REAL(SSK),ALLOCATABLE :: rs3(:,:,:)

  REAL(SDK),ALLOCATABLE :: rd3(:,:,:)

  TYPE(StringType),ALLOCATABLE :: st3(:,:,:)

  INTEGER(SNK),ALLOCATABLE :: is4(:,:,:,:)

  INTEGER(SLK),ALLOCATABLE :: id4(:,:,:,:)

  REAL(SSK),ALLOCATABLE :: rs4(:,:,:,:)
@@ -3830,6 +3831,9 @@ SUBROUTINE write_pList(thisHDF5File,dsetname,vals,gdims_in,first_dir) 
      CASE('3-D ARRAY INTEGER(SLK)')

        CALL vals%get(CHAR(address),id3)

        CALL thisHDF5File%write_l3(CHAR(path),id3)

      CASE('3-D ARRAY TYPE(StringType)')

        CALL vals%get(CHAR(address),st3)

        CALL thisHDF5File%write_st3_helper(CHAR(path),st3)

      CASE('4-D ARRAY REAL(SSK)')

        CALL vals%get(CHAR(address),rs4)

        CALL thisHDF5File%write_s4(CHAR(path),rs4)
@@ -6462,10 +6466,7 @@ SUBROUTINE read_parameter(thisHDF5File,h5path,vals) 
            'added to Parameter List.')

        !CALL vals%add(CHAR(plpath),l3)

      ELSE

        CALL thisHDF5File%e%raiseWarning(modName//'::'//myName// &

            ' - Unsupported Parameter Type 3-D String Array will not be '// &

            'added to Parameter List.')

        !CALL vals%add(CHAR(plpath),st3)

        CALL vals%add(CHAR(plpath),st3)

      ENDIF

    CASE DEFAULT

      CALL thisHDF5File%e%raiseWarning(modName//'::'//myName// &

src/ParameterLists.f90

+391 −34

File changed.

Preview size limit exceeded, changes collapsed.

unit_tests/testHDF5FileType/testHDF5FileType.f90

+12 −0

File changed.

Preview size limit exceeded, changes collapsed.

unit_tests/testParameterLists/testParameterLists.f90

+230 −0

File changed.

Preview size limit exceeded, changes collapsed.