Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Futility
Futility
Commits
3e3e7edf
Commit
3e3e7edf
authored
Sep 02, 2021
by
Graham, Aaron
Browse files
Merge branch 'hotfix_hdf5_PL_strings' into 'master'
Hotfix hdf5 pl strings See merge request futility/Futility!347
parents
9bc4a357
ab5f33c4
Pipeline
#162197
passed with stage
in 2 minutes and 5 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/FileType_HDF5.f90
View file @
3e3e7edf
...
...
@@ -6399,10 +6399,14 @@ SUBROUTINE read_parameter(thisHDF5File,h5path,vals)
st1
(
i
)
=
st1
(
i
)
%
replace
(
C_NULL_CHAR
,
''
)
ENDDO
isbool
=
.TRUE.
DO
i
=
1
,
SIZE
(
st1
)
isbool
=
(
st1
(
i
)
==
'T'
)
.OR.
(
st1
(
i
)
==
'F'
)
IF
(
.NOT.
isbool
)
EXIT
ENDDO
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,13 +6423,17 @@ SUBROUTINE read_parameter(thisHDF5File,h5path,vals)
ENDDO
ENDDO
isbool
=
.TRUE.
DO
j
=
1
,
SIZE
(
st2
,
DIM
=
2
)
DO
i
=
1
,
SIZE
(
st2
,
DIM
=
1
)
isbool
=
(
st2
(
i
,
j
)
==
'T'
)
.OR.
(
st2
(
i
,
j
)
==
'F'
)
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'
)
IF
(
.NOT.
isbool
)
EXIT
ENDDO
IF
(
.NOT.
isbool
)
EXIT
ENDDO
IF
(
.NOT.
isbool
)
EXIT
ENDDO
ENDIF
IF
(
isbool
)
THEN
!Disabled until PL support is added.
CALL
read_b2
(
thisHDF5File
,
CHAR
(
plpath
),
l2
)
...
...
@@ -6448,16 +6456,20 @@ SUBROUTINE read_parameter(thisHDF5File,h5path,vals)
ENDDO
ENDDO
isbool
=
.TRUE.
DO
k
=
1
,
SIZE
(
st3
,
DIM
=
3
)
DO
j
=
1
,
SIZE
(
st3
,
DIM
=
2
)
DO
i
=
1
,
SIZE
(
st3
,
DIM
=
1
)
isbool
=
(
st3
(
i
,
j
,
k
)
==
'T'
)
.OR.
(
st3
(
i
,
j
,
k
)
==
'F'
)
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
)
isbool
=
(
st3
(
i
,
j
,
k
)
==
'T'
)
.OR.
(
st3
(
i
,
j
,
k
)
==
'F'
)
IF
(
.NOT.
isbool
)
EXIT
ENDDO
IF
(
.NOT.
isbool
)
EXIT
ENDDO
IF
(
.NOT.
isbool
)
EXIT
ENDDO
IF
(
.NOT.
isbool
)
EXIT
ENDDO
ENDIF
!Disabled until PL support is added.
IF
(
isbool
)
THEN
CALL
read_b3
(
thisHDF5File
,
CHAR
(
plpath
),
l3
)
...
...
src/ParameterLists.f90
View file @
3e3e7edf
...
...
@@ -9222,7 +9222,9 @@ SUBROUTINE edit_ParamType_STR_a1(thisParam,funit,indent,prefix,paddtw)
WRITE(fmt,'(i12)') i; fmt=ADJUSTL(fmt)
sval=''
IF(LEN_TRIM(thisParam%val(1)) > 0) sval=thisParam%val(1)
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// &
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment