polishing

This commit is contained in:
Sharan Roongta 2021-03-24 15:50:39 +01:00
parent ce91537b0f
commit b1cca4f5bd
2 changed files with 12 additions and 7 deletions

View File

@ -503,6 +503,8 @@ subroutine IO_error(error_ID,el,ip,g,instance,ext_msg)
msg = 'Abrupt end of file' msg = 'Abrupt end of file'
case (708) case (708)
msg = '--- expected after YAML file header' msg = '--- expected after YAML file header'
case (709)
msg = 'Length mismatch'
!------------------------------------------------------------------------------------------------- !-------------------------------------------------------------------------------------------------
! errors related to the grid solver ! errors related to the grid solver

View File

@ -59,21 +59,21 @@ module YAML_types
procedure :: & procedure :: &
tNode_get_byKey_as1dInt => tNode_get_byKey_as1dInt tNode_get_byKey_as1dInt => tNode_get_byKey_as1dInt
procedure :: & procedure :: &
tNode_get_byKey_asBool => tNode_get_byKey_asBool tNode_get_byKey_asBool => tNode_get_byKey_asBool
procedure :: & procedure :: &
tNode_get_byKey_as1dBool => tNode_get_byKey_as1dBool tNode_get_byKey_as1dBool => tNode_get_byKey_as1dBool
procedure :: & procedure :: &
tNode_get_byKey_asString => tNode_get_byKey_asString tNode_get_byKey_asString => tNode_get_byKey_asString
procedure :: & procedure :: &
tNode_get_byKey_as1dString => tNode_get_byKey_as1dString tNode_get_byKey_as1dString => tNode_get_byKey_as1dString
procedure :: & procedure :: &
getIndex => tNode_get_byKey_asIndex getIndex => tNode_get_byKey_asIndex
procedure :: & procedure :: &
getKey => tNode_getKey_byIndex getKey => tNode_getKey_byIndex
procedure :: & procedure :: &
contains => tNode_contains contains => tNode_contains
procedure :: & procedure :: &
get_as2dFloat => tNode_get_byKey_as2dFloat get_as2dFloat => tNode_get_byKey_as2dFloat
generic :: & generic :: &
get => tNode_get_byIndex, & get => tNode_get_byIndex, &
@ -1182,9 +1182,12 @@ function tList_as2dFloat(self)
row => self%get(1) !SR: some interface called 'shape' may be used? row => self%get(1) !SR: some interface called 'shape' may be used?
row_data => row%asList() row_data => row%asList()
allocate(tList_as2dFloat(row%length,row_data%length),source=0.0_pReal) allocate(tList_as2dFloat(self%length,row_data%length),source=0.0_pReal)
do i=1,self%length do i=1,self%length
row => self%get(i)
row_data => row%asList()
if(row_data%length /= size(tList_as2dFloat,2)) call IO_error(709,ext_msg='Varying number of columns')
tList_as2dFloat(i,:) = self%get_as1dFloat(i) tList_as2dFloat(i,:) = self%get_as1dFloat(i)
enddo enddo