Merge pull request #4271 from GEOS-ESM/bugfix/#4269-broken-merge-and-tests

Fixes #4269

Author: mathomp4

hconfig_utils/HConfigUtilities.F90

@@ -4,6 +4,7 @@ module mapl3g_HConfigUtilities
    use esmf, only: ESMF_HConfigIterEnd, ESMF_HConfigIterLoop
    use esmf, only: ESMF_HConfigCreate, ESMF_HConfigIsMap, ESMF_HConfigAsStringMapKey
    use esmf, only: ESMF_HConfigIsDefined, ESMF_HConfigCreateAtMapVal, ESMF_HConfigSet
+   use esmf, only: ESMF_HConfigFileSave, ESMF_HConfigFileLoad
    use mapl_ErrorHandling
    implicit none(type,external)
    private
@@ -37,14 +38,14 @@ function merge_hconfig(parent_hconfig, child_hconfig, rc) result(total_hconfig)
       _ASSERT(ESMF_HConfigIsMap(child_hconfig), 'child hconfig must be a mapping.')
       total_hconfig = ESMF_HConfigCreate(child_hconfig, _RC)
 
-      iter_begin = ESMF_HConfigIterBegin(parent_hconfig, rc=rc)
-      iter_end = ESMF_HConfigIterEnd(parent_hconfig, rc=rc)
+      iter_begin = ESMF_HConfigIterBegin(parent_hconfig, _RC)
+      iter_end = ESMF_HConfigIterEnd(parent_hconfig, _RC)
       iter = iter_begin
       do while (ESMF_HConfigIterLoop(iter, iter_begin, iter_end, rc=status))
          _VERIFY(status)
 
          ! ignore mapl section
-         key = ESMF_HConfigAsStringMapKey(iter, rc=rc)
+         key = ESMF_HConfigAsStringMapKey(iter, _RC)
          if (key == MAPL_SECTION) cycle
 
          ! ignore duplicate key

hconfig_utils/tests/Test_HConfigUtilities.pf

@@ -12,12 +12,12 @@ module Test_HConfigUtilities
    type(ESMF_HConfig) :: child
    type(ESMF_HConfig) :: merged
    type(ESMF_HConfig) :: hconfig_content
-   character(len=*), parameter :: MAPLKEY = 'mapl: '
-   character(len=*), parameter :: KEY1 = 'key1: '
-   character(len=*), parameter :: KEY2 = 'key2: '
-   character(len=*), parameter :: KEY3 = 'key3: '
-   character(len=*), parameter :: KEY4 = 'key4: '
-   character(len=*), parameter :: KEY5 = 'key5: '
+   character(len=*), parameter :: MAPLKEY = 'mapl'
+   character(len=*), parameter :: KEY1 = 'key1'
+   character(len=*), parameter :: KEY2 = 'key2'
+   character(len=*), parameter :: KEY3 = 'key3'
+   character(len=*), parameter :: KEY4 = 'key4'
+   character(len=*), parameter :: KEY5 = 'key5'
    integer, parameter :: KEYLEN = len(KEY1)
    character(len=*), parameter :: PVALUE1 = 'parent_value1'
    character(len=*), parameter :: PVALUE2 = 'parent_value2'
@@ -69,7 +69,6 @@ contains
       logical :: defined
       character(len=80) :: msg
 
-
       call ESMF_HConfigAdd(hconfig_content, content=PVALUE1, addKeyString=KEY1, _RC)
       call ESMF_HConfigAdd(hconfig_content, content=PVALUE5, addKeyString=KEY5, _RC)
       call ESMF_HConfigAdd(parent, content=hconfig_content, addKeyString=MAPLKEY, _RC)