Skip to content

Commit bcaab45

Browse files
authored
Merge pull request #2835 from slevis-lmwg/ne3np4_to_defaults_and_makefile
ne3np4 to namelist_defaults_ctsm.xml and Makefile for PTS mode and add ability for warm starts in PTS mode
2 parents 8404f5c + 52d77cc commit bcaab45

File tree

649 files changed

+1828
-717
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

649 files changed

+1828
-717
lines changed

.git-blame-ignore-revs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ d866510188d26d51bcd6d37239283db690af7e82
2727
e096358c832ab292ddfd22dd5878826c7c788968
2828
475831f0fb0e31e97f630eac4e078c886558b61c
2929
fd5f177131d63d39e79a13918390bdfb642d781e
30+
a51816e0de380300b69db9fc3e2c7fa83b267b64
3031
# Ran SystemTests and python/ctsm through black python formatter
3132
5364ad66eaceb55dde2d3d598fe4ce37ac83a93c
3233
8056ae649c1b37f5e10aaaac79005d6e3a8b2380
@@ -52,3 +53,4 @@ aa04d1f7d86cc2503b98b7e2b2d84dbfff6c316b
5253
045d90f1d80f713eb3ae0ac58f6c2352937f1eb0
5354
753fda3ff0147837231a73c9c728dd9ce47b5997
5455
f112ba0bbf96a61d5a4d354dc0dcbd8b0c68145c
56+
bd535c710db78420b8e8b9d71d88d8339e899c59

.gitmodules

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,79 +28,79 @@
2828
[submodule "fates"]
2929
path = src/fates
3030
url = https://github.com/NGEET/fates
31-
fxtag = sci.1.79.3_api.37.0.0
31+
fxtag = sci.1.80.4_api.37.0.0
3232
fxrequired = AlwaysRequired
3333
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
3434
fxDONOTUSEurl = https://github.com/NCAR/fates-release
3535

3636
[submodule "cism"]
3737
path = components/cism
3838
url = https://github.com/ESCOMP/CISM-wrapper
39-
fxtag = cismwrap_2_2_002
39+
fxtag = cismwrap_2_2_005
4040
fxrequired = ToplevelRequired
4141
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
4242
fxDONOTUSEurl = https://github.com/ESCOMP/CISM-wrapper
4343

4444
[submodule "rtm"]
4545
path = components/rtm
4646
url = https://github.com/ESCOMP/RTM
47-
fxtag = rtm1_0_80
47+
fxtag = rtm1_0_86
4848
fxrequired = ToplevelRequired
4949
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
5050
fxDONOTUSEurl = https://github.com/ESCOMP/RTM
5151

5252
[submodule "mosart"]
5353
path = components/mosart
5454
url = https://github.com/ESCOMP/MOSART
55-
fxtag = mosart1.1.02
55+
fxtag = mosart1.1.07
5656
fxrequired = ToplevelRequired
5757
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
5858
fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
5959

6060
[submodule "mizuRoute"]
6161
path = components/mizuRoute
6262
url = https://github.com/ESCOMP/mizuRoute
63-
fxtag = cesm-coupling.n02_v2.1.3
63+
fxtag = cesm-coupling.n03_v2.2.0
6464
fxrequired = ToplevelRequired
6565
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
6666
fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
6767

6868
[submodule "ccs_config"]
6969
path = ccs_config
7070
url = https://github.com/ESMCI/ccs_config_cesm.git
71-
fxtag = ccs_config_cesm1.0.10
71+
fxtag = ccs_config_cesm1.0.16
7272
fxrequired = ToplevelRequired
7373
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
7474
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
7575

7676
[submodule "cime"]
7777
path = cime
7878
url = https://github.com/ESMCI/cime
79-
fxtag = cime6.1.37
79+
fxtag = cime6.1.59
8080
fxrequired = ToplevelRequired
8181
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
8282
fxDONOTUSEurl = https://github.com/ESMCI/cime
8383

8484
[submodule "cmeps"]
8585
path = components/cmeps
8686
url = https://github.com/ESCOMP/CMEPS.git
87-
fxtag = cmeps1.0.16
87+
fxtag = cmeps1.0.33
8888
fxrequired = ToplevelRequired
8989
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
9090
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
9191

9292
[submodule "cdeps"]
9393
path = components/cdeps
9494
url = https://github.com/ESCOMP/CDEPS.git
95-
fxtag = cdeps1.0.53
95+
fxtag = cdeps1.0.61
9696
fxrequired = ToplevelRequired
9797
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
9898
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git
9999

