diff --git a/cime_config/allactive/config_compsets.xml b/cime_config/allactive/config_compsets.xml index b0f8b3139e3b..d135f4bdc522 100755 --- a/cime_config/allactive/config_compsets.xml +++ b/cime_config/allactive/config_compsets.xml @@ -41,33 +41,33 @@ WCYCL1850 - 1850SOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV + 1850SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI_MPASO_MOSART_SGLC_SWAV WCYCL1850_chemUCI-Linozv3 - 1850SOI_EAM%CHEMUCI-LINOZV3_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV + 1850SOI_EAM%CHEMUCI-LINOZV3_ELM%CNPRDCTCBCTOP_MPASSI_MPASO_MOSART_SGLC_SWAV WCYCL1850_chemUCI-Linozv3-mam5 - 1850SOI_EAM%CHEMUCI-LINOZV3-MAM5_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV + 1850SOI_EAM%CHEMUCI-LINOZV3-MAM5_ELM%CNPRDCTCBCTOP_MPASSI_MPASO_MOSART_SGLC_SWAV WCYCL1850-1pctCO2 - 1850SOI_EAM%CMIP6-1pctCO2_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV + 1850SOI_EAM%CMIP6-1pctCO2_ELM%CNPRDCTCBCTOP_MPASSI_MPASO_MOSART_SGLC_SWAV WCYCL1850-4xCO2 - 1850SOI_EAM%CMIP6-4xCO2_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV + 1850SOI_EAM%CMIP6-4xCO2_ELM%CNPRDCTCBCTOP_MPASSI_MPASO_MOSART_SGLC_SWAV WCYCL1850NS - 1850_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV + 1850_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI_MPASO_MOSART_SGLC_SWAV @@ -77,7 +77,7 @@ WCYCL20TR - 20TRSOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV + 20TRSOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI_MPASO_MOSART_SGLC_SWAV @@ -108,7 +108,7 @@ WCYCL20TR_chemUCI-Linozv3-mam5 - 20TRSOI_EAM%CHEMUCI-LINOZV3-MAM5_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_SWAV + 20TRSOI_EAM%CHEMUCI-LINOZV3-MAM5_ELM%CNPRDCTCBCTOP_MPASSI_MPASO_MOSART_SGLC_SWAV diff --git a/cime_config/testmods_dirs/allactive/wcprod_1850/user_nl_elm b/cime_config/testmods_dirs/allactive/wcprod_1850/user_nl_elm index 152bba7477b1..0bbfbeea61bc 100644 --- a/cime_config/testmods_dirs/allactive/wcprod_1850/user_nl_elm +++ b/cime_config/testmods_dirs/allactive/wcprod_1850/user_nl_elm @@ -1,4 +1,5 @@ - finidat = '$DIN_LOC_ROOT/lnd/clm2/initdata_map/clmi.WCYCL1850.ne30pg2_EC30to60E2r2.SMS_Ld1.c20230213.nc' +! Finidat to be updated, The one below not compatible with v3 lnd config (with TOP and BGC mode, new grid) +! finidat = '$DIN_LOC_ROOT/lnd/clm2/initdata_map/clmi.WCYCL1850.ne30pg2_EC30to60E2r2.SMS_Ld1.c20230213.nc' hist_dov2xy = .true.,.true. hist_fincl2 = 'H2OSNO', 'FSNO', 'QRUNOFF', 'QSNOMELT', 'FSNO_EFF', 'SNORDSL', 'SNOW', 'FSDS', 'FSR', 'FLDS', 'FIRE', 'FIRA' hist_mfilt = 1,365 diff --git a/cime_config/testmods_dirs/allactive/wcprod_1850_1pctCO2/user_nl_elm b/cime_config/testmods_dirs/allactive/wcprod_1850_1pctCO2/user_nl_elm index 8ee13ffbb9cd..c8d35999c0a5 100644 --- a/cime_config/testmods_dirs/allactive/wcprod_1850_1pctCO2/user_nl_elm +++ b/cime_config/testmods_dirs/allactive/wcprod_1850_1pctCO2/user_nl_elm @@ -1,4 +1,5 @@ - finidat = '$DIN_LOC_ROOT/lnd/clm2/initdata_map/clmi.WCYCL1850-1pctCO2.ne30pg2_EC30to60E2r2.SMS_Ld1.c20230213.nc' +! Finidat to be updated, The one below not compatible with v3 lnd config (with TOP and BGC mode, new grid) +! finidat = '$DIN_LOC_ROOT/lnd/clm2/initdata_map/clmi.WCYCL1850-1pctCO2.ne30pg2_EC30to60E2r2.SMS_Ld1.c20230213.nc' hist_dov2xy = .true.,.true. hist_fincl2 = 'H2OSNO', 'FSNO', 'QRUNOFF', 'QSNOMELT', 'FSNO_EFF', 'SNORDSL', 'SNOW', 'FSDS', 'FSR', 'FLDS', 'FIRE', 'FIRA' hist_mfilt = 1,365 diff --git a/cime_config/testmods_dirs/allactive/wcprod_1850_4xCO2/user_nl_elm b/cime_config/testmods_dirs/allactive/wcprod_1850_4xCO2/user_nl_elm index 8ab36f2a87b4..4379fd5e4fe1 100644 --- a/cime_config/testmods_dirs/allactive/wcprod_1850_4xCO2/user_nl_elm +++ b/cime_config/testmods_dirs/allactive/wcprod_1850_4xCO2/user_nl_elm @@ -1,4 +1,5 @@ - finidat = '$DIN_LOC_ROOT/lnd/clm2/initdata_map/clmi.WCYCL1850-4xCO2.ne30pg2_EC30to60E2r2.SMS_Ld1.c20230213.nc' +! Finidat to be updated, The one below not compatible with v3 lnd config (with TOP and BGC mode, new grid) +! finidat = '$DIN_LOC_ROOT/lnd/clm2/initdata_map/clmi.WCYCL1850-4xCO2.ne30pg2_EC30to60E2r2.SMS_Ld1.c20230213.nc' hist_dov2xy = .true.,.true. hist_fincl2 = 'H2OSNO', 'FSNO', 'QRUNOFF', 'QSNOMELT', 'FSNO_EFF', 'SNORDSL', 'SNOW', 'FSDS', 'FSR', 'FLDS', 'FIRE', 'FIRA' hist_mfilt = 1,365 diff --git a/cime_config/testmods_dirs/allactive/wcprod_1850_r05/user_nl_elm b/cime_config/testmods_dirs/allactive/wcprod_1850_r05/user_nl_elm index 230ab93e4fa7..9974e1edeb95 100644 --- a/cime_config/testmods_dirs/allactive/wcprod_1850_r05/user_nl_elm +++ b/cime_config/testmods_dirs/allactive/wcprod_1850_r05/user_nl_elm @@ -1,4 +1,5 @@ - finidat = '${DIN_LOC_ROOT}/lnd/clm2/initdata_map/clmi.WCYCL1850.ne30pg2_r05_EC30to60E2r2.SMS_Ld1.c20230213.nc' +! Finidat to be updated, The one below not compatible with v3 lnd config (with TOP and BGC mode, new grid) +! finidat = '${DIN_LOC_ROOT}/lnd/clm2/initdata_map/clmi.WCYCL1850.ne30pg2_r05_EC30to60E2r2.SMS_Ld1.c20230213.nc' hist_dov2xy = .true.,.true. hist_fincl2 = 'H2OSNO', 'FSNO', 'QRUNOFF', 'QSNOMELT', 'FSNO_EFF', 'SNORDSL', 'SNOW', 'FSDS', 'FSR', 'FLDS', 'FIRE', 'FIRA' hist_mfilt = 1,365 diff --git a/cime_config/testmods_dirs/allactive/wcprodrrm_1850/user_nl_elm b/cime_config/testmods_dirs/allactive/wcprodrrm_1850/user_nl_elm index 69490dfc1033..8570ad3cf598 100644 --- a/cime_config/testmods_dirs/allactive/wcprodrrm_1850/user_nl_elm +++ b/cime_config/testmods_dirs/allactive/wcprodrrm_1850/user_nl_elm @@ -30,4 +30,5 @@ hist_nhtfrq = 0,-24 hist_avgflag_pertape = 'A','A' check_finidat_year_consistency = .false. - finidat = '${DIN_LOC_ROOT}/lnd/clm2/initdata_map/clmi.WCYCL1850.northamericax4v1pg2_WC14to60E2r3.SMS_PS.c20230213.nc' +! Finidat to be updated, The one below not compatible with v3 lnd config (with TOP and BGC mode, new grid) +! finidat = '${DIN_LOC_ROOT}/lnd/clm2/initdata_map/clmi.WCYCL1850.northamericax4v1pg2_WC14to60E2r3.SMS_PS.c20230213.nc' diff --git a/cime_config/testmods_dirs/allactive/wcprodssp/user_nl_elm b/cime_config/testmods_dirs/allactive/wcprodssp/user_nl_elm index 4f1d9ad9a5c0..ed03b5e2616d 100644 --- a/cime_config/testmods_dirs/allactive/wcprodssp/user_nl_elm +++ b/cime_config/testmods_dirs/allactive/wcprodssp/user_nl_elm @@ -1,7 +1,8 @@ ! 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. - finidat = "$DIN_LOC_ROOT/e3sm_init/V2.SSP370_SSP585.ne30pg2_EC30to60E2r2/v2.LR.historical_0101/2015-01-01-00000/v2.LR.historical_0101.elm.r.noNaN.2015-01-01-00000.nc" +! Finidat to be updated, The one below not compatible with v3 lnd config (with TOP and BGC mode, new grid) +! finidat = "$DIN_LOC_ROOT/e3sm_init/V2.SSP370_SSP585.ne30pg2_EC30to60E2r2/v2.LR.historical_0101/2015-01-01-00000/v2.LR.historical_0101.elm.r.noNaN.2015-01-01-00000.nc" hist_dov2xy = .true.,.true. hist_fincl2 = 'H2OSNO', 'FSNO', 'QRUNOFF', 'QSNOMELT', 'FSNO_EFF', 'SNORDSL', 'SNOW', 'FSDS', 'FSR', 'FLDS', 'FIRE', 'FIRA' hist_mfilt = 1,365 diff --git a/cime_config/tests.py b/cime_config/tests.py index 4e44d83d9107..667f85652342 100644 --- a/cime_config/tests.py +++ b/cime_config/tests.py @@ -213,8 +213,8 @@ #atmopheric tests to mimic low res production runs "e3sm_atm_prod" : { "tests" : ( - "SMS_Ln5.ne30pg2_r05_oECv3.F2010.eam-wcprod_F2010", - "SMS.ne30pg2_r05_oECv3.F20TR.eam-wcprod_F20TR", + "SMS_Ln5.ne30pg2_r05_IcoswISC30E3r5.F2010.eam-wcprod_F2010", + "SMS.ne30pg2_r05_IcoswISC30E3r5.F20TR.eam-wcprod_F20TR", ) }, @@ -348,10 +348,10 @@ "e3sm_prod" : { "inherit" : "e3sm_atm_prod", "tests" : ( - "SMS_Ld1.ne30pg2_r05_EC30to60E2r2.WCYCL1850.allactive-wcprod_1850_r05", - "SMS_Ld1.ne30pg2_EC30to60E2r2.WCYCL1850-1pctCO2.allactive-wcprod_1850_1pctCO2", - "SMS_Ld1.ne30pg2_EC30to60E2r2.WCYCL1850-4xCO2.allactive-wcprod_1850_4xCO2", - "SMS_Ld1.ne30pg2_EC30to60E2r2.WCYCL1850.allactive-wcprod_1850", + "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.allactive-wcprod_1850_r05", + "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850-1pctCO2.allactive-wcprod_1850_1pctCO2", + "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850-4xCO2.allactive-wcprod_1850_4xCO2", + "SMS_Ld1.ne30pg2_r05_IcoswISC30E3r5.WCYCL1850.allactive-wcprod_1850", "SMS_Ld1.ne30pg2_EC30to60E2r2.WCYCLSSP370.allactive-wcprodssp", "SMS_Ld1.ne30pg2_EC30to60E2r2.WCYCLSSP585.allactive-wcprodssp", "SMS_PS.northamericax4v1pg2_WC14to60E2r3.WCYCL1850.allactive-wcprodrrm_1850", diff --git a/components/eam/cime_config/config_compsets.xml b/components/eam/cime_config/config_compsets.xml index 00752b3aa361..894ecccea05d 100644 --- a/components/eam/cime_config/config_compsets.xml +++ b/components/eam/cime_config/config_compsets.xml @@ -18,7 +18,7 @@ F1850 - 1850_EAM%CMIP6_ELM%SPBC_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV + 1850_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV @@ -38,7 +38,7 @@ F20TR - 20TR_EAM%CMIP6_ELM%SPBC_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV + 20TR_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV @@ -48,7 +48,7 @@ F2010 - 2010_EAM%CMIP6_ELM%SPBC_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV + 2010_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI%PRES_DOCN%DOM_MOSART_SGLC_SWAV diff --git a/components/elm/bld/ELMBuildNamelist.pm b/components/elm/bld/ELMBuildNamelist.pm index fd1cf170cfee..2d2fc0db857b 100755 --- a/components/elm/bld/ELMBuildNamelist.pm +++ b/components/elm/bld/ELMBuildNamelist.pm @@ -2309,7 +2309,7 @@ sub setup_logic_create_crop_landunit { my ($test_files, $nl_flags, $definition, $defaults, $nl, $physv) = @_; add_default($test_files, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'create_crop_landunit', - 'use_crop'=>$nl_flags->{'use_crop'}, 'hgrid'=>$nl_flags->{'res'}, 'use_cn'=>$nl_flags->{'use_cn'}); + 'use_crop'=>$nl_flags->{'use_crop'}, 'hgrid'=>$nl_flags->{'res'}, 'use_cn'=>$nl_flags->{'use_cn'}, 'use_top_solar_rad'=>$nl->get_value('use_top_solar_rad')); } #------------------------------------------------------------------------------- diff --git a/components/elm/bld/namelist_files/namelist_defaults.xml b/components/elm/bld/namelist_files/namelist_defaults.xml index 0d2bfbc4b326..0a848c782c56 100644 --- a/components/elm/bld/namelist_files/namelist_defaults.xml +++ b/components/elm/bld/namelist_files/namelist_defaults.xml @@ -426,6 +426,8 @@ lnd/clm2/surfdata_map/surfdata_ne4pg2_simyr1850_c210722_with_TOP.nc lnd/clm2/surfdata_map/surfdata_ne240np4_simyr1850_c170821.nc lnd/clm2/surfdata_map/surfdata_0.5x0.5_simyr1850_c200609_with_TOP.nc + +lnd/clm2/surfdata_map/surfdata_0.5x0.5_simyr1850_c200609_with_TOP.nc lnd/clm2/surfdata_map/surfdata_0.5x0.5_simyr1850_c211019.nc @@ -862,6 +864,7 @@ this mask will have smb calculated over the entire global land surface .true. .false. +.false. .true. diff --git a/components/elm/bld/namelist_files/use_cases/20thC_CMIP6_transient.xml b/components/elm/bld/namelist_files/use_cases/20thC_CMIP6_transient.xml index 8b8bded7b1d8..651a7d523835 100644 --- a/components/elm/bld/namelist_files/use_cases/20thC_CMIP6_transient.xml +++ b/components/elm/bld/namelist_files/use_cases/20thC_CMIP6_transient.xml @@ -37,6 +37,8 @@ lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_simyr1850_2015_c20171018.nc lnd/clm2/initdata_map/20180316.DECKv1b_A1.ne30_oEC.edison.clm2.r.1980-01-01-00000.8575c3f_c20190904.nc +lnd/clm2/surfdata_map/landuse.timeseries_0.5x0.5_hist_simyr1850-2015_c191004.nc + lnd/clm2/surfdata_map/landuse.timeseries_ne120np4_historical_simyr1850-2015_c190904.nc lnd/clm2/surfdata_map/surfdata_0.125x0.125_simyr1850_c190730.nc diff --git a/components/elm/cime_config/config_component.xml b/components/elm/cime_config/config_component.xml index ea02f3e93538..28920be52334 100755 --- a/components/elm/cime_config/config_component.xml +++ b/components/elm/cime_config/config_component.xml @@ -127,6 +127,8 @@ -bgc bgc -nutrient cnp -nutrient_comp_pathway rd -soil_decomp ctc -methane -bgc bgc -nutrient cn -nutrient_comp_pathway eca -soil_decomp ctc -methane -bgc bgc -nutrient cnp -nutrient_comp_pathway eca -soil_decomp ctc -methane + -bgc bgc -nutrient cnp -nutrient_comp_pathway rd -soil_decomp ctc -methane -solar_rad_scheme top + -bgc bgc -nutrient cn -nutrient_comp_pathway eca -soil_decomp century -methane -bgc bgc -nutrient cnp -nutrient_comp_pathway eca -soil_decomp century -methane diff --git a/components/ww3/cime_config/config_compsets.xml b/components/ww3/cime_config/config_compsets.xml index 1ae7184589eb..1fb44c188a63 100644 --- a/components/ww3/cime_config/config_compsets.xml +++ b/components/ww3/cime_config/config_compsets.xml @@ -46,7 +46,7 @@ WCYCL1850-WW3 - 1850SOI_EAM%CMIP6_ELM%SPBC_MPASSI_MPASO_MOSART_SGLC_WW3%sp36x36 + 1850SOI_EAM%CMIP6_ELM%CNPRDCTCBCTOP_MPASSI_MPASO_MOSART_SGLC_WW3%sp36x36