Skip to content

Commit 7425fc9

Browse files
committed
More robust handling of ESMX:Driver:componentList ingestion.
1 parent 69c1322 commit 7425fc9

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/addon/ESMX/Driver/ESMX_Driver.F90

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,12 @@ subroutine SetModelServices(driver, rc)
162162
call ESMF_Finalize(endflag=ESMF_END_ABORT)
163163
endif
164164
! Ingest the generic component label list
165-
isFlag = ESMF_HConfigIsSequence(hconfigNode, keyString="componentList", &
165+
isFlag = ESMF_HConfigIsDefined(hconfigNode, keyString="componentList", &
166+
rc=rc)
167+
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
168+
line=__LINE__, file=FILENAME)) return ! bail out
169+
isFlag = isFlag .and. &
170+
.not.ESMF_HConfigIsNull(hconfigNode, keyString="componentList", &
166171
rc=rc)
167172
if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
168173
line=__LINE__, file=FILENAME)) return ! bail out

0 commit comments

Comments
 (0)