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

[WIP]: Various cleanup efforts from the cesm3_0_beta04 tags for testing and usability #2950

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open

[WIP]: Various cleanup efforts from the cesm3_0_beta04 tags for testing and usability #2950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
d6bbcc2
Update namelist_defaults with ne3np4 fsurdat/landuse files
slevis-lmwg Oct 16, 2024
d48575b
Add ne3np4 fsurdat/landuse generation to Makefile
slevis-lmwg Oct 16, 2024
8002a9d
Small important correction to namelist_defaults_ctsm.xml
slevis-lmwg Oct 16, 2024
8f6905c
Add build-namelist tests for ne3np4 same as existing ne3np4.pg3
slevis-lmwg Oct 16, 2024
23bb341
Update namelist_defaults with ne3np4 fsurdat/landuse files
slevis-lmwg Oct 16, 2024
7254256
Add ne3np4 fsurdat/landuse generation to Makefile
slevis-lmwg Oct 16, 2024
99dd05a
Small important correction to namelist_defaults_ctsm.xml
slevis-lmwg Oct 16, 2024
68eec54
Add build-namelist tests for ne3np4 same as existing ne3np4.pg3
slevis-lmwg Oct 16, 2024
f1f3be7
Change ptsRLA and ptsRLO tests to ne3 in testlist_clm.xml
slevis-lmwg Oct 23, 2024
f37d0b5
Merge remote-tracking branch 'slevis-lmwg/ne3np4_to_defaults_and_make…
slevis-lmwg Oct 23, 2024
981c1b0
Updating the ptsRLA and ptsRLO tests to the correct ne3 grid
slevis-lmwg Oct 23, 2024
8dc7355
Merge branch 'cesm3_0_beta04_changes' into ne3np4_to_defaults_and_mak…
slevis-lmwg Oct 24, 2024
87afe5c
updates for ne3np4 scam
jtruesdal Nov 4, 2024
a389e6d
Merge branch 'cesm3_0_beta04_changes' into ne3np4_to_defaults_and_mak…
slevis-lmwg Nov 8, 2024
46015e9
ctsm warm_start mods
jtruesdal Dec 4, 2024
5f1c6d8
Bring back clm5-cam6 init_interp_attributes for ne0CONUS grid
slevis-lmwg Dec 5, 2024
8404f5c
Merge pull request #2901 from slevis-lmwg/fix_failing_ne0_tests
slevis-lmwg Dec 20, 2024
36d95e0
bug fix for scam clm warmstart - SCT cam6_prep now produces BFB resul…
jtruesdal Jan 11, 2025
1e43d01
Merge pull request #17 from jtruesdal/ctsm_warmstart
slevis-lmwg Jan 23, 2025
d013bf7
Merge remote-tracking branch 'escomp/master' into ne3np4_to_defaults_…
slevis-lmwg Jan 23, 2025
6cf536b
Replace comment explaining `allow_scm` with the correct one
slevis-lmwg Jan 24, 2025
af8cd54
Improve `allow_scm` comment further
slevis-lmwg Jan 24, 2025
5f8d812
Add comment explaining the read_noscm flag
slevis-lmwg Jan 24, 2025
52d77cc
Merge remote-tracking branch 'escomp/cesm3_0_beta04_changes' into ne3…
slevis-lmwg Feb 4, 2025
bcaab45
Merge pull request #2835 from slevis-lmwg/ne3np4_to_defaults_and_make…
slevis-lmwg Feb 4, 2025
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
16 changes: 14 additions & 2 deletions bld/namelist_files/namelist_defaults_ctsm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,6 +1103,12 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
>hgrid=ne0np4.ARCTICGRIS.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>

<!-- 2013 IC's - exact match for CONUS grid ... -->
<init_interp_attributes sim_year="2013" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam6.0"
hgrid="ne0np4CONUS.ne30x8" use_cn=".false." maxpft="17"
>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>

<!-- MPAS -->
<init_interp_attributes sim_year="2000" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam6.0"
hgrid="mpasa480"
Expand Down Expand Up @@ -1651,6 +1657,8 @@ lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_mpasa480_hist_2000_78pfts_c240908.nc</
<fsurdat hgrid="mpasa120" sim_year="2000">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_mpasa120_hist_2000_78pfts_c240908.nc</fsurdat>

