Merge branch 'benedict/atm/ssp585_revised' into maint-2.0 (PR #4887)

Added SSP370/585 tests and updated use_case files

Tests are added for SSP370 and SSP585.
Both are added for e3sm_prod tests, only SSP370 is added for e3sm_integration
as the two uses the same testmods settings (hybrid run from historical).

Changes are also added to ELM's SSP585 use case file to update fsurdat and
flanduse_timeseries entries to newest file versions that use the ne30.pg2 grid.

[BFB] no impact on existing tests. New baselines will be needed after this PR.

cime_config/testmods_dirs/allactive/wcprodssp/README

@@ -0,0 +1,9 @@
+Modifications (in shell_commands) to enable a hybrid run for SSP compsets
+(e.g., SSp370 or SSP585), starting from 2015-01-01 of v2.LR.historical_0101
+
+Other modifications (same as for wcprod) should result in a case that has the 
+same namelist settings as the water cycle production sims
+
+Run these for at least 1 day to see all output.
+Also use the CMIP6 compsets.
+If running longer, change the nhtfrq for the first history file.

cime_config/testmods_dirs/allactive/wcprodssp/shell_commands

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+ ./xmlchange --append CAM_CONFIG_OPTS='-cosp'
+
+ INPUTDATA_ROOT=`./xmlquery --value DIN_LOC_ROOT`
+
+ ./xmlchange RUN_TYPE="hybrid"
+ ./xmlchange GET_REFCASE="TRUE"
+ ./xmlchange RUN_REFCASE="v2.LR.historical_0101"
+ ./xmlchange RUN_REFDATE="2015-01-01"
+ ./xmlchange RUN_REFDIR=${INPUTDATA_ROOT}"/e3sm_init/V2.SSP370_SSP585.ne30pg2_EC30to60E2r2/v2.LR.historical_0101/2015-01-01-00000"
+
+ exit
+

cime_config/testmods_dirs/allactive/wcprodssp/user_nl_eam

@@ -0,0 +1,11 @@
+ nhtfrq =   -24,-24,-6,-6,-3,-24,-24
+ mfilt  = 1,30,120,120,240,30,1
+ avgflag_pertape = 'A','A','I','A','A','A','I'
+ fexcl1 = 'CFAD_SR532_CAL', 'LINOZ_DO3', 'LINOZ_DO3_PSC', 'LINOZ_O3CLIM', 'LINOZ_O3COL', 'LINOZ_SSO3', 'hstobie_linoz'
+ fincl1 = 'extinct_sw_inp','extinct_lw_bnd7','extinct_lw_inp','CLD_CAL', 'TREFMNAV', 'TREFMXAV'
+ fincl2 = 'FLUT','PRECT','U200','V200','U850','V850','Z500','OMEGA500','UBOT','VBOT','TREFHT','TREFHTMN:M','TREFHTMX:X','QREFHT','TS','PS','TMQ','TUQ','TVQ','TOZ', 'FLDS', 'FLNS', 'FSDS', 'FSNS', 'SHFLX', 'LHFLX', 'TGCLDCWP', 'TGCLDIWP', 'TGCLDLWP', 'CLDTOT', 'T250', 'T200', 'T150', 'T100', 'T050', 'T025', 'T010', 'T005', 'T002', 'T001', 'TTOP', 'U250', 'U150', 'U100', 'U050', 'U025', 'U010', 'U005', 'U002', 'U001', 'UTOP', 'FSNT', 'FLNT'
+ fincl3 = 'PSL','T200','T500','U850','V850','UBOT','VBOT','TREFHT', 'Z700', 'TBOT:M'
+ fincl4 = 'FLUT','U200','U850','PRECT','OMEGA500'
+ fincl5 = 'PRECT','PRECC','TUQ','TVQ','QFLX','SHFLX','U90M','V90M'
+ fincl6 = 'CLDTOT_ISCCP','MEANCLDALB_ISCCP','MEANTAU_ISCCP','MEANPTOP_ISCCP','MEANTB_ISCCP','CLDTOT_CAL','CLDTOT_CAL_LIQ','CLDTOT_CAL_ICE','CLDTOT_CAL_UN','CLDHGH_CAL','CLDHGH_CAL_LIQ','CLDHGH_CAL_ICE','CLDHGH_CAL_UN','CLDMED_CAL','CLDMED_CAL_LIQ','CLDMED_CAL_ICE','CLDMED_CAL_UN','CLDLOW_CAL','CLDLOW_CAL_LIQ','CLDLOW_CAL_ICE','CLDLOW_CAL_UN'
+ fincl7 = 'O3', 'PS', 'TROP_P'

cime_config/testmods_dirs/allactive/wcprodssp/user_nl_elm

@@ -0,0 +1,10 @@
+! fsurdat used is not the same file for the reference historical run (as recorded in elm.r's global attribute)
+
+ CHECK_FINIDAT_FSURDAT_CONSISTENCY       = .false.
+
+ hist_dov2xy = .true.,.true.
+ hist_fincl2 = 'H2OSNO', 'FSNO', 'QRUNOFF', 'QSNOMELT', 'FSNO_EFF', 'SNORDSL', 'SNOW', 'FSDS', 'FSR', 'FLDS', 'FIRE', 'FIRA'
+ hist_mfilt = 1,365
+ hist_nhtfrq = -24,-24
+ hist_avgflag_pertape = 'A','A'
+

cime_config/testmods_dirs/allactive/wcprodssp/user_nl_mosart

@@ -0,0 +1,4 @@
+ rtmhist_fincl2 = 'RIVER_DISCHARGE_OVER_LAND_LIQ'
+ rtmhist_mfilt = 1,365
+ rtmhist_ndens = 2
+ rtmhist_nhtfrq = -24,-24

cime_config/tests.py

@@ -182,6 +182,7 @@
         "tests"   : (
             "ERS.ne11_oQU240.WCYCL1850NS",
             "SMS_D_Ld1.ne30pg2_EC30to60E2r2.WCYCL1850.allactive-wcprod",
+            "SMS_D_Ld1.ne30pg2_EC30to60E2r2.WCYCLSSP370.allactive-wcprodssp",
             "ERS_Ld3.ne4_oQU240.F2010",
             #"ERT_Ld31.ne16_g37.B1850C5",#add this line back in with the new correct compset
             "NCK.ne11_oQU240.WCYCL1850NS",
@@ -244,6 +245,8 @@
         "tests"   : (
             "SMS_Ld1.ne30pg2_r05_EC30to60E2r2.WCYCL1850.allactive-wcprod",
             "SMS_Ld1.ne30pg2_EC30to60E2r2.WCYCL1850.allactive-wcprod",
+            "SMS_Ld1.ne30pg2_EC30to60E2r2.WCYCLSSP370.allactive-wcprodssp",
+            "SMS_Ld1.ne30pg2_EC30to60E2r2.WCYCLSSP585.allactive-wcprodssp",
             "SMS_PS.northamericax4v1pg2_WC14to60E2r3.WCYCL1850.allactive-wcprodrrm",
             )
         },

components/elm/bld/namelist_files/use_cases/2015-2100_SSP585_transient.xml

@@ -32,8 +32,8 @@
 
 <!-- CMIP6 DECK compsets -->
 
-<fsurdat>lnd/clm2/surfdata_map/surfdata_ne30np4_simyr1850_2015_c171018.nc </fsurdat>
-<flanduse_timeseries>lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_ssp5_rcp8.5_simyr2015-2100_c190411.nc</flanduse_timeseries>
+<fsurdat>lnd/clm2/surfdata_map/surfdata_ne30np4.pg2_simyr1850_2015_c211105.nc </fsurdat>
+<flanduse_timeseries>lnd/clm2/surfdata_map/landuse.timeseries_ne30pg2_SSP5_RCP85_simyr2015-2100_c220310.nc</flanduse_timeseries>
 <check_dynpft_consistency>.false.</check_dynpft_consistency>
 
 </namelist_defaults>