100100
[submodule "share"]
101101
path = share
102102
url = https://github.com/ESCOMP/CESM_share
103-
fxtag = share1.1.2
103+
fxtag = share1.1.7
104104
fxrequired = ToplevelRequired
105105
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
106106
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share

README

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ cime_config/config_tests.xml ----- Define CTSM specific tests
126126
cime_config/config_pes.xml ------- Define Processor layouts for various CTSM grids and compsets
127127
cime_config/testdefs ------------- Directory for specification of CTSM testing
128128
cime_config/testdefs/ExpectedTestFails.xml -- List of tests that are expected to fail
129-
cime_config/usermods_dirs -------- Directories of sets of user-modification subdirs
129+
cime_config/usermods_dirs/clm ---- Directories of sets of user-modification subdirs
130130
(These are directories that add specific user modifications to
131-
simulations created using "cime/scripts/create_newcase --user-mods-dir".)
131+
simulations created using "cime/scripts/create_newcase --user-mods-dir clm/*)
132132

133133
tools/mksurfdata_esmf --------- Directory to build program to create surface dataset
134134
at any resolution.

WhatsNewInCTSM5.3.md

Lines changed: 29 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,48 @@
1-
Purpose and description of changes since ctsm5.2.005
2-
----------------------------------------------------
1+
# What's new in CTSM 5.3 (tag `ctsm5.3.0`)
32

4-
Bring in updates needed for the CESM3.0 science capability/functionality "chill". Most importantly bringing
5-
in: CN Matrix to speed up spinup for the BGC model, updated surface datasets, updated Leung 2023 dust emissions,
6-
explicit Air Conditioning for the Urban model, updates to crop calendars. For clm6_0 physics these options are now
7-
default turned on in addition to Sturm snow, and excess ice.
3+
## Purpose and description of changes since CTSM 5.2 (tag `ctsm5.2.005`)
4+
- Adds CN Matrix method to speed up spinup for the BGC model.
5+
- Updates surface datasets.
6+
- Brings in new Leung 2023 dust emissions.
7+
- Adds explicit air conditioning for the urban model.
8+
- Updates crop calendars.
9+
- Updates fire model with various improvements, including default parameterization against climate reanalysis from CRU-JRA instead of GSWP.
10+
- FATES compsets can now be run with transient land use.
811

9-
Changes to CTSM Infrastructure:
10-
===============================
12+
These changes were needed ahead of the CESM3 capability/functionality "chill". For `clm6_0` physics these options are now turned on by default, in addition to Sturm snow and excess ice.
1113

12-
- manage_externals removed and replaced by git-fleximod
13-
- Ability to handle CAM7 in LND_TUNING_MODE
14+
## Changes to CTSM infrastructure
15+
- `manage_externals` removed and replaced by `git-fleximod`
16+
- Ability to handle CAM7 in `LND_TUNING_MODE`
1417

15-
Changes to CTSM Answers:
16-
========================
18+
## Changes to CTSM answers
1719

18-
Changes to defaults for clm6_0 physics:
20+
Changes to defaults for `clm6_0` physics:
1921
- Urban explicit A/C turned on
20-
- Snow thermal conductivity is now Sturm_1997
21-
- New IC file for f09 1850
22+
- Snow thermal conductivity method is now `Sturm_1997`
23+
- New initial conditions file for f09 ("1-degree") 1850, with more in progress
2224
- New crop calendars
23-
- Dust emissions is now Leung_2023
25+
- Dust emissions method is now `Leung_2023`
2426
- Excess ice is turned on
25-
- Updates to MEGAN for BVOC's
27+
- Updates to MEGAN for BVOCs
2628
- Updates to BGC fire method
2729

2830
Changes for all physics versions:
29-
3031
- Parameter files updated
3132
- FATES parameter file updated
3233
- Glacier region 1 is now undefined
33-
- Update in FATES transient Land use
34+
- Update in FATES transient land use
3435
- Pass active glacier (CISM) runoff directly to river model (MOSART)
35-
- Add the option for using matrix for Carbon/Nitrogen BGC spinup
36+
- Add the option for using Matrix CN method for Carbon/Nitrogen BGC spinup
3637

37-
New surface datasets:
38-
=====================
38+
## New surface datasets
3939

