Skip to content

Commit 3d3d182

Browse files
slevis-lmwgslevis-lmwg
committed
Merge tag 'ctsm5.3.059' into prelim_upd_ctsm54_defaults
Bring in various cleanup efforts found in previous testing after the chill changes came in Various updates for testing and other problems identified in the cesm3_0_beta04 tag. So fixes and cleanup for usability. Including the following: - Fix SHR_ASSERT so single-point matrix test passes - ne3np4 to namelist_defaults_ctsm.xml and Makefile for PTS mode and add ability - Fixes warm starts in PTS_MODE so that SCAM can use restart files - f19 + f45 16pft fsurdat/landuse files to namelist_defaults_ctsm + Makefile - Changes in the FORTRAN code to properly abort when fire-emission is asked for it can't be provided. Added unit testing for this. slevis resolved conflicts: doc/ChangeLog doc/ChangeSum
2 parents f85c0b8 + 586286b commit 3d3d182

Some content is hidden

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

52 files changed

+1482
-304
lines changed

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ fxrequired = ToplevelRequired
5858
fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
5959

6060
[submodule "mizuRoute"]
61-
path = components/mizuRoute
62-
url = https://github.com/ESCOMP/mizuRoute
61+
path = components/mizuroute
62+
url = https://github.com/ESCOMP/mizuRoute
6363
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

