Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix failing ne0CONUS, ne0ARCTIC tests #2805

Draft
wants to merge 8 commits into
base: b4b-dev
Choose a base branch
from
Draft

Fix failing ne0CONUS, ne0ARCTIC tests #2805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
53ea29c
Add init_interp_attributes for clm5_0_cam6.0 to namelist_defaults
slevis-lmwg Oct 2, 2024
1fd28b5
Add CONUS flanduse_timeseries for sim_year_range="1850-2000"
slevis-lmwg Oct 16, 2024
cf767a9
Add 20thC test to build-namelist_test.pl and update defaults accordingly
slevis-lmwg Oct 17, 2024
5dd623d
Add f19 20thC -no-crop test to build-namelist_test
slevis-lmwg Oct 17, 2024
fc3e5de
Similar changes as for CONUS, now for the ARCTIC grid
slevis-lmwg Oct 17, 2024
e35ba5a
Small correction to build-namelist_test.pl
slevis-lmwg Oct 17, 2024
b6a5186
Add ctsm_sci tests for the VR grids and aux_clm test for f19
slevis-lmwg Oct 17, 2024
41359b7
Adding 3 clm50cam7LNdTuningMode* testmods_dirs for the new tests
slevis-lmwg Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion bld/namelist_files/namelist_defaults_ctsm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,7 +1101,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
</init_interp_attributes>



<!-- matches for clm5_0 physics with CAM6.0 -->
<init_interp_attributes sim_year="2000" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam6.0"
hgrid="0.9x1.25"
Expand Down Expand Up @@ -1274,6 +1273,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
>hgrid=ne0np4CONUS.ne30x8 maxpft=17 mask=tx0.1v2 use_cn=.false. use_crop=.false. irrigate=.true. glc_nec=10 do_transient_pfts=.false. use_excess_ice=.false.
</init_interp_attributes>


