update to escomp cdeps1.0.83

.gitmodules

@@ -4,7 +4,7 @@
 [submodule "fox"]
 path = fox
 url = https://github.com/ESMCI/fox.git
-fxtag = 4.1.2.1
+fxtag = 4.1.2.4
 fxrequired = AlwaysRequired
 fxDONOTUSEurl = https://github.com/ESMCI/fox.git
 

cime_config/stream_cdeps.py

@@ -338,6 +338,11 @@ def create_stream_xml(
                         ),
                     )
                     if var_key in valid_values:
+
+                        # # Handle, e.g., 'bilinear' in namelist instead of bilinear (no quotes)
+                        mod_dict[var_key] = re.sub(r"[\"\']", "", mod_dict[var_key])
+
+                        # Check that key is valid
                         expect(
                             mod_dict[var_key] in valid_values[var_key],
                             "{} can only have values of {} for stream {} in file {}".format(

datm/atm_comp_nuopc.F90

@@ -26,6 +26,7 @@ module cdeps_datm_comp
   use NUOPC_Model      , only : model_label_Finalize    => label_Finalize
   use NUOPC_Model      , only : NUOPC_ModelGet, setVM
   use shr_kind_mod     , only : r8=>shr_kind_r8, i8=>shr_kind_i8, cl=>shr_kind_cl, cs=>shr_kind_cs
+  use shr_kind_mod     , only : cx=>shr_kind_cx
   use shr_const_mod    , only : shr_const_cday
   use shr_cal_mod      , only : shr_cal_ymd2date
   use shr_log_mod      , only : shr_log_setLogUnit, shr_log_error
@@ -100,11 +101,11 @@ module cdeps_datm_comp
   character(len=*) , parameter :: nullstr = 'null'
 
   ! datm_in namelist input
-  character(CL)                :: nlfilename = nullstr                ! filename to obtain namelist info from
-  character(CL)                :: streamfilename = nullstr            ! filename to obtain stream info from
+  character(CX)                :: nlfilename = nullstr                ! filename to obtain namelist info from
+  character(CX)                :: streamfilename = nullstr            ! filename to obtain stream info from
   character(CL)                :: dataMode = nullstr                  ! flags physics options wrt input data
-  character(CL)                :: model_meshfile = nullstr            ! full pathname to model meshfile
-  character(CL)                :: model_maskfile = nullstr            ! full pathname to obtain mask from
+  character(CX)                :: model_meshfile = nullstr            ! full pathname to model meshfile
+  character(CX)                :: model_maskfile = nullstr            ! full pathname to obtain mask from
   integer                      :: iradsw = 0                          ! radiation interval (input namelist)
   logical                      :: nextsw_cday_calc_cam7               ! true => use logic appropriate to cam7 (and later) for calculating nextsw_cday
   character(CL)                :: factorFn_mesh = 'null'              ! file containing correction factors mesh
@@ -118,7 +119,7 @@ module cdeps_datm_comp
   character(CL)                :: bias_correct = nullstr              ! send bias correction fields to coupler
   character(CL)                :: anomaly_forcing(8) = nullstr        ! send anomaly forcing fields to coupler
 
-  character(CL)                :: restfilm = nullstr                  ! model restart file namelist
+  character(CX)                :: restfilm = nullstr                  ! model restart file namelist
   integer                      :: nx_global                           ! global nx
   integer                      :: ny_global                           ! global ny
   logical                      :: skip_restart_read = .false.         ! true => skip restart read in continuation run
@@ -294,15 +295,15 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
     call ESMF_VMBroadcast(vm, anomaly_forcing, CL*8, main_task, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
-    call ESMF_VMBroadcast(vm, model_meshfile, CL, main_task, rc=rc)
+    call ESMF_VMBroadcast(vm, model_meshfile, CX, main_task, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
-    call ESMF_VMBroadcast(vm, model_maskfile, CL, main_task, rc=rc)
+    call ESMF_VMBroadcast(vm, model_maskfile, CX, main_task, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
     call ESMF_VMBroadcast(vm, factorFn_data, CL, main_task, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
     call ESMF_VMBroadcast(vm, factorFn_mesh, CL, main_task, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
-    call ESMF_VMBroadcast(vm, restfilm, CL, main_task, rc=rc)
+    call ESMF_VMBroadcast(vm, restfilm, CX, main_task, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return
     call ESMF_VMBroadcast(vm, nextsw_cday_calc, CL, main_task, rc=rc)
     if (ChkErr(rc,__LINE__,u_FILE_u)) return

datm/cime_config/buildnml

@@ -10,6 +10,7 @@
 # pylint: disable=wildcard-import,unused-wildcard-import,wrong-import-position
 
 import os, sys
+import re
 
 _CDEPS_CONFIG = os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir,os.pardir,"cime_config")
 _CIMEROOT = os.environ.get("CIMEROOT")
@@ -88,6 +89,7 @@ def _get_neon_data_availability(case, neonsite):
     expect(newestdate, "No tower data found on server for NEON site {}".format(neonsite))
     return None
 
+
 # pylint: disable=too-many-arguments,too-many-locals,too-many-branches,too-many-statements
 ####################################################################################
 def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path):
@@ -115,6 +117,7 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path
     atm_grid = case.get_value("ATM_GRID")
     model_grid = case.get_value("GRID")
     comp_lnd = case.get_value("COMP_LND")
+    compset = case.get_value("COMPSET")
 
     # Check for incompatible options.
     if "CLM" in datm_mode and comp_lnd == "clm":
@@ -135,6 +138,7 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path
     logger.debug("DATM preso3 mode is {}".format(datm_preso3))
     logger.debug("DATM topo mode is {}".format(datm_topo))
     logger.debug("CLM_USRDAT_NAME is {}".format(clm_usrdat_name))
+    logger.debug("COMPSET is {}".format(compset))
 
     # Initialize namelist defaults
     config = {}
@@ -177,6 +181,17 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path
 
     nmlgen.init_defaults(infile, config)
 
+    # Get anomaly forcing
+    # First, look in namelist
+    anomaly_forcing = nmlgen.get_value("anomaly_forcing")
+    if not anomaly_forcing or anomaly_forcing[0] is None:
+        # If not in namelist, check whether it's an SSP compset
+        ssp = re.search(r"^SSP\d+_DATM", compset)
+        if ssp:
+            ssp = ssp.group().replace("_DATM", "")
+            anomaly_forcing = ["Anomaly.Forcing.cmip6." + ssp.lower()]
+            nmlgen.set_value("anomaly_forcing", anomaly_forcing)
+
     # Generate datm_in
     namelist_file = os.path.join(confdir, "datm_in")
     nmlgen.write_output_file(namelist_file, data_list_path, groups=['datm_nml','const_forcing_nml'])
@@ -205,8 +220,10 @@ def _create_namelists(case, confdir, inst_string, infile, nmlgen, data_list_path
     bias_correct = nmlgen.get_value("bias_correct")
     if bias_correct is not None:
         streamlist.append(bias_correct)
+
+    # Set anomaly forcing in datm.streams.xml
     anomaly_forcing = nmlgen.get_value("anomaly_forcing")
-    if anomaly_forcing[0] is not None:
+    if anomaly_forcing[0] is not None and anomaly_forcing[0] != "none":
         streamlist += anomaly_forcing
 
     # Generate datm.streams.xml

datm/cime_config/config_archive.xml

@@ -4,7 +4,7 @@
     <rest_file_extension>rs1</rest_file_extension>
     <rest_history_varname>unset</rest_history_varname>
     <rpointer>
-      <rpointer_file>rpointer.atm$NINST_STRING</rpointer_file>
+      <rpointer_file>rpointer.atm$NINST_STRING.$DATENAME</rpointer_file>
       <rpointer_content >$CASE.datm$NINST_STRING.r.$DATENAME.nc,$CASE.datm$NINST_STRING.rs1.$DATENAME.bin</rpointer_content>
     </rpointer>
   </comp_archive_spec>

datm/cime_config/namelist_definition_datm.xml

@@ -238,7 +238,7 @@
     <type>char(10)</type>
     <category>datm</category>
     <group>datm_nml</group>
-    <valid_values>Anomaly.Forcing.Precip,Anomaly.Forcing.Temperature,Anomaly.Forcing.Pressure,Anomaly.Forcing.Humidity,Anomaly.Forcing.Uwind,Anomaly.Forcing.Vwind,Anomaly.Forcing.Shortwave,Anomaly.Forcing.Longwave</valid_values>
+    <valid_values>none,Anomaly.Forcing.cmip5.rcp45,Anomaly.Forcing.cmip6.ssp126,Anomaly.Forcing.cmip6.ssp245,Anomaly.Forcing.cmip6.ssp370,Anomaly.Forcing.cmip6.ssp585</valid_values>
     <desc>
       If set, include anomaly forcing streams in namelist.
     </desc>