Merge branch 'release/MAPL-v3' into bugfix/pchakrab/grid-get-temp-fix

Author: pchakraborty

generic3g/tests/Test_Scenarios.pf

@@ -273,7 +273,7 @@ contains
 
          msg = comp_path // '::' // state_intent
 
-         state_items = ESMF_HConfigCreateAt(comp_expectations,keyString=state_intent,_RC)
+         state_items = ESMF_HConfigCreateAt(comp_expectations, keyString=state_intent,_RC)
          @assertTrue(ESMF_HConfigIsMap(state_items), msg)
 
          hconfigIter = ESMF_HConfigIterBegin(state_items)
@@ -397,8 +397,8 @@ contains
 
       msg = short_name // ':: '// description
 
-      call ESMF_StateGet(state, short_name, itemtype=itemtype, _RC)
-      if (itemtype /= ESMF_STATEITEM_FIELD) then
+      itemtype = get_itemtype(state, short_name, _RC)
+      if (itemtype /= ESMF_STATEITEM_FIELD) then ! that's ok
          rc = 0
          return
       end if
@@ -440,8 +440,8 @@ contains
 
       msg = description
 
-      call ESMF_StateGet(state, short_name, itemtype=itemtype, _RC)
-      if (itemtype /= ESMF_STATEITEM_FIELD) then
+      itemtype = get_itemtype(state, short_name, _RC)
+      if (itemtype /= ESMF_STATEITEM_FIELD) then ! that's ok
          rc = 0
          return
       end if
@@ -463,7 +463,7 @@ contains
 
       call ESMF_StateGet(state, short_name, field, _RC)
       call ESMF_FieldGet(field, typekind=found_field_typekind, _RC)
-      msg = msg // ' field typekind: '
+      msg = msg // short_name
       @assert_that(msg, expected_field_typekind == found_field_typekind, is(true()))
 
       rc = 0

generic3g/tests/scenarios/history_wildcard/expectations.yaml

@@ -30,7 +30,7 @@
 - component: root
   export:
     A/E_A1: {status: complete}
-    A/E_A2: {status: empty}
+    A/E_A2: {status: complete}
     B/E_B1: {status: empty}
     B/E_B2: {status: complete}
 

generic3g/tests/scenarios/precision_extension/expectations.yaml

@@ -36,8 +36,8 @@
 - component: <root>
   export:
     A/E_A1: {status: complete, typekind: R4, value: 1., rank: 2}
-    A/E_A3: {status: complete, typekind: R4, value: 7., rank: 2}
+    A/E_A3: {status: complete, typekind: R8, value: 7., rank: 2}
     A/E_A1(1): {status: complete, typekind: R8, value: 1., rank: 2}
-    A/E_A3(1): {status: complete, typekind: R8, value: 7., rank: 2}
+    A/E_A3(1): {status: complete, typekind: R4, value: 7., rank: 2}
     B/E_B2: {status: complete, typekind: R4, value: 5., rank: 2}
     B/E_B2(1): {status: complete, typekind: R8, value: 5., rank: 2}