<!--
1850 preindustrial IC (if use_init_interp is added and set to .true. then MUST still interpolate even on an exact match)
(if it will work on an exact match, leave use_init_interp off)
Expand Down Expand Up @@ -2036,6 +2036,10 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.3.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_0.9x1.25_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="1.9x2.5" sim_year_range="1850-2000"
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_1.9x2.5_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne0np4.ARCTIC.ne30x4" sim_year_range="1850-2000"
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne0np4.ARCTIC.ne30x4_SSP2-4.5_1979-2026_78pfts_c240908.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne0np4CONUS.ne30x8" sim_year_range="1850-2000"
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne0np4CONUS.ne30x8_SSP2-4.5_1979-2026_78pfts_c240908.nc</flanduse_timeseries>
<!-- Do we need both use_crop=".false." and ".true." for FATES transient? -->
<!-- As of 2024/02/02 the Grids Support spreadsheet includes no 16-pft landuse files. -->
<flanduse_timeseries hgrid="4x5" sim_year_range="1850-2000"
Expand Down
3 changes: 3 additions & 0 deletions bld/unit_testers/build-namelist_test.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,9 @@ sub cat_and_create_namelistinfile {
foreach my $options (
"--res 1.9x2.5 --mask gx1v7 --bgc sp --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam6.0 --infile empty_user_nl_clm",
"--res 1.9x2.5 --mask gx1v7 --bgc sp --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
"--res 1.9x2.5 --mask gx1v7 --bgc sp -no-crop --use_case 20thC_transient --namelist '&a start_ymd=19790101/' --lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
"--res ne0np4.ARCTIC.ne30x4 --mask tx0.1v2 -bgc sp -use_case 20thC_transient -namelist '&a start_ymd=19790101/' -lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
"--res ne0np4CONUS.ne30x8 --mask tx0.1v2 -bgc sp -use_case 20thC_transient -namelist '&a start_ymd=20130101/' -lnd_tuning_mode ${phys}_cam7.0 --infile empty_user_nl_clm",
) {
&make_env_run( 'LND_SETS_DUST_EMIS_DRV_FLDS'=>"FALSE" );
eval{ system( "$bldnml --envxml_dir . $options > $tempfile 2>&1 " ); };
Expand Down
34 changes: 32 additions & 2 deletions cime_config/testdefs/testlist_clm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2015,7 +2015,17 @@
<option name="comment" >Also --nofireemis because this is a SP compset</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0ARCTICne30x4_ne0ARCTICne30x4_mt12" compset="IHistClm60Sp" testmods="clm/clm60cam7LndTuningMode_1979Start--clm/nofireemis">
<test name="SMS_Ln9" grid="f19_f19_mg17" compset="IHistClm50Sp" testmods="clm/clm50cam7LndTuningMode_1979Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Run f19 for the same as the ne0ARCTIC case starting in 1979"</option>
<option name="comment" >Also --nofireemis because this is a SP compset</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0ARCTICne30x4_ne0ARCTICne30x4_mt12" compset="IHistClm50Sp" testmods="clm/clm50cam7LndTuningMode_1979Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
Expand All @@ -2025,6 +2035,16 @@
<option name="comment" >Also --nofireemis because this is a SP compset</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0ARCTICne30x4_ne0ARCTICne30x4_mt12" compset="IHistClm60Sp" testmods="clm/clm60cam7LndTuningMode_1979Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Repeat ARCTIC transient starting in 1979 for Clm60"</option>
<option name="comment" >Also --nofireemis because this is a SP compset</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0ARCTICGRISne30x8_ne0ARCTICGRISne30x8_mt12" compset="IHistClm60Sp" testmods="clm/clm60cam7LndTuningMode_1979Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
Expand All @@ -2044,7 +2064,7 @@
<option name="comment" >Run ARCTICGRIS for 1850 case (do not run this expensive test with every tag, but include it in the less frequent ctsm_sci testing)"</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" compset="IHistClm60Sp" testmods="clm/clm60cam7LndTuningMode_2013Start--clm/nofireemis">
<test name="SMS_Ln9" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" compset="IHistClm50Sp" testmods="clm/clm50cam7LndTuningMode_2013Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
Expand All @@ -2054,6 +2074,16 @@
<option name="comment" >Also --nofireemis because this is a SP compset</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" compset="IHistClm60Sp" testmods="clm/clm60cam7LndTuningMode_2013Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >Repeat CONUS transient starting in 2013 for Clm60"</option>
<option name="comment" >Also --nofireemis because this is a SP compset</option>
</options>
</test>
<!-- Historical science support for clm5_0 workhorse resolutions -->
<test name="SMS_Ld5" grid="f09_g17" compset="IHistClm50Sp" testmods="clm/nofire">
<machines>
Expand Down
1 change: 1 addition & 0 deletions cime_config/testdefs/testmods_dirs/clm/clm50cam7LndTuningMode/include_user_mods
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../default
5 changes: 5 additions & 0 deletions cime_config/testdefs/testmods_dirs/clm/clm50cam7LndTuningMode/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash

./xmlchange LND_TUNING_MODE="clm5_0_cam7.0"
./xmlchange ROF_NCPL='$ATM_NCPL'

1 change: 1 addition & 0 deletions cime_config/testdefs/testmods_dirs/clm/clm50cam7LndTuningMode_1979Start/include_user_mods
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../clm50cam7LndTuningMode
1 change: 1 addition & 0 deletions cime_config/testdefs/testmods_dirs/clm/clm50cam7LndTuningMode_1979Start/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./xmlchange RUN_STARTDATE=1979-01-01
1 change: 1 addition & 0 deletions cime_config/testdefs/testmods_dirs/clm/clm50cam7LndTuningMode_2013Start/include_user_mods
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../clm50cam7LndTuningMode
1 change: 1 addition & 0 deletions cime_config/testdefs/testmods_dirs/clm/clm50cam7LndTuningMode_2013Start/shell_commands
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./xmlchange RUN_STARTDATE=2013-01-01
Loading