<fsurdat hgrid="ne3np4" sim_year="2000">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4_hist_2000_78pfts_c240925.nc</fsurdat>
<fsurdat hgrid="ne3np4.pg3" sim_year="2000">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4.pg3_hist_2000_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="ne120np4.pg3" sim_year="2000">
Expand Down Expand Up @@ -1705,6 +1713,8 @@ lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne30np4.pg2_hist_1850_78pfts_c240908.n
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne30np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="ne3np4.pg3" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="ne3np4" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4_hist_1850_78pfts_c240925.nc</fsurdat>

<fsurdat hgrid="C96" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_C96_hist_1850_78pfts_c240908.nc</fsurdat>
Expand All @@ -1715,8 +1725,6 @@ lnd/clm2/surfdata_esmf/ctsm5.3.0/synthetic/surfdata_1x1_cidadinhoBR_synth_hist_2
<fsurdat hgrid="1x1_brazil" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_1x1_brazil_hist_1850_78pfts_c240912.nc</fsurdat>

<fsurdat hgrid="ne3np4.pg3" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="ne16np4.pg3" sim_year="1850">
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne16np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
<fsurdat hgrid="ne120np4.pg3" sim_year="1850">
Expand Down Expand Up @@ -1787,6 +1795,8 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.3.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
<flanduse_timeseries hgrid="mpasa120" sim_year_range="1850-2000"
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_mpasa120_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>

<flanduse_timeseries hgrid="ne3np4" sim_year_range="1850-2000"
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne3np4_SSP2-4.5_1850-2100_78pfts_c240926.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne3np4.pg3" sim_year_range="1850-2000"
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne3np4.pg3_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne16np4.pg3" sim_year_range="1850-2000"
Expand Down Expand Up @@ -1833,6 +1843,8 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.3.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
<flanduse_timeseries hgrid="mpasa120" sim_year_range="1850-2100" ssp_rcp="SSP2-4.5"
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_mpasa120_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>