40-
- With new surface datasets the following GLC fields have region "1" set to UNSET:
41-
glacier_region_behavior, glacier_region_melt_behavior, glacier_region_ice_runoff_behavior
40+
- With new surface datasets the following GLC fields have region "1" set to UNSET: glacier_region_behavior, glacier_region_melt_behavior, glacier_region_ice_runoff_behavior
4241
- Updates to allow creating transient landuse timeseries files going back to 1700.
43-
- Fix an important bug on soil fields that was there since ctsm5.2.0. This results in mksurfdata_esmf now giving identical answers with a change in number of processors, as it should.
44-
- Add in creation of ne0np4.POLARCAP.ne30x4 surface datasets.
45-
- Add version to the surface datasets.
46-
- Remove the --hires_pft option from mksurfdata_esmf as we don't have the datasets for it.
47-
- Remove VIC fields from surface datasets.
48-
49-
New input datasets to mksurfdata_esmf:
50-
======================================
51-
52-
- Updates in PFT/LAI/soil-color raw datasets (now from the TRENDY2024 timeseries that ends in 2023), as well as two fire datasets (AG fire, peatland), and the glacier behavior dataset.
42+
- Fix an important bug on soil fields that was there since `ctsm5.2.0`. This has the side effect of `mksurfdata_esmf` now giving identical answers with a change in number of processors, as it should.
43+
- Surface datasets now provided for the `ne0np4.POLARCAP.ne30x4` grid.
44+
- Surface datasets now have their version number embedded to prevent mismatch of surface dataset and CTSM version.
45+
- Remove the `--hires_pft` option from `mksurfdata_esmf` as we don't have the datasets for it.
46+
- Remove `VIC` fields from surface datasets.
47+
- Updates to input datasets in PFT/LAI/soil-color raw datasets (now from the TRENDY2024 timeseries that ends in 2023), as well as two fire datasets (crop fire peak month, peatland fraction), and the glacier behavior dataset.
5348

bld/CLMBuildNamelist.pm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3395,7 +3395,7 @@ sub setup_logic_mineral_nitrogen_dynamics {
33953395
#
33963396
my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;
33973397

3398-
my @vars = ( "freelivfix_slope_wet", "freelivfix_intercept" );
3398+
my @vars = ( "freelivfix_slope_wet", "freelivfix_intercept", "nfix_method" );
33993399
if ( &value_is_true($nl_flags->{'use_cn'}) && &value_is_true($nl->get_value('use_fun')) ) {
34003400
foreach my $var ( @vars ) {
34013401
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, $var,
@@ -3408,6 +3408,7 @@ sub setup_logic_mineral_nitrogen_dynamics {
34083408
}
34093409
}
34103410
}
3411+
34113412
}
34123413

34133414

@@ -5208,6 +5209,7 @@ sub write_output_files {
52085209
}
52095210
push @groups, "clm_humanindex_inparm";
52105211
push @groups, "cnmresp_inparm";
5212+
push @groups, "cnfun_inparm";
52115213
push @groups, "photosyns_inparm";
52125214
push @groups, "cnfire_inparm";
52135215
push @groups, "cn_general";

bld/namelist_files/namelist_defaults_ctsm.xml

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -524,10 +524,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
524524
<!-- The default filenames are given relative to the root directory
525525
for the CLM2 data in the CESM distribution -->
526526
<!-- Plant function types (relative to {csmdata}) -->
527-
<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c241017.nc</paramfile>
528-
<paramfile phys="clm5_1" >lnd/clm2/paramdata/ctsm51_params.c241017.nc</paramfile>
529-
<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c241017.nc</paramfile>
530-
<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c241017.nc</paramfile>
527+
<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c241119.nc</paramfile>
528+
<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c241119.nc</paramfile>
529+
<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c241119.nc</paramfile>
531530

532531
<!-- ================================================================== -->
533532
<!-- FATES default parameter file -->
@@ -1658,6 +1657,8 @@ lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_mpasa480_hist_2000_78pfts_c240908.nc</
16581657
<fsurdat hgrid="mpasa120" sim_year="2000">
16591658
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_mpasa120_hist_2000_78pfts_c240908.nc</fsurdat>
16601659

1660+
<fsurdat hgrid="ne3np4" sim_year="2000">
1661+
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4_hist_2000_78pfts_c240925.nc</fsurdat>
16611662
<fsurdat hgrid="ne3np4.pg3" sim_year="2000">
16621663
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4.pg3_hist_2000_78pfts_c240908.nc</fsurdat>
16631664
<fsurdat hgrid="ne120np4.pg3" sim_year="2000">
@@ -1712,6 +1713,8 @@ lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne30np4.pg2_hist_1850_78pfts_c240908.n
17121713
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne30np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
17131714
<fsurdat hgrid="ne3np4.pg3" sim_year="1850">
17141715
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
1716+
<fsurdat hgrid="ne3np4" sim_year="1850">
1717+
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4_hist_1850_78pfts_c240925.nc</fsurdat>
17151718