‎README‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ components/cmeps -------------------- CESM top level driver (for NUOPC driver [w
6666
components/cdeps -------------------- CESM top level data model shared code (for NUOPC driver).
6767
components/cism --------------------- CESM Community land Ice Sheet Model.
6868
components/mosart ------------------- Model for Scale Adaptive River Transport
69-
components/mizuRoute ---------------- Reached based river transport model for water routing
69+
components/mizuroute ---------------- Reached based river transport model for water routing
7070
(allows both gridded river and Hydrologic Responce Unit river grids)
7171
components/rtm ---------------------- CESM River Transport Model.
7272

‎bld/CLMBuildNamelist.pm‎

Lines changed: 36 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4062,7 +4062,16 @@ sub setup_logic_fire_emis {
40624062
if ( &value_is_true( $nl_flags->{'use_fates'} ) ) {
40634063
$log->warning("Fire emission option $var can NOT be on when FATES is also on.\n" .
40644064
" DON'T use the '--fire_emis' option when '--bgc fates' is activated");
4065-
}
4065+
} elsif ( ! &value_is_true( $nl_flags->{'use_cn'} ) ) {
4066+
$log->fatal_error("Fire emission option $var can NOT be on when BGC SP (i.e. Satellite Phenology) is also on.\n" .
4067+
" DON'T use the '--fire_emis' option when '--bgc sp' is activated");
4068+
} elsif ( &value_is_true( $nl_flags->{'use_cn'}) ) {
4069+
my $fire_method = remove_leading_and_trailing_quotes( $nl->get_value('fire_method') );
4070+
if ( $fire_method eq "nofire" ) {
4071+
$log->fatal_error("Fire emission option $var can NOT be on with BGC and fire_method=='nofire'.\n" .
4072+
" DON'T use the '--fire_emis' option when fire_method is nofire");
4073+
}
4074+
}
40664075
}
40674076
}
40684077
}
@@ -4226,7 +4235,7 @@ sub setup_logic_lai_streams {
42264235
if ( &value_is_true($nl_flags->{'use_crop'}) && &value_is_true($nl->get_value('use_lai_streams')) ) {
42274236
$log->fatal_error("turning use_lai_streams on is incompatable with use_crop set to true.");
42284237
}
4229-
if ( $nl_flags->{'bgc_mode'} eq "sp" || ($nl_flags->{'bgc_mode'} eq "fates" && &value_is_true($nl->get_value('use_fates_sp')) )) {
4238+
if ( $nl_flags->{'bgc_mode'} eq "sp" || ($nl_flags->{'bgc_mode'} eq "fates" && &value_is_true($nl_flags->{'use_fates_sp'}) )) {
42304239
if ( &value_is_true($nl->get_value('use_lai_streams')) ) {
42314240
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_lai_streams');
42324241
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'lai_mapalgo',
@@ -4736,29 +4745,26 @@ sub setup_logic_fates {
47364745
# For FATES SP mode make sure no-competetiion, and fixed-biogeography are also set
47374746
# And also check for other settings that can't be trigged on as well
47384747
#
4739-
my $var = "use_fates_sp";
4740-
if ( defined($nl->get_value($var)) ) {
4741-
if ( &value_is_true($nl->get_value($var)) ) {
4742-
my @list = ( "use_fates_nocomp", "use_fates_fixed_biogeog" );
4743-
foreach my $var ( @list ) {
4744-
if ( ! &value_is_true($nl->get_value($var)) ) {
4745-
$log->fatal_error("$var is required when FATES SP is on (use_fates_sp)" );
4746-
}
4747-
}
4748-
# spit-fire can't be on with FATES SP mode is active
4749-
if ( $nl->get_value('fates_spitfire_mode') > 0 ) {
4750-
$log->fatal_error('fates_spitfire_mode can NOT be set to greater than 0 when use_fates_sp is true');
4751-
}
4748+
if ( &value_is_true($nl_flags->{'use_fates_sp'}) ) {
4749+
my @list = ( "use_fates_nocomp", "use_fates_fixed_biogeog" );
4750+
foreach my $var ( @list ) {
4751+
if ( ! &value_is_true($nl->get_value($var)) ) {
4752+
$log->fatal_error("$var is required when FATES SP is on (use_fates_sp)" );
4753+
}
4754+
}
4755+
# spit-fire can't be on with FATES SP mode is active
4756+
if ( $nl->get_value('fates_spitfire_mode') > 0 ) {
4757+
$log->fatal_error('fates_spitfire_mode can NOT be set to greater than 0 when use_fates_sp is true');
4758+
}
47524759

4753-
# fates landuse can't be on with FATES SP mode is active
4754-
if ( &value_is_true($nl->get_value('use_fates_luh')) ) {
4755-
$log->fatal_error('use_fates_luh can NOT be true when use_fates_sp is true');
4756-
}
4760+
# fates landuse can't be on with FATES SP mode is active
4761+
if ( &value_is_true($nl->get_value('use_fates_luh')) ) {
4762+
$log->fatal_error('use_fates_luh can NOT be true when use_fates_sp is true');
4763+
}
47574764

4758-
# hydro isn't currently supported to work when FATES SP mode is active
4759-
if (&value_is_true( $nl->get_value('use_fates_planthydro') )) {
4760-
$log->fatal_error('fates sp mode is currently not supported to work with fates hydro');
4761-
}
4765+
# hydro isn't currently supported to work when FATES SP mode is active
4766+
if (&value_is_true( $nl->get_value('use_fates_planthydro') )) {
4767+
$log->fatal_error('fates sp mode is currently not supported to work with fates hydro');
47624768
}
47634769
}
47644770
my $var = "use_fates_inventory_init";
@@ -4783,6 +4789,13 @@ sub setup_logic_fates {
47834789
}
47844790
}
47854791
}
4792+
# Check that both FaTES-SP and FATES ST3 aren't both on
4793+
my $var = "use_fates_ed_st3";
4794+
if ( defined($nl->get_value($var)) ) {
4795+
if ( &value_is_true($nl->get_value($var)) && &value_is_true($nl_flags->{'use_fates_sp'}) ) {
4796+
$log->fatal_error("$var can NOT also be true with use_fates_sp true" );
4797+
}
4798+
}
47864799
# check that fates landuse change mode has the necessary luh2 landuse timeseries data
47874800
# and add the default if not defined. Do not add default if use_fates_potentialveg is true.
47884801
# If fixed biogeography is on, make sure that flandusepftdat is avilable.

‎bld/namelist_files/namelist_defaults_ctsm.xml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1128,6 +1128,12 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
11281128
>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.
11291129
</init_interp_attributes>
11301130

1131+
<!-- 2013 IC's - exact match for CONUS grid ... -->
1132+
<init_interp_attributes sim_year="2013" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam6.0"
1133+
hgrid="ne0np4CONUS.ne30x8" use_cn=".false." maxpft="17"
1134+
>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.
1135+
</init_interp_attributes>
1136+
11311137
<!-- MPAS -->
11321138
<init_interp_attributes sim_year="2000" use_cndv=".false." use_fates=".false." lnd_tuning_mode="clm5_0_cam6.0"
11331139
hgrid="mpasa480"
@@ -1676,6 +1682,8 @@ lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_mpasa480_hist_2000_78pfts_c240908.nc</
16761682
<fsurdat hgrid="mpasa120" sim_year="2000">
16771683
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_mpasa120_hist_2000_78pfts_c240908.nc</fsurdat>
16781684

1685+
<fsurdat hgrid="ne3np4" sim_year="2000">
1686+
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4_hist_2000_78pfts_c240925.nc</fsurdat>
16791687
<fsurdat hgrid="ne3np4.pg3" sim_year="2000">
16801688
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4.pg3_hist_2000_78pfts_c240908.nc</fsurdat>
16811689
<fsurdat hgrid="ne120np4.pg3" sim_year="2000">
@@ -1730,6 +1738,8 @@ lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne30np4.pg2_hist_1850_78pfts_c240908.n
17301738
lnd/clm2/surfdata_esmf/ctsm5.4.0/surfdata_ne30np4.pg3_hist_1850_78pfts_c250428.nc</fsurdat>
17311739
<fsurdat hgrid="ne3np4.pg3" sim_year="1850">
17321740
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
1741+
<fsurdat hgrid="ne3np4" sim_year="1850">
1742+
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4_hist_1850_78pfts_c240925.nc</fsurdat>
17331743

17341744
<fsurdat hgrid="C96" sim_year="1850">
17351745
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_C96_hist_1850_78pfts_c240908.nc</fsurdat>
@@ -1740,8 +1750,6 @@ lnd/clm2/surfdata_esmf/ctsm5.3.0/synthetic/surfdata_1x1_cidadinhoBR_synth_hist_2
17401750
<fsurdat hgrid="1x1_brazil" sim_year="1850">
17411751
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_1x1_brazil_hist_1850_78pfts_c240912.nc</fsurdat>
17421752

1743-
<fsurdat hgrid="ne3np4.pg3" sim_year="1850">
1744-
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne3np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
17451753
<fsurdat hgrid="ne16np4.pg3" sim_year="1850">
17461754
lnd/clm2/surfdata_esmf/ctsm5.3.0/surfdata_ne16np4.pg3_hist_1850_78pfts_c240908.nc</fsurdat>
17471755
<fsurdat hgrid="ne120np4.pg3" sim_year="1850">
@@ -1812,6 +1820,8 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.3.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
18121820
<flanduse_timeseries hgrid="mpasa120" sim_year_range="1850-2000"
18131821
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_mpasa120_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
18141822

1823+
<flanduse_timeseries hgrid="ne3np4" sim_year_range="1850-2000"
1824+
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne3np4_SSP2-4.5_1850-2100_78pfts_c240926.nc</flanduse_timeseries>
18151825
<flanduse_timeseries hgrid="ne3np4.pg3" sim_year_range="1850-2000"
18161826
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne3np4.pg3_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
18171827
<flanduse_timeseries hgrid="ne16np4.pg3" sim_year_range="1850-2000"
@@ -1858,6 +1868,8 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.3.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
18581868
<flanduse_timeseries hgrid="mpasa120" sim_year_range="1850-2100" ssp_rcp="SSP2-4.5"
18591869
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_mpasa120_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
18601870

1871+
<flanduse_timeseries hgrid="ne3np4" sim_year_range="1850-2100" ssp_rcp="SSP2-4.5"
1872+
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne3np4_SSP2-4.5_1850-2100_78pfts_c240926.nc</flanduse_timeseries>
18611873
<flanduse_timeseries hgrid="ne3np4.pg3" sim_year_range="1850-2100" ssp_rcp="SSP2-4.5"
18621874
>lnd/clm2/surfdata_esmf/ctsm5.3.0/landuse.timeseries_ne3np4.pg3_SSP2-4.5_1850-2100_78pfts_c240908.nc</flanduse_timeseries>
18631875
<flanduse_timeseries hgrid="ne16np4.pg3" sim_year_range="1850-2100" ssp_rcp="SSP2-4.5"

‎bld/unit_testers/build-namelist_test.pl‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -163,10 +163,10 @@ sub cat_and_create_namelistinfile {
163163
#
164164
# Figure out number of tests that will run
165165
#
166-
my $ntests = 3276;
166+
my $ntests = 3285;
167167

168168
if ( defined($opts{'compare'}) ) {
169-
$ntests += 1987;
169+
$ntests += 2161;
170170
}
171171
plan( tests=>$ntests );
172172

@@ -288,7 +288,7 @@ sub cat_and_create_namelistinfile {
288288
&make_config_cache($phys);
289289
my @mfiles = ( "lnd_in", "drv_flds_in", $tempfile );
290290
my $mfiles = NMLTest::CompFiles->new( $cwd, @mfiles );
291-
foreach my $options ( "-drydep", "-megan", "-drydep -megan", "-fire_emis", "-drydep -megan -fire_emis" ) {
291+
foreach my $options ( "-drydep --bgc sp", "-megan --bgc sp", "-drydep -megan --bgc bgc", "-fire_emis --bgc bgc", "-drydep -megan -fire_emis --bgc bgc" ) {
292292
&make_env_run();
293293
eval{ system( "$bldnml -envxml_dir . $options > $tempfile 2>&1 " ); };
294294
is( $@, '', "options: $options" );
@@ -576,8 +576,8 @@ sub cat_and_create_namelistinfile {
576576
"--res 1.9x2.5 --bgc bgc --use_case 1850-2100_SSP2-4.5_transient --namelist '&a start_ymd=19101023/'",
577577
"-namelist \"&a dust_emis_method='Zender_2003', zender_soil_erod_source='lnd' /'\"",
578578
"-bgc bgc -use_case 2000_control -namelist \"&a fire_method='nofire'/\" -crop",
579-
"-res 0.9x1.25 -bgc sp -use_case 1850_noanthro_control -drydep -fire_emis",
580-
"-res 0.9x1.25 -bgc bgc -use_case 1850_noanthro_control -drydep -fire_emis -light_res 360x720",
579+
"-res 0.9x1.25 -bgc sp -use_case 1850_noanthro_control -drydep",
580+
"-res 0.9x1.25 -bgc bgc -use_case 1850_noanthro_control -drydep -fire_emis -megan -light_res 360x720",
581581
"--bgc bgc --light_res none --namelist \"&a fire_method='nofire'/\"",
582582
"--bgc fates --light_res 360x720 --no-megan --namelist \"&a fates_spitfire_mode=2/\"",
583583
"--bgc fates --light_res none --no-megan --namelist \"&a fates_spitfire_mode=1/\"",
@@ -1093,6 +1093,10 @@ sub cat_and_create_namelistinfile {
10931093
namelst=>"suplnitro='NONE'",
10941094
phys=>"clm6_0",
10951095
},
1096+
"FATESwBothSpST3" =>{ options=>"--bgc fates --envxml_dir . --no-megan",
1097+
namelst=>"use_fates_sp = TRUE, use_fates_ed_st3 = TRUE",
1098+
phys=>"clm6_0",
1099+
},
10961100
"FireNoneButBGCfireon" =>{ options=>"-bgc bgc -envxml_dir . -light_res none",
10971101
namelst=>"fire_method='li2021gswpfrc'",
10981102
phys=>"clm6_0",
@@ -1145,6 +1149,14 @@ sub cat_and_create_namelistinfile {
11451149
namelst=>"",
11461150
phys=>"clm4_5",
11471151
},
1152+
"useFIREEMISwithNOFIRE" =>{ options=>"--bgc bgc --envxml_dir . --fire_emis",
1153+
namelst=>"fire_method='nofire'",
1154+
phys=>"clm6_0",
1155+
},
1156+
"useFIREEMISwithSP" =>{ options=>"--bgc sp --envxml_dir . --fire_emis",
1157+
namelst=>"",
1158+
phys=>"clm6_0",
1159+
},
11481160
"useDRYDEPwithFATES" =>{ options=>"--bgc fates --envxml_dir . --no-megan --drydep",
11491161
namelst=>"",
11501162
phys=>"clm4_5",
@@ -1494,7 +1506,7 @@ sub cat_and_create_namelistinfile {
14941506
print "========================================================================\n";
14951507

14961508
# Check for ALL resolutions with CLM50SP
1497-
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" );
1509+
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" );
14981510
my @only2000_resolutions = ( "1x1_numaIA", "1x1_brazil", "1x1_mexicocityMEX", "1x1_vancouverCAN", "1x1_urbanc_alpha", "5x5_amazon", "0.125nldas2", "mpasa60", "mpasa15", "mpasa3p75" );
14991511
my @regional;
15001512
foreach my $res ( @resolutions ) {
@@ -1531,7 +1543,7 @@ sub cat_and_create_namelistinfile {
15311543
print " Test important resolutions for BGC and historical\n";
15321544
print "==================================================\n";
15331545

1534-
my @resolutions = ( "4x5", "10x15", "360x720cru", "ne30np4.pg3", "ne3np4.pg3", "1.9x2.5", "0.9x1.25", "C96", "mpasa120" );
1546+
my @resolutions = ( "4x5", "10x15", "360x720cru", "ne30np4.pg3", "ne3np4", "ne3np4.pg3", "1.9x2.5", "0.9x1.25", "C96", "mpasa120" );
15351547
my @regional;
15361548
my $nlbgcmode = "bgc";
15371549
my $mode = "$phys-$nlbgcmode";
@@ -1758,7 +1770,7 @@ sub cat_and_create_namelistinfile {
17581770
&cleanup();
17591771
}
17601772

1761-
my @crop_res = ( "1x1_numaIA", "4x5", "10x15", "0.9x1.25", "1.9x2.5", "ne3np4.pg3", "ne30np4", "ne30np4.pg3", "C96", "mpasa120" );
1773+
my @crop_res = ( "1x1_numaIA", "4x5", "10x15", "0.9x1.25", "1.9x2.5", "ne3np4", "ne3np4.pg3", "ne30np4", "ne30np4.pg3", "C96", "mpasa120" );
17621774
foreach my $res ( @crop_res ) {
17631775
$options = "-bgc bgc -crop -res $res -envxml_dir .";
17641776
&make_env_run();
@@ -1847,7 +1859,7 @@ sub cat_and_create_namelistinfile {
18471859
&cleanup();
18481860
}
18491861
# Transient ssp_rcp scenarios that work
1850-
my @tran_res = ( "4x5", "0.9x1.25", "1.9x2.5", "10x15", "360x720cru", "ne3np4.pg3", "ne16np4.pg3", "ne30np4.pg3", "C96", "mpasa120" );
1862+
my @tran_res = ( "4x5", "0.9x1.25", "1.9x2.5", "10x15", "360x720cru", "ne3np4", "ne3np4.pg3", "ne16np4.pg3", "ne30np4.pg3", "C96", "mpasa120" );
18511863
foreach my $usecase ( "1850-2100_SSP2-4.5_transient" ) {
18521864
my $startymd = 20150101;
18531865
foreach my $res ( @tran_res ) {
@@ -1884,7 +1896,7 @@ sub cat_and_create_namelistinfile {
18841896
"-bgc bgc -clm_demand flanduse_timeseries -sim_year 1850-2000 -namelist '&a start_ymd=18500101/'",
18851897
"-bgc bgc -envxml_dir . -namelist '&a use_c13=.true.,use_c14=.true.,use_c14_bombspike=.true./'" );
18861898
foreach my $clmopts ( @clmoptions ) {
1887-
my @clmres = ( "10x15", "4x5", "360x720cru", "0.9x1.25", "1.9x2.5", "ne3np4.pg3", "ne16np4.pg3", "ne30np4.pg3", "C96", "mpasa120" );
1899+
my @clmres = ( "10x15", "4x5", "360x720cru", "0.9x1.25", "1.9x2.5", "ne3np4", "ne3np4.pg3", "ne16np4.pg3", "ne30np4.pg3", "C96", "mpasa120" );
18881900
foreach my $res ( @clmres ) {
18891901
$options = "-res $res -envxml_dir . ";
18901902
&make_env_run( );

‎cime_config/config_component.xml‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -241,12 +241,24 @@
241241
<type>char</type>
242242
<default_value></default_value>
243243
<values>
244-
<!--- All versions -->
245-
<value compset="_CLM[^_]*%SP" >-bgc sp</value>
246-
<value compset="_CLM[^_]*BGC" >-bgc bgc</value>
247-
<value compset="_CLM[^_]*BGC-CROP" >-bgc bgc -crop</value>
248-
<value compset="_CLM[^_]*FATES" >-bgc fates -no-megan</value>
249-
<value compset="_CLM[^_]*FATES-SP" >-bgc fates -no-megan</value>
244+
<!--- All versions with DATM -->
245+
<value compset="DATM[^_]*_CLM[^_]*%SP" >-bgc sp</value>
246+
<value compset="DATM[^_]*_CLM[^_]*BGC" >-bgc bgc</value>
247+
<value compset="DATM[^_]*_CLM[^_]*BGC-CROP" >-bgc bgc -crop</value>
248+
249+
<!-- FATES currently can't use MEGAN, drydep, or fire-emission whether coupled to CAM or NOT-->
250+
<value compset="CLM[^_]*FATES" >--bgc fates --no-megan --no-drydep --no-fire_emis</value>
251+
252+
<!-- ======================================= Coupled to CAM Options ======================================
253+
All versions with CAM - turn off sending test drv_flds_in namelists from CTSM
254+
255+
When coupled to CAM - expect CAM to determine these drv_flds settings
256+
See issue #2713 for more information on this.
257+
-->
258+
<value compset="CAM[^_]*_CLM[^_]*%SP" >--bgc sp --no-megan --no-drydep --no-fire_emis</value>
259+
<value compset="CAM[^_]*_CLM[^_]*BGC" >--bgc bgc --no-megan --no-drydep --no-fire_emis</value>
260+
<value compset="CAM[^_]*_CLM[^_]*BGC-CROP" >--bgc bgc --crop --no-megan --no-drydep --no-fire_emis</value>
261+
<!-- ======================================= End of Coupled to CAM Options =============================== -->
250262

251263
<!-- Options specific for CLM4.5 -->
252264
<value compset="_CLM45%[^_]*BGCDV" >-bgc bgc -dynamic_vegetation</value>

0 commit comments

Comments
 (0)