Merge branch 'main' into add_gpu_gust

ESCOMP · Apr 17, 2023 · 8cccca6 · 8cccca6
2 parents 72c1230 + 22dbf82
commit 8cccca6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/cime_config/buildexe b/cime_config/buildexe
@@ -38,6 +38,7 @@ def _main_func():
         num_esp   = case.get_value("NUM_COMP_INST_ESP")
         ocn_model = case.get_value("COMP_OCN")
         gmake_args = get_standard_makefile_args(case)
+        link_libs = case.get_value("CAM_LINKED_LIBS", subgroup="build_component_cam")
         esmf_aware_threading = case.get_value("ESMF_AWARE_THREADING")
 
     # Determine valid components
@@ -65,6 +66,9 @@ def _main_func():
     if ocn_model == 'mom':
         gmake_args += "USE_FMS=TRUE"
 
+    if link_libs is not None:
+        gmake_args += 'USER_SLIBS="{}"'.format(link_libs)
+
     comp_classes = case.get_values("COMP_CLASSES")
     for comp in comp_classes:
         model = case.get_value("COMP_{}".format(comp))

diff --git a/cime_config/namelist_definition_drv.xml b/cime_config/namelist_definition_drv.xml
@@ -2156,25 +2156,25 @@
       <value samegrid_atm_lnd='true'>idmap</value>
     </values>
   </entry>
-  <entry id="lnd2rof_map">
+  <entry id="lnd2rof_map" modify_via_xml="LND2ROF_FMAPNAME">
     <type>char</type>
     <category>mapping</category>
     <input_pathname>abs</input_pathname>
     <group>MED_attributes</group>
-    <desc>lnd to rof mapping, 'unset' or 'idmap' are normal possible values</desc>
+    <desc>lnd to rof mapping, 'unset' or 'idmap' are normal possible values (mapping file given for mizuRoute grids)</desc>
     <values>
-      <value>unset</value>
+      <value>$LND2ROF_FMAPNAME</value>
       <value samegrid_lnd_rof='true'>idmap</value>
     </values>
   </entry>
-  <entry id="rof2lnd_map">
+  <entry id="rof2lnd_map" modify_via_xml="ROF2LND_FMAPNAME">
     <type>char</type>
     <category>mapping</category>
     <input_pathname>abs</input_pathname>
     <group>MED_attributes</group>
-    <desc>rof to lnd mapping, 'unset' or 'idmap' are normal possible values</desc>
+    <desc>rof to lnd mapping, 'unset' or 'idmap' are normal possible values (mapping file given for mizuRoute grids)</desc>
     <values>
-      <value>unset</value>
+      <value>$ROF2LND_FMAPNAME</value>
       <value samegrid_lnd_rof='true'>idmap</value>
     </values>
   </entry>

diff --git a/cime_config/testdefs/testlist_drv.xml b/cime_config/testdefs/testlist_drv.xml
@@ -189,7 +189,7 @@
   </test>
   <test compset="QPC6" grid="ne5pg3_ne5pg3_mg37" name="ERP_Vnuopc_Ln9" testmods="cam/outfrq9s_clubbmf">
     <machines>
-      <machine name="izumi" compiler="nag" category="aux_cam"/>
+      <machine name="izumi" compiler="nag" category="aux_cmeps"/>
     </machines>
     <options>
       <option name="wallclock">00:10:00</option>

diff --git a/mediator/esmFldsExchange_cesm_mod.F90 b/mediator/esmFldsExchange_cesm_mod.F90
@@ -1960,6 +1960,17 @@ subroutine esmFldsExchange_cesm(gcomp, phase, rc)
                mrg_from=compatm, mrg_fld='Faxa_dstdry', mrg_type='copy_with_weights', mrg_fracname='ofrac')
        end if
     end if
+    if (phase == 'advertise') then
+       call addfld_to(compocn, 'Faxa_ndep')
+       call addfld_from(compatm, 'Faxa_ndep')
+    else
+       if ( fldchk(is_local%wrap%FBImp(compatm,compatm), 'Faxa_ndep', rc=rc) .and. &
+            fldchk(is_local%wrap%FBExp(compocn)        , 'Faxa_ndep', rc=rc)) then
+          call addmap_from(compatm, 'Faxa_ndep', compocn, mapconsf, 'one', atm2ocn_map)
+          call addmrg_to(compocn, 'Faxa_ndep', &
+               mrg_from=compatm, mrg_fld='Faxa_ndep', mrg_type='copy')
+       end if
+    end if
 
     ! ---------------------------------------------------------------------
     ! to ocn: enthalpy from atm rain, snow, evaporation