17161719
<fsurdat hgrid="C96" sim_year="1850">
17171720
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_C96_hist_1850_78pfts_c240908.nc</fsurdat>
@@ -1722,8 +1725,6 @@ lnd/clm2/surfdata_esmf/ctsm5.3.0/synthetic/surfdata_1x1_cidadinhoBR_synth_hist_2
17221725
<fsurdat hgrid="1x1_brazil" sim_year="1850">
17231726
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_1x1_brazil_hist_1850_78pfts_c240912.nc</fsurdat>
17241727

1725-
<fsurdat hgrid="ne3np4.pg3" sim_year="1850">
1726-
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
17271728
<fsurdat hgrid="ne16np4.pg3" sim_year="1850">
17281729
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne16np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
17291730
<fsurdat hgrid="ne120np4.pg3" sim_year="1850">
@@ -1794,6 +1795,8 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.3.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
17941795
<flanduse_timeseries hgrid="mpasa120" sim_year_range="1850-2000"
17951796
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_mpasa120_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
17961797

1798+
<flanduse_timeseries hgrid="ne3np4" sim_year_range="1850-2000"
1799+
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne3np4_SSP2-4.5_1850-2100_78pfts_c240926.nc</flanduse_timeseries>
17971800
<flanduse_timeseries hgrid="ne3np4.pg3" sim_year_range="1850-2000"
17981801
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne3np4.pg3_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
17991802
<flanduse_timeseries hgrid="ne16np4.pg3" sim_year_range="1850-2000"
@@ -1840,6 +1843,8 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.3.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
18401843
<flanduse_timeseries hgrid="mpasa120" sim_year_range="1850-2100" ssp_rcp="SSP2-4.5"
18411844
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_mpasa120_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
18421845

1846+
<flanduse_timeseries hgrid="ne3np4" sim_year_range="1850-2100" ssp_rcp="SSP2-4.5"
1847+
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne3np4_SSP2-4.5_1850-2100_78pfts_c240926.nc</flanduse_timeseries>
18431848
<flanduse_timeseries hgrid="ne3np4.pg3" sim_year_range="1850-2100" ssp_rcp="SSP2-4.5"
18441849
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne3np4.pg3_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
18451850
<flanduse_timeseries hgrid="ne16np4.pg3" sim_year_range="1850-2100" ssp_rcp="SSP2-4.5"
@@ -1900,6 +1905,8 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.3.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
19001905
<freelivfix_intercept use_fun=".true." use_cn=".true.">0.0117d00</freelivfix_intercept>
19011906
<freelivfix_slope_wet use_fun=".true." use_cn=".true.">0.0006d00</freelivfix_slope_wet>
19021907

1908+
<nfix_method>Houlton</nfix_method>
1909+
19031910
<br_root>0.83d-06</br_root>
19041911

19051912
<!-- Scalar of leaf respiration to vcmax (used for SP mode and with luna) (could vary with physics version) -->

bld/namelist_files/namelist_definition_ctsm.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,11 @@ Slope of free living Nitrogen fixation with annual ET
388388
Intercept of free living Nitrogen fixation with zero annual ET
389389
</entry>
390390

391+
<entry id="nfix_method" type="char*25" category="cnfun_inparm"
392+
group="cnfun_inparm" valid_values="Houlton,Bytnerowicz" value="Houlton" >
393+
Choice of nfix parameterization
394+
</entry>
395+
391396
<entry id="use_undercanopy_stability" type="logical" category="clm_physics"
392397
group="canopyfluxes_inparm" valid_values="" >
393398
If TRUE use the undercanopy stability term used with CLM4.5 (Sakaguchi&amp;Zeng, 2008)

