223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

more flexibility for setting default values

This commit is contained in:
Martin Diehl 2023-12-10 22:22:19 +01:00
parent c6ecd6d977
commit 1b60bc14e8
No known key found for this signature in database
GPG Key ID: 1FD50837275A0A9B
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/YAML_types.f90
View File

@ -303,7 +303,11 @@ subroutine YAML_types_selfTest()
error stop 'dict_get_as1dReal_shape list' error stop 'dict_get_as1dReal_shape list'
if (any(dNeq(d%get_as1dReal('non-existing',a,[2,3]),a))) & if (any(dNeq(d%get_as1dReal('non-existing',a,[2,3]),a))) &
error stop 'dict_get_as1dReal_shape default' error stop 'dict_get_as1dReal_shape default individual'
a = real([42.0, 42.0, 5.0, 5.0, 5.0],pREAL)
if (any(dNeq(d%get_as1dReal('non-existing',[42._pREAL, 5._pREAL],[2,3]),a))) &
error stop 'dict_get_as1dReal_shape default group'
if (any(dNeq(d%get_as1dReal('scalar',requiredShape=[3,5,2]),misc_ones(10)))) & if (any(dNeq(d%get_as1dReal('scalar',requiredShape=[3,5,2]),misc_ones(10)))) &
error stop 'dict_get_as1dReal_shape scalar' error stop 'dict_get_as1dReal_shape scalar'
@ -1262,9 +1266,15 @@ function tDict_get_as1dReal_shape(self,k,defaultVal,requiredShape) result(nodeAs
end do end do
end select end select
elseif (present(defaultVal)) then elseif (present(defaultVal)) then
if (size(defaultVal) /= size(nodeAs1dReal)) & if (size(defaultVal) == size(nodeAs1dReal)) then
nodeAs1dReal = defaultVal
elseif (size(defaultVal) == size(requiredShape)) then
do i = 1, size(requiredShape)
nodeAs1dReal(sum(requiredShape(:i-1))+1:sum(requiredShape(:i))) = defaultVal(i)
end do
else
call IO_error(709,'default values not of required shape') call IO_error(709,'default values not of required shape')
nodeAs1dReal = defaultVal end if
else else
call IO_error(143,ext_msg=k) call IO_error(143,ext_msg=k)
end if end if