Merge branch 'hotfix_hdf5_PL_strings' into 'master' (3e3e7edf) · Commits · Futility / Futility

src/FileType_HDF5.f90

+27 −15

Original line number	Diff line number	Diff line
		@@ -6399,10 +6399,14 @@ SUBROUTINE read_parameter(thisHDF5File,h5path,vals)
		st1(i) = st1(i)%replace(C_NULL_CHAR,'')
		ENDDO
		isbool=.TRUE.
		IF(SIZE(st1) == 0 .OR. ANY(LEN(st1) /= 1)) THEN
		isbool=.FALSE.
		ELSE
		DO i=1,SIZE(st1)
		isbool=(st1(i) == 'T') .OR. (st1(i) == 'F')
		IF(.NOT.isbool) EXIT
		ENDDO
		ENDIF
		IF(isbool) THEN
		CALL read_b1(thisHDF5File,CHAR(plpath),l1)
		CALL vals%add(CHAR(plpath),l1)
		@@ -6419,6 +6423,9 @@ SUBROUTINE read_parameter(thisHDF5File,h5path,vals)
		ENDDO
		ENDDO
		isbool=.TRUE.
		IF(ANY(LEN(st2) /= 1)) THEN
		isbool=.FALSE.
		ELSE
		DO j=1,SIZE(st2,DIM=2)
		DO i=1,SIZE(st2,DIM=1)
		isbool=(st2(i,j) == 'T') .OR. (st2(i,j) == 'F')
		@@ -6426,6 +6433,7 @@ SUBROUTINE read_parameter(thisHDF5File,h5path,vals)
		ENDDO
		IF(.NOT.isbool) EXIT
		ENDDO
		ENDIF
		IF(isbool) THEN
		!Disabled until PL support is added.
		CALL read_b2(thisHDF5File,CHAR(plpath),l2)
		@@ -6448,6 +6456,9 @@ SUBROUTINE read_parameter(thisHDF5File,h5path,vals)
		ENDDO
		ENDDO
		isbool=.TRUE.
		IF(ANY(LEN(st3) /= 1)) THEN
		isbool=.FALSE.
		ELSE
		DO k=1,SIZE(st3,DIM=3)
		DO j=1,SIZE(st3,DIM=2)
		DO i=1,SIZE(st3,DIM=1)
		@@ -6458,6 +6469,7 @@ SUBROUTINE read_parameter(thisHDF5File,h5path,vals)
		ENDDO
		IF(.NOT.isbool) EXIT
		ENDDO
		ENDIF
		!Disabled until PL support is added.
		IF(isbool) THEN
		CALL read_b3(thisHDF5File,CHAR(plpath),l3)

+3 −1

Original line number	Diff line number	Diff line
		@@ -9222,7 +9222,9 @@ SUBROUTINE edit_ParamType_STR_a1(thisParam,funit,indent,prefix,paddtw)
		WRITE(fmt,'(i12)') i; fmt=ADJUSTL(fmt)

		sval=''
		IF(SIZE(thisParam%val) > 0) THEN
		IF(LEN_TRIM(thisParam%val(1)) > 0) sval=thisParam%val(1)
		ENDIF
		sdesc=''
		IF(LEN_TRIM(thisParam%description) > 0) sdesc=' !'//thisParam%description
		WRITE(UNIT=funit,FMT='('//TRIM(fmt)//'x,a)',ADVANCE='NO') sprefix// &