Sync with ESCOMP/CDEPS (2025-03-23)

cime_config/stream_cdeps.py

@@ -336,6 +336,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

@@ -27,9 +27,8 @@ module cdeps_datm_comp
   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_const_mod    , only : shr_const_cday
-  use shr_sys_mod      , only : shr_sys_abort
   use shr_cal_mod      , only : shr_cal_ymd2date
-  use shr_log_mod      , only : shr_log_setLogUnit
+  use shr_log_mod      , only : shr_log_setLogUnit, shr_log_error
   use dshr_methods_mod , only : dshr_state_diagnose, chkerr, memcheck
   use dshr_strdata_mod , only : shr_strdata_type, shr_strdata_init_from_config, shr_strdata_advance
   use dshr_strdata_mod , only : shr_strdata_get_stream_pointer, shr_strdata_setOrbs
@@ -63,7 +62,7 @@ module cdeps_datm_comp
   use datm_datamode_gefs_mod    , only : datm_datamode_gefs_advertise
   use datm_datamode_gefs_mod    , only : datm_datamode_gefs_init_pointers
   use datm_datamode_gefs_mod    , only : datm_datamode_gefs_advance
-  
+
   use datm_datamode_simple_mod  , only : datm_datamode_simple_advertise
   use datm_datamode_simple_mod  , only : datm_datamode_simple_init_pointers
   use datm_datamode_simple_mod  , only : datm_datamode_simple_advance
@@ -263,14 +262,16 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
        open (newunit=nu,file=trim(nlfilename),status="old",action="read")
        call shr_nl_find_group_name(nu, 'datm_nml', status=ierr)
        if (ierr > 0) then
-          write(logunit,*) 'ERROR: reading input namelist, '//trim(nlfilename)//' iostat=',ierr
-          call shr_sys_abort(subName//': namelist read error '//trim(nlfilename))
+          rc = ierr
+          call shr_log_error(subName//': namelist read error '//trim(nlfilename), rc=rc)
+          return
        end if
        read (nu,nml=datm_nml,iostat=ierr)
        close(nu)
        if (ierr > 0) then
-          write(logunit,*) 'ERROR: reading input namelist, '//trim(nlfilename)//' iostat=',ierr
-          call shr_sys_abort(subName//': namelist read error '//trim(nlfilename))
+          rc = ierr
+          call shr_log_error(subName//': namelist read error '//trim(nlfilename), rc=rc)
+          return
        end if
        bcasttmp = 0
        bcasttmp(1) = nx_global
@@ -324,7 +325,8 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
     else if (nextsw_cday_calc == 'cam6') then
        nextsw_cday_calc_cam7 = .false.
     else
-       call shr_sys_abort(' ERROR illegal datm nextsw_cday_calc = '//trim(nextsw_cday_calc))
+       call shr_log_error(' ERROR illegal datm nextsw_cday_calc = '//trim(nextsw_cday_calc), rc=rc)
+       return
     end if
 
     ! write namelist input to standard out
@@ -360,7 +362,8 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
          trim(datamode) == 'ERA5'         .or. &
          trim(datamode) == 'SIMPLE') then
     else
-       call shr_sys_abort(' ERROR illegal datm datamode = '//trim(datamode))
+       call shr_log_error(' ERROR illegal datm datamode = '//trim(datamode), rc=rc)
+       return
     endif
 
     ! Advertise datm fields
@@ -488,7 +491,8 @@ subroutine InitializeRealize(gcomp, importState, exportState, clock, rc)
     if (isPresent .and. isSet) then
        read (cvalue,*) flds_scalar_index_nextsw_cday
     else
-       call shr_sys_abort(subname//'Need to set attribute ScalarFieldIdxNextSwCday')
+       call shr_log_error(subname//'Need to set attribute ScalarFieldIdxNextSwCday', rc=rc)
+       return
     endif
 
     nextsw_cday = getNextRadCDay(dayofYear, current_tod, stepno, idt, iradsw)
@@ -646,7 +650,8 @@ subroutine datm_comp_run(gcomp, importState, exportState, target_ymd, target_tod
              call dshr_restart_read(restfilm, rpfile, logunit, my_task, mpicom, sdat, rc)
              if (ChkErr(rc,__LINE__,u_FILE_u)) return
           case default
-             call shr_sys_abort(subName//'datamode '//trim(datamode)//' not recognized')
+             call shr_log_error(subName//'datamode '//trim(datamode)//' not recognized', rc=rc)
+             return
           end select
        end if
 
@@ -714,7 +719,8 @@ subroutine datm_comp_run(gcomp, importState, exportState, target_ymd, target_tod
                my_task, sdat, rc)
           if (ChkErr(rc,__LINE__,u_FILE_u)) return
        case default
-          call shr_sys_abort(subName//'datamode '//trim(datamode)//' not recognized')
+          call shr_log_error(subName//'datamode '//trim(datamode)//' not recognized', rc=rc)
+          return
        end select
     end if
 
@@ -817,7 +823,8 @@ subroutine datm_init_dfields(rc)
             case('cpl_scalars')
                continue
             case default
-               call shr_sys_abort(subName//'field '//trim(lfieldnames(n))//' not recognized')
+               call shr_log_error(subName//'field '//trim(lfieldnames(n))//' not recognized', rc=rc)
+               return
             end select
          end if
       end do

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,19 @@ def _get_neon_data_availability(case, neonsite):
     expect(newestdate, "No tower data found on server for NEON site {}".format(neonsite))
     return None
 
+####################################################################################
+def _check_datm_af_mismatch(anomaly_forcing, datm_mode):
+####################################################################################
+
+    # CMIP5 and CMIP6 anomalies were only generated relative to GSWP3v1
+    is_cmip5_or_6 = any(x in anomaly_forcing for x in ["cmip5", "cmip6"])
+    if is_cmip5_or_6 and datm_mode != "CLMGSWP3v1":
+        raise SystemExit(
+            "CMIP5 and CMIP6 anomalies were only generated relative for DATM_MODE CLMGSWP3v1."
+            " To fix this error, do: ./xmlchange DATM_MODE=CLMGSWP3v1"
+        )
+
+
 # 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 +129,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 +150,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 +193,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 +232,11 @@ 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":
+        _check_datm_af_mismatch(anomaly_forcing[0], datm_mode)
         streamlist += anomaly_forcing
 
     # Generate datm.streams.xml