<flanduse_timeseries hgrid="ne3np4" sim_year_range="1850-2100" ssp_rcp="SSP2-4.5"
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne3np4_SSP2-4.5_1850-2100_78pfts_c240926.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne3np4.pg3" sim_year_range="1850-2100" ssp_rcp="SSP2-4.5"
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne3np4.pg3_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
<flanduse_timeseries hgrid="ne16np4.pg3" sim_year_range="1850-2100" ssp_rcp="SSP2-4.5"
Expand Down
10 changes: 5 additions & 5 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 @@ -1490,7 +1490,7 @@ sub cat_and_create_namelistinfile {
print "========================================================================\n";

# Check for ALL resolutions with CLM50SP
my @resolutions = ( "360x720cru", "10x15", "4x5", "0.9x1.25", "1.9x2.5", "ne3np4.pg3", "ne16np4.pg3", "ne30np4", "ne30np4.pg2", "ne30np4.pg3", "ne120np4.pg3", "ne0np4CONUS.ne30x8", "ne0np4.ARCTIC.ne30x4", "ne0np4.ARCTICGRIS.ne30x8", "C96", "mpasa480", "mpasa120" );
my @resolutions = ( "360x720cru", "10x15", "4x5", "0.9x1.25", "1.9x2.5", "ne3np4", "ne3np4.pg3", "ne16np4.pg3", "ne30np4", "ne30np4.pg2", "ne30np4.pg3", "ne120np4.pg3", "ne0np4CONUS.ne30x8", "ne0np4.ARCTIC.ne30x4", "ne0np4.ARCTICGRIS.ne30x8", "C96", "mpasa480", "mpasa120" );
my @only2000_resolutions = ( "1x1_numaIA", "1x1_brazil", "1x1_mexicocityMEX", "1x1_vancouverCAN", "1x1_urbanc_alpha", "5x5_amazon", "0.125nldas2", "mpasa60", "mpasa15", "mpasa3p75" );
my @regional;
foreach my $res ( @resolutions ) {
Expand Down Expand Up @@ -1527,7 +1527,7 @@ sub cat_and_create_namelistinfile {
print " Test important resolutions for BGC and historical\n";
print "==================================================\n";

my @resolutions = ( "4x5", "10x15", "360x720cru", "ne30np4.pg3", "ne3np4.pg3", "1.9x2.5", "0.9x1.25", "C96", "mpasa120" );
my @resolutions = ( "4x5", "10x15", "360x720cru", "ne30np4.pg3", "ne3np4", "ne3np4.pg3", "1.9x2.5", "0.9x1.25", "C96", "mpasa120" );
my @regional;
my $nlbgcmode = "bgc";
my $mode = "$phys-$nlbgcmode";
Expand Down Expand Up @@ -1754,7 +1754,7 @@ sub cat_and_create_namelistinfile {
&cleanup();
}

my @crop_res = ( "1x1_numaIA", "4x5", "10x15", "0.9x1.25", "1.9x2.5", "ne3np4.pg3", "ne30np4", "ne30np4.pg3", "C96", "mpasa120" );
my @crop_res = ( "1x1_numaIA", "4x5", "10x15", "0.9x1.25", "1.9x2.5", "ne3np4", "ne3np4.pg3", "ne30np4", "ne30np4.pg3", "C96", "mpasa120" );
foreach my $res ( @crop_res ) {
$options = "-bgc bgc -crop -res $res -envxml_dir .";
&make_env_run();
Expand Down Expand Up @@ -1843,7 +1843,7 @@ sub cat_and_create_namelistinfile {
&cleanup();
}
# Transient ssp_rcp scenarios that work
my @tran_res = ( "4x5", "0.9x1.25", "1.9x2.5", "10x15", "360x720cru", "ne3np4.pg3", "ne16np4.pg3", "ne30np4.pg3", "C96", "mpasa120" );
my @tran_res = ( "4x5", "0.9x1.25", "1.9x2.5", "10x15", "360x720cru", "ne3np4", "ne3np4.pg3", "ne16np4.pg3", "ne30np4.pg3", "C96", "mpasa120" );
foreach my $usecase ( "1850-2100_SSP2-4.5_transient" ) {
my $startymd = 20150101;
foreach my $res ( @tran_res ) {
Expand Down Expand Up @@ -1880,7 +1880,7 @@ sub cat_and_create_namelistinfile {
"-bgc bgc -clm_demand flanduse_timeseries -sim_year 1850-2000 -namelist '&a start_ymd=18500101/'",
"-bgc bgc -envxml_dir . -namelist '&a use_c13=.true.,use_c14=.true.,use_c14_bombspike=.true./'" );
foreach my $clmopts ( @clmoptions ) {
my @clmres = ( "10x15", "4x5", "360x720cru", "0.9x1.25", "1.9x2.5", "ne3np4.pg3", "ne16np4.pg3", "ne30np4.pg3", "C96", "mpasa120" );
my @clmres = ( "10x15", "4x5", "360x720cru", "0.9x1.25", "1.9x2.5", "ne3np4", "ne3np4.pg3", "ne16np4.pg3", "ne30np4.pg3", "C96", "mpasa120" );
foreach my $res ( @clmres ) {
$options = "-res $res -envxml_dir . ";
&make_env_run( );
Expand Down
46 changes: 44 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 @@ -2109,6 +2109,16 @@
<option name="comment" >Also --nofireemis because this is a SP compset</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0POLARCAPne30x4_ne0POLARCAPne30x4_mt12" compset="IHistClm50Sp" testmods="clm/clm50cam6LndTuningMode_1979Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >POLARCAP test with clm50cam6"</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"/>
Expand All @@ -2120,6 +2130,17 @@
<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/clm50cam6LndTuningMode_1979Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >ARCTIC test with cam6"</option>
<option name="comment" >Clm50 because that is what CAM tests currently; remove when CAM tests for Clm60</option>
<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"/>
Expand All @@ -2141,6 +2162,17 @@
<option name="comment" >Also --nofireemis because this is a SP compset</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0ARCTICGRISne30x8_ne0ARCTICGRISne30x8_mt12" compset="IHistClm50Sp" testmods="clm/clm50cam6LndTuningMode_1979Start--clm/nofireemis">
<machines>
<machine name="derecho" compiler="intel" category="ctsm_sci"/>
</machines>
<options>
<option name="wallclock">00:20:00</option>
<option name="comment" >ARCTICGRIS test with cam6"</option>
<option name="comment" >Clm50 because that is what CAM tests currently; remove when CAM tests 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 Down Expand Up @@ -2171,6 +2203,16 @@
<option name="comment" >Also --nofireemis because this is a SP compset</option>
</options>
</test>
<test name="SMS_Ln9" grid="ne0CONUSne30x8_ne0CONUSne30x8_mt12" compset="IHistClm50Sp" testmods="clm/clm50cam6LndTuningMode_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 cam6"</option>
<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"/>
Expand Down Expand Up @@ -2280,7 +2322,7 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="SMS_D_Ld1_Mmpi-serial" grid="f45_f45_mg37" compset="I2000Clm50SpRs" testmods="clm/ptsRLA">
<test name="SMS_D_Ld1_Mmpi-serial" grid="ne3_ne3_mg37" compset="I2000Clm50SpRs" testmods="clm/ptsRLA">
<machines>
<machine name="derecho" compiler="intel" category="aux_clm"/>
<machine name="derecho" compiler="intel" category="aux_clm_mpi_serial"/>
Expand Down Expand Up @@ -2557,7 +2599,7 @@
<option name="wallclock">00:20:00</option>
</options>
</test>
<test name="SMS_D_Ld1_Mmpi-serial" grid="f45_f45_mg37" compset="I2000Clm50SpRs" testmods="clm/ptsROA">
<test name="SMS_D_Ld1_Mmpi-serial" grid="ne3_ne3_mg37" compset="I2000Clm50SpRs" testmods="clm/ptsROA">
<machines>
<machine name="izumi" compiler="gnu" category="aux_clm"/>
<machine name="izumi" compiler="gnu" category="aux_clm_mpi_serial"/>
Expand Down
4 changes: 2 additions & 2 deletions python/ctsm/toolchain/gen_mksurfdata_jobscript_multi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,11 +202,11 @@ def main():
"ultra_hi_res_no_crop": ["mpasa15", "mpasa3p75"],
"standard_res": ["360x720cru", "0.9x1.25", "1.9x2.5", "C96", "mpasa120"],
"standard_res_no_f09": ["360x720cru", "1.9x2.5", "C96", "mpasa120"],
"low_res": ["4x5", "10x15", "ne3np4.pg3"],
"low_res": ["4x5", "10x15", "ne3np4.pg3", "ne3np4"],
"mpasa480": ["mpasa480"],
"nldas_res": ["0.125nldas2"],
"5x5_amazon": ["5x5_amazon"],
"ne3": ["ne3np4.pg3"],
"ne3": ["ne3np4", "ne3np4.pg3"],
"ne16": ["ne16np4.pg3"],
"ne30": ["ne30np4.pg3", "ne30np4.pg2", "ne30np4"],
"ne0np4": [
Expand Down
4 changes: 2 additions & 2 deletions src/biogeochem/SatellitePhenologyMod.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ module SatellitePhenologyMod
use shr_log_mod , only : errMsg => shr_log_errMsg
use decompMod , only : bounds_type
use abortutils , only : endrun
use clm_varctl , only : iulog, use_lai_streams
use clm_varctl , only : iulog, use_lai_streams, single_column
use perf_mod , only : t_startf, t_stopf
use spmdMod , only : masterproc, mpicom, iam
use laiStreamMod , only : lai_init, lai_advance, lai_interp
Expand Down Expand Up @@ -311,7 +311,7 @@ subroutine readAnnualVegetation (bounds, canopystate_inst)
call ncd_pio_openfile (ncid, trim(locfn), 0)
call ncd_inqfdims (ncid, isgrid2d, ni, nj, ns)

if (ldomain%ns /= ns .or. ldomain%ni /= ni .or. ldomain%nj /= nj) then
if (.not. single_column .and. (ldomain%ns /= ns .or. ldomain%ni /= ni .or. ldomain%nj /= nj)) then
write(iulog,*)trim(subname), 'ldomain and input file do not match dims '
write(iulog,*)trim(subname), 'ldomain%ni,ni,= ',ldomain%ni,ni
write(iulog,*)trim(subname), 'ldomain%nj,nj,= ',ldomain%nj,nj
Expand Down
Loading