bld/unit_testers/build-namelist_test.pl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ sub cat_and_create_namelistinfile {
368368
my $phys = "clm6_0";
369369
$mode = "-phys $phys";
370370
&make_config_cache($phys);
371-
my $neondir = "../../cime_config/usermods_dirs/NEON";
371+
my $neondir = "../../cime_config/usermods_dirs/clm/NEON";
372372
foreach my $site ( "ABBY", "BLAN", "CPER", "DEJU", "GRSM", "HEAL", "KONA", "LENO", "NIWO",
373373
"ONAQ", "PUUM", "SERC", "SRER", "TALL", "TREE", "WOOD", "BARR", "BONA",
374374
"DCFS", "DELA", "GUAN", "JERC", "KONZ", "MLBS", "NOGP", "ORNL", "RMNP",
@@ -421,7 +421,7 @@ sub cat_and_create_namelistinfile {
421421
my $phys = "clm6_0";
422422
$mode = "-phys $phys";
423423
&make_config_cache($phys);
424-
my $plumdir = "../../cime_config/usermods_dirs/PLUMBER2";
424+
my $plumdir = "../../cime_config/usermods_dirs/clm/PLUMBER2";
425425
foreach my $site (
426426
"AR-SLu", "AU-Emr", "AU-TTE", "CA-NS1", "CA-SF3", "CN-HaM", "DE-Obe", "ES-ES1", "FR-Gri", "IE-Dri", "IT-LMa", "IT-SRo", "RU-Fyo", "US-Aud", "US-Ho1", "US-Ne2", "US-Syv", "ZM-Mon",
427427
"AT-Neu", "AU-Gin", "AU-Tum", "CA-NS2", "CH-Cha", "CN-Qia", "DE-Seh", "ES-ES2", "FR-Hes", "IT-Amp", "IT-Mal", "JP-SMF", "RU-Zot", "US-Bar", "US-KS2", "US-Ne3", "US-Ton",
@@ -1490,7 +1490,7 @@ sub cat_and_create_namelistinfile {
14901490
print "========================================================================\n";
14911491

14921492
# Check for ALL resolutions with CLM50SP
1493-
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" );
1493+
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" );
14941494
my @only2000_resolutions = ( "1x1_numaIA", "1x1_brazil", "1x1_mexicocityMEX", "1x1_vancouverCAN", "1x1_urbanc_alpha", "5x5_amazon", "0.125nldas2", "mpasa60", "mpasa15", "mpasa3p75" );
14951495
my @regional;
14961496
foreach my $res ( @resolutions ) {
@@ -1527,7 +1527,7 @@ sub cat_and_create_namelistinfile {
15271527
print " Test important resolutions for BGC and historical\n";
15281528
print "==================================================\n";
15291529

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

1757-
my @crop_res = ( "1x1_numaIA", "4x5", "10x15", "0.9x1.25", "1.9x2.5", "ne3np4.pg3", "ne30np4", "ne30np4.pg3", "C96", "mpasa120" );
1757+
my @crop_res = ( "1x1_numaIA", "4x5", "10x15", "0.9x1.25", "1.9x2.5", "ne3np4", "ne3np4.pg3", "ne30np4", "ne30np4.pg3", "C96", "mpasa120" );
17581758
foreach my $res ( @crop_res ) {
17591759
$options = "-bgc bgc -crop -res $res -envxml_dir .";
17601760
&make_env_run();
@@ -1843,7 +1843,7 @@ sub cat_and_create_namelistinfile {
18431843
&cleanup();
18441844
}
18451845
# Transient ssp_rcp scenarios that work
1846-
my @tran_res = ( "4x5", "0.9x1.25", "1.9x2.5", "10x15", "360x720cru", "ne3np4.pg3", "ne16np4.pg3", "ne30np4.pg3", "C96", "mpasa120" );
1846+
my @tran_res = ( "4x5", "0.9x1.25", "1.9x2.5", "10x15", "360x720cru", "ne3np4", "ne3np4.pg3", "ne16np4.pg3", "ne30np4.pg3", "C96", "mpasa120" );
18471847
foreach my $usecase ( "1850-2100_SSP2-4.5_transient" ) {
18481848
my $startymd = 20150101;
18491849
foreach my $res ( @tran_res ) {
@@ -1880,7 +1880,7 @@ sub cat_and_create_namelistinfile {
18801880
"-bgc bgc -clm_demand flanduse_timeseries -sim_year 1850-2000 -namelist '&a start_ymd=18500101/'",
18811881
"-bgc bgc -envxml_dir . -namelist '&a use_c13=.true.,use_c14=.true.,use_c14_bombspike=.true./'" );
18821882
foreach my $clmopts ( @clmoptions ) {
1883-
my @clmres = ( "10x15", "4x5", "360x720cru", "0.9x1.25", "1.9x2.5", "ne3np4.pg3", "ne16np4.pg3", "ne30np4.pg3", "C96", "mpasa120" );
1883+
my @clmres = ( "10x15", "4x5", "360x720cru", "0.9x1.25", "1.9x2.5", "ne3np4", "ne3np4.pg3", "ne16np4.pg3", "ne30np4.pg3", "C96", "mpasa120" );
18841884
foreach my $res ( @clmres ) {
18851885
$options = "-res $res -envxml_dir . ";
18861886
&make_env_run( );

cime

Submodule cime updated 48 files

0 commit comments

Comments
 (0)