Skip to content

Commit 67c3762

Browse files
glemieuxglemieux
committed
Merge tag 'ctsm5.4.021' into fates-tests-trs
Bring b4b-dev to master Some fixes to use the ifx compiler. Added handling of gzipped files in the short term archiver needed for DART. Use a CMake funciton for the PfUnit build. Make sure mksurfdata_esmf PIO library is used as shared in the build. Fix to a typo in the Technical Note. Use pytest instead of unittest in our python unit test framework, which allows many modern features. One test file, test_unit_longitude.py, has been modified to use pytest's "parametrize" functionality as an example. Most of the changed lines in that file are just whitespace differences. Existing run_ctsm_py_tests arguments have been ported to replicate the same functionality in pytest. Unknown arguments will be passed to pytest directly. Also: Made it so that the tests can be called from anywhere in the checkout, instead of only python/.
2 parents a20265a + 20cf01f commit 67c3762

File tree

82 files changed

+2270
-1022
lines changed

Some content is hidden

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

82 files changed

+2270
-1022
lines changed

‎.gitmodules‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ fxDONOTUSEurl = https://github.com/ESMCI/cime
8484
[submodule "cmeps"]
8585
path = components/cmeps
8686
url = https://github.com/ESCOMP/CMEPS.git
87-
fxtag = cmeps1.1.24
87+
fxtag = cmeps1.1.29
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.84
95+
fxtag = cdeps1.0.91
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

‎bld/CLMBuildNamelist.pm‎

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1360,8 +1360,8 @@ sub setup_cmdl_simulation_year {
13601360
}
13611361
$val = "'".$defaults->get_value($var)."'";
13621362
$nl->set_variable_value($group, $var, $val );
1363-
$log->verbose_message("CLM sim_year_range is $nl_flags->{'sim_year_range'}");
13641363
}
1364+
$log->verbose_message("CLM sim_year_range is $nl_flags->{'sim_year_range'}");
13651365
}
13661366

13671367
#-------------------------------------------------------------------------------
@@ -1758,10 +1758,10 @@ sub process_namelist_inline_logic {
17581758
###############################
17591759
setup_logic_methane($opts, $nl_flags, $definition, $defaults, $nl);
17601760

1761-
###############################
1762-
# namelist group: ndepdyn_nml #
1763-
###############################
1764-
setup_logic_nitrogen_deposition($opts, $nl_flags, $definition, $defaults, $nl);
1761+
######################################################
1762+
# Handle Nitrogen Deposition either from CPL or CTSM #
1763+
######################################################
1764+
setup_logic_nitrogen_deposition($opts, $nl_flags, $definition, $defaults, $nl, $envxml_ref);
17651765

17661766
##################################
17671767
# namelist group: cnmresp_inparm #
@@ -3916,12 +3916,33 @@ sub setup_logic_c14_streams {
39163916
#-------------------------------------------------------------------------------
39173917

39183918
sub setup_logic_nitrogen_deposition {
3919+
my ($opts, $nl_flags, $definition, $defaults, $nl, $envxml_ref) = @_;
3920+
3921+
# Determine if we are using ndep from the CPL or internal to CTSM
3922+
# and if it's needed
3923+
$nl_flags->{'ndep_from_cpl'} = logical_to_fortran( $envxml_ref->{'CLM_NDEP_FROM_CPL'} );
3924+
if ( ($nl_flags->{'bgc_mode'} =~/bgc/) ) { # or ($nl_flags->{'bgc_mode'} =~/fates/) ) {
3925+
$nl_flags->{'ndep_needed'} = ".true."
3926+
} else {
3927+
$nl_flags->{'ndep_needed'} = ".false."
3928+
}
3929+
# Handle the ndep_inparm namelist in drv_flds_in
3930+
if ( &value_is_true($nl_flags->{'ndep_from_cpl'}) && &value_is_true($nl_flags->{'ndep_needed'}) ) {
3931+
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, "ndep_list", val=>"'noy','nhx'" );
3932+
}
3933+
# Handle the internal ndep-streams namelist
3934+
setup_logic_nitrogen_deposition_streams($opts, $nl_flags, $definition, $defaults, $nl);
3935+
}
3936+
3937+
#-------------------------------------------------------------------------------
3938+
3939+
sub setup_logic_nitrogen_deposition_streams {
39193940
my ($opts, $nl_flags, $definition, $defaults, $nl) = @_;
39203941

39213942
#
3922-
# Nitrogen deposition for bgc=CN or fates
3943+
# Nitrogen deposition streams when needed to be read internally for BGC
39233944
#
3924-
if ( ($nl_flags->{'bgc_mode'} =~/bgc/) ) { # or ($nl_flags->{'bgc_mode'} =~/fates/) ) {
3945+
if ( (not &value_is_true($nl_flags->{'ndep_from_cpl'})) and &value_is_true($nl_flags->{'ndep_needed'}) ) {
39253946
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'ndepmapalgo', 'phys'=>$nl_flags->{'phys'},
39263947
'use_cn'=>$nl_flags->{'use_cn'}, 'hgrid'=>$nl_flags->{'res'},
39273948
'clm_accelerated_spinup'=>$nl_flags->{'clm_accelerated_spinup'} );
@@ -3943,15 +3964,17 @@ sub setup_logic_nitrogen_deposition {
39433964
'sim_year_range'=>$nl_flags->{'sim_year_range'});
39443965
}
39453966
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_fldfilename_ndep', 'phys'=>$nl_flags->{'phys'},
3946-
'use_cn'=>$nl_flags->{'use_cn'}, 'lnd_tuning_mode'=>$nl_flags->{'lnd_tuning_mode'},
3947-
'hgrid'=>"0.9x1.25", 'ssp_rcp'=>$nl_flags->{'ssp_rcp'}, 'nofail'=>1 );
3967+
'use_cn'=>$nl_flags->{'use_cn'}, 'lnd_tuning_mode'=>$nl_flags->{'lnd_tuning_mode'}, 'sim_year_range'=>$nl_flags->{'sim_year_range'},
3968+
'hgrid'=>"0.9x1.25", 'ssp_rcp'=>$nl_flags->{'ssp_rcp'}, 'sim_year'=>$nl_flags->{'sim_year'}, 'nofail'=>1 );
39483969
if ( ! defined($nl->get_value('stream_fldfilename_ndep') ) ) {
39493970
# Also check at f19 resolution
39503971
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_fldfilename_ndep', 'phys'=>$nl_flags->{'phys'},
3951-
'use_cn'=>$nl_flags->{'use_cn'}, 'lnd_tuning_mode'=>$nl_flags->{'lnd_tuning_mode'},
3952-
'hgrid'=>"1.9x2.5", 'ssp_rcp'=>$nl_flags->{'ssp_rcp'}, 'nofail'=>1 );
3972+
'use_cn'=>$nl_flags->{'use_cn'}, 'lnd_tuning_mode'=>$nl_flags->{'lnd_tuning_mode'}, 'sim_year_range'=>$nl_flags->{'sim_year_range'},
3973+
'hgrid'=>"1.9x2.5", 'ssp_rcp'=>$nl_flags->{'ssp_rcp'}, 'sim_year'=>$nl_flags->{'sim_year'}, 'nofail'=>1 );
39533974
# If not found report an error
39543975
if ( ! defined($nl->get_value('stream_fldfilename_ndep') ) ) {
3976+
$log->verbose_message( "lnd_tuning_mode = " . $nl_flags->{'lnd_tuning_mode'}, " ssp_rcp = " . $nl_flags->{'ssp_rcp'} );
3977+
$log->verbose_message( "sim_year = " . $nl_flags->{'sim_year'}, " sim_year_range = " . $nl_flags->{'sim_year_range'} );
39553978
$log->warning("Did NOT find the Nitrogen-deposition forcing file (stream_fldfilename_ndep) for this ssp_rcp\n" .
39563979
"One way to get around this is to point to a file for another existing ssp_rcp in your user_nl_clm file.\n" .
39573980
"If you are running with CAM and WACCM chemistry Nitrogen deposition will come through the coupler.\n" .
@@ -3974,15 +3997,15 @@ sub setup_logic_nitrogen_deposition {
39743997
}
39753998
}
39763999
} else {
3977-
# If bgc is NOT CN/CNDV then make sure none of the ndep settings are set!
4000+
# If ndep is NOT required then make sure none of the ndep settings are set!
39784001
if ( defined($nl->get_value('stream_year_first_ndep')) ||
39794002
defined($nl->get_value('stream_year_last_ndep')) ||
39804003
defined($nl->get_value('model_year_align_ndep')) ||
39814004
defined($nl->get_value('ndep_taxmode' )) ||
39824005
defined($nl->get_value('ndep_varlist' )) ||
39834006
defined($nl->get_value('stream_fldfilename_ndep'))
39844007
) {
3985-
$log->fatal_error("When bgc is NOT CN or CNDV none of: stream_year_first_ndep," .
4008+
$log->fatal_error("When ndep isn't required or coming from the CPL none of: stream_year_first_ndep," .
39864009
"stream_year_last_ndep, model_year_align_ndep, ndep_taxmod, " .
39874010
"ndep_varlist, nor stream_fldfilename_ndep" .
39884011
" can be set!");
@@ -5452,7 +5475,7 @@ sub write_output_files {
54525475
$log->verbose_message("Writing clm namelist to $outfile");
54535476

54545477
# Drydep, fire-emission or MEGAN namelist for driver
5455-
@groups = qw(drydep_inparm megan_emis_nl fire_emis_nl carma_inparm dust_emis_inparm);
5478+
@groups = qw(drydep_inparm megan_emis_nl fire_emis_nl carma_inparm dust_emis_inparm ndep_inparm);
54565479
$outfile = "$opts->{'dir'}/drv_flds_in";
54575480
$nl->write($outfile, 'groups'=>\@groups, 'note'=>"$note" );
54585481
$log->verbose_message("Writing @groups namelists to $outfile");

‎bld/namelist_files/namelist_defaults_ctsm.xml‎

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
122122
They can only be on for BGC compsets (NOT SP or FATES).
123123
124124
Also, we configured the defaults the following ways:
125-
- On only for CRUJRA2024 or CAM7 forcing because that is how the CESM3.0 clm6_0 simulations were run
125+
- On only for CRUJRA2024, CRUJRA2024b, or CAM7 forcing because that is how the CESM3.0 clm6_0 simulations were run
126126
- In contrast to above, it's turned off for other forcing options as we haven't run simulations with those configurations
127127
- It's also only turned on for Historical periods and NOT future scenarios because we don't have CMIP7 data for them -->
128128
<use_c13 phys="clm6_0" bgc_mode="bgc" lnd_tuning_mode="clm6_0_CRUJRA2024" ssp_rcp="hist">.true.</use_c13>
@@ -335,7 +335,6 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
335335
<nonborpeat_fire_precip_denom>1.0d00</nonborpeat_fire_precip_denom>
336336

337337
<defo_fire_precip_thresh_bet>4.0d00</defo_fire_precip_thresh_bet>
338-
<defo_fire_precip_thresh_bet fire_method="li2024crujra">3.0d00</defo_fire_precip_thresh_bet>
339338

340339
<rh_low fire_method="li2014qianfrc" >30.0d00</rh_low>
341340
<rh_hgh fire_method="li2014qianfrc" >80.0d00</rh_hgh>
@@ -452,6 +451,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
452451

453452
<rh_low fire_method="li2024crujra" >30.0d00</rh_low>
454453
<rh_hgh fire_method="li2024crujra" >85.0d00</rh_hgh>
454+
<rh_hgh fire_method="li2024crujra" lnd_tuning_mode="clm6_0_cam7.0">80.0d00</rh_hgh>
455455
<bt_min fire_method="li2024crujra" >0.85d00</bt_min>
456456
<bt_max fire_method="li2024crujra" >0.98d00</bt_max>
457457
<cli_scale fire_method="li2024crujra" >0.03d00</cli_scale>
@@ -465,7 +465,8 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
465465
<cmb_cmplt_fact_litter fire_method="li2024crujra" >0.5d00</cmb_cmplt_fact_litter>
466466
<cmb_cmplt_fact_cwd fire_method="li2024crujra" >0.28d00</cmb_cmplt_fact_cwd>
467467
<max_rh30_affecting_fuel fire_method="li2024crujra" >95.</max_rh30_affecting_fuel>
468-
<defo_fire_precip_thresh_bet fire_method="li2024crujra" >1.8d00</defo_fire_precip_thresh_bet>
468+
<defo_fire_precip_thresh_bet fire_method="li2024crujra" >3.0d00</defo_fire_precip_thresh_bet>
469+
<defo_fire_precip_thresh_bet fire_method="li2024crujra" lnd_tuning_mode="clm6_0_cam7.0">1.4d00</defo_fire_precip_thresh_bet>
469470
<defo_fire_precip_thresh_bdt fire_method="li2024crujra" >0.6d00</defo_fire_precip_thresh_bdt>
470471
<borpeat_fire_soilmoist_denom fire_method="li2024crujra" > 0.3d00</borpeat_fire_soilmoist_denom>
471472
<nonborpeat_fire_precip_denom fire_method="li2024crujra" >6.5d00</nonborpeat_fire_precip_denom>
@@ -622,7 +623,8 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
622623
<!-- The default filenames are given relative to the root directory
623624
for the CLM2 data in the CESM distribution -->
624625
<!-- Plant function types (relative to {csmdata}) -->
625-
<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c260108.nc</paramfile>
626+
<paramfile phys="clm6_0" >lnd/clm2/paramdata/ctsm60_params.c260204.nc</paramfile>
627+
<paramfile phys="clm6_0" lnd_tuning_mode="clm6_0_cam7.0">ctsm60-cam70_params.c260204.nc</paramfile>
626628
<paramfile phys="clm5_0" >lnd/clm2/paramdata/clm50_params.c250311.nc</paramfile>
627629
<paramfile phys="clm4_5" >lnd/clm2/paramdata/clm45_params.c250311.nc</paramfile>
628630

@@ -1456,7 +1458,7 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
14561458
sim_year="1850" do_transient_pfts=".false." use_excess_ice=".true."
14571459
use_crop=".true."
14581460
phys="clm6_0"
1459-
>lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.CMIP7_ciso_ctsm5.4.004_bgc_ne30_130_pSASU_greenland.clm2.r.0121-01-01-00000.nc
1461+
>lnd/clm2/initdata_esmf/ctsm5.4/ctsm5.4.015_BGCcrop_ne30_144_pSASU.clm2.r.0181-01-01-00000.nc
14601462
</finidat>
14611463
<!-- Corresponding f19 -->
14621464
<finidat hgrid="1.9x2.5" mask="tx2_3v2" use_cn=".true." use_cndv=".false." use_fates=".false."
@@ -2182,17 +2184,23 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.4.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
21822184
<do_sno_oc >.false.</do_sno_oc>
21832185

21842186
<!-- Nitrogen deposition streams namelist defaults -->
2185-
<stream_year_first_ndep use_cn=".true." sim_year_range="1850-2100" >2015</stream_year_first_ndep>
2186-
<stream_year_last_ndep use_cn=".true." sim_year_range="1850-2100" >2101</stream_year_last_ndep>
2187-
<model_year_align_ndep use_cn=".true." sim_year_range="1850-2100" >2015</model_year_align_ndep>
2187+
<stream_year_first_ndep use_cn=".true." sim_year_range="1850-2100" >2015</stream_year_first_ndep>
2188+
<stream_year_last_ndep use_cn=".true." sim_year_range="1850-2100" >2101</stream_year_last_ndep>
2189+
<model_year_align_ndep use_cn=".true." sim_year_range="1850-2100" >2015</model_year_align_ndep>
2190+
2191+
<stream_year_first_ndep use_cn=".true." sim_year="1850" sim_year_range="1850-2000" >1850</stream_year_first_ndep>
2192+
<stream_year_last_ndep use_cn=".true." sim_year="1850" sim_year_range="1850-2000" >2015</stream_year_last_ndep>
2193+
<model_year_align_ndep use_cn=".true." sim_year="1850" sim_year_range="1850-2000" >1850</model_year_align_ndep>
21882194

21892195
<stream_year_first_ndep use_cn=".true." sim_year="2018" >2018</stream_year_first_ndep>
21902196
<stream_year_last_ndep use_cn=".true." sim_year="2018" >2018</stream_year_last_ndep>
2197+
<stream_year_last_ndep use_cn=".true." sim_year="2018" sim_year_range="1850-2100" >2022</stream_year_last_ndep>
21912198

21922199
<stream_year_first_ndep use_cn=".true." sim_year="2010" >2010</stream_year_first_ndep>
21932200
<stream_year_last_ndep use_cn=".true." sim_year="2010" >2010</stream_year_last_ndep>
21942201

21952202
<stream_year_first_ndep use_cn=".true." sim_year="2000" >2000</stream_year_first_ndep>
2203+
21962204
<stream_year_last_ndep use_cn=".true." sim_year="2000" >2000</stream_year_last_ndep>
21972205

21982206
<stream_year_first_ndep use_cn=".true." sim_year="1850" >1850</stream_year_first_ndep>
@@ -2201,13 +2209,18 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.4.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
22012209
<stream_year_first_ndep use_cn=".true." sim_year="1000" >2000</stream_year_first_ndep>
22022210
<stream_year_last_ndep use_cn=".true." sim_year="1000" >2000</stream_year_last_ndep>
22032211

2212+
<stream_year_first_ndep use_cn=".true." sim_year="PtVg" >1850</stream_year_first_ndep>
2213+
<stream_year_last_ndep use_cn=".true." sim_year="PtVg" >1850</stream_year_last_ndep>
2214+
22042215
<stream_year_first_ndep use_cn=".true." sim_year="constant" sim_year_range="1000-1002" >2000</stream_year_first_ndep>
22052216
<stream_year_last_ndep use_cn=".true." sim_year="constant" sim_year_range="1000-1002" >2000</stream_year_last_ndep>
22062217

22072218
<stream_year_first_ndep use_cn=".true." sim_year="constant" sim_year_range="1000-1004" >2000</stream_year_first_ndep>
22082219
<stream_year_last_ndep use_cn=".true." sim_year="constant" sim_year_range="1000-1004" >2000</stream_year_last_ndep>
22092220

2210-
<stream_fldfilename_ndep hgrid="0.9x1.25" use_cn=".true." ssp_rcp="hist" >lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</stream_fldfilename_ndep>
2221+
<stream_fldfilename_ndep hgrid="0.9x1.25" use_cn=".true." ssp_rcp="hist" sim_year_range="1850-2000" >lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</stream_fldfilename_ndep>
2222+
<stream_fldfilename_ndep hgrid="0.9x1.25" use_cn=".true." ssp_rcp="hist" sim_year="1850" sim_year_range="constant">lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</stream_fldfilename_ndep>
2223+
<stream_fldfilename_ndep hgrid="0.9x1.25" use_cn=".true." ssp_rcp="hist" sim_year_range="constant" >lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</stream_fldfilename_ndep>
22112224

22122225
<stream_meshfile_ndep hgrid="1.9x2.5">share/meshes/fv1.9x2.5_141008_ESMFmesh_c20191001.nc</stream_meshfile_ndep>
22132226
<stream_meshfile_ndep hgrid="0.9x1.25">share/meshes/fv0.9x1.25_141008_polemod_ESMFmesh.nc</stream_meshfile_ndep>
@@ -2484,11 +2497,11 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.4.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
24842497
<stream_fldfilename_urbantv phys="clm6_0" hgrid="0.9x1.25" urban_explicit_ac=".false."
24852498
>lnd/clm2/urbandata/CTSM52_tbuildmax_OlesonFeddema_2020_0.9x1.25_simyr1849-2106_c200605.nc</stream_fldfilename_urbantv>
24862499
<stream_fldfilename_urbantv phys="clm6_0" hgrid="0.9x1.25" urban_explicit_ac=".true."
2487-
>lnd/clm2/urbandata/CTSM52_urbantv_Li_2024_0.9x1.25_simyr1849-2106_c20230621.nc</stream_fldfilename_urbantv>
2500+
>lnd/clm2/urbandata/CTSM52_urbantv_Li_2024_0.9x1.25_simyr1849-2106_c20260217.nc</stream_fldfilename_urbantv>
24882501
<stream_fldfilename_urbantv phys="clm5_0" hgrid="0.9x1.25" urban_explicit_ac=".false."
24892502
>lnd/clm2/urbandata/CLM50_tbuildmax_Oleson_2016_0.9x1.25_simyr1849-2106_c160923.nc</stream_fldfilename_urbantv>
24902503
<stream_fldfilename_urbantv phys="clm5_0" hgrid="0.9x1.25" urban_explicit_ac=".true."
2491-
>lnd/clm2/urbandata/CTSM52_urbantv_Li_2024_0.9x1.25_simyr1849-2106_c20230621.nc</stream_fldfilename_urbantv>
2504+
>lnd/clm2/urbandata/CTSM52_urbantv_Li_2024_0.9x1.25_simyr1849-2106_c20260217.nc</stream_fldfilename_urbantv>
24922505
<stream_fldfilename_urbantv phys="clm4_5" hgrid="0.9x1.25"
24932506
>lnd/clm2/urbandata/CLM45_tbuildmax_Oleson_2016_0.9x1.25_simyr1849-2106_c160923.nc</stream_fldfilename_urbantv>
24942507

@@ -2636,7 +2649,7 @@ lnd/clm2/surfdata_esmf/NEON/ctsm5.4.0/surfdata_1x1_NEON_TOOL_hist_2000_78pfts_c2
26362649
<use_prigent_roughness dust_emis_method="Leung_2023">.true.</use_prigent_roughness>
26372650
<use_prigent_roughness >.false.</use_prigent_roughness>
26382651
<stream_fldfilename_prigentroughness
2639-
>lnd/clm2/dustemisdata/Prigent_2005_roughness_0.25x0.25_cdf5_c240127.nc</stream_fldfilename_prigentroughness>
2652+
>lnd/clm2/dustemisdata/Prigent_2005_roughness_0.25x0.25_cdf5_c260218.nc</stream_fldfilename_prigentroughness>
26402653
<stream_meshfile_prigentroughness
26412654
>lnd/clm2/dustemisdata/dust_0.25x0.25_ESMFmesh_cdf5_c240222.nc</stream_meshfile_prigentroughness>
26422655

‎bld/namelist_files/namelist_definition_drv_flds.xml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,17 @@
8585
Henry's law coefficients.
8686
</entry>
8787

88+
<!-- ======================================================================================== -->
89+
<!-- Nitrogen deposition -->
90+
<!-- ======================================================================================== -->
91+
92+
<entry id="ndep_list"
93+
type="char*16(2)"
94+
category="nitrogen_deposition"
95+
group="ndep_inparm" valid_values="noy,nhx">
96+
List of nitrogen deposition fluxes to be sent from ATM to surface models.
97+
</entry>
98+
8899
<!-- ======================================================================================== -->
89100
<!-- Fire emissions fluxes -->
90101
<!-- ======================================================================================== -->

‎bld/namelist_files/use_cases/1850_control.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,10 @@
1010

1111
<irrigate use_crop=".true." >.false.</irrigate>
1212

13-
<stream_year_first_ndep use_cn=".true." >1850</stream_year_first_ndep>
14-
<stream_year_last_ndep use_cn=".true." >1850</stream_year_last_ndep>
15-
1613
<stream_year_first_popdens cnfireson=".true." >1850</stream_year_first_popdens>
1714
<stream_year_last_popdens cnfireson=".true." >1850</stream_year_last_popdens>
1815

1916
<stream_year_first_urbantv >1850</stream_year_first_urbantv>
2017
<stream_year_last_urbantv >1850</stream_year_last_urbantv>
2118

22-
<stream_fldfilename_ndep use_cn=".true."
23-
>lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</stream_fldfilename_ndep>
24-
2519
</namelist_defaults>

‎bld/namelist_files/use_cases/1850_noanthro_control.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010

1111
<irrigate>.false.</irrigate>
1212

13-
<stream_year_first_ndep use_cn=".true." >1850</stream_year_first_ndep>
14-
<stream_year_last_ndep use_cn=".true." >1850</stream_year_last_ndep>
15-
1613
<stream_year_first_popdens cnfireson=".true." >1925</stream_year_first_popdens>
1714
<stream_year_last_popdens cnfireson=".true." >1925</stream_year_last_popdens>
1815

‎bld/namelist_files/use_cases/2000_control.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212
<irrigate use_crop=".true." use_cndv=".true." >.false.</irrigate>
1313
<irrigate use_crop=".true." phys="clm4_5" >.false.</irrigate>
1414

15-
<stream_year_first_ndep use_cn=".true." >2000</stream_year_first_ndep>
16-
<stream_year_last_ndep use_cn=".true." >2000</stream_year_last_ndep>
17-
1815
<stream_year_first_popdens cnfireson=".true." >2000</stream_year_first_popdens>
1916
<stream_year_last_popdens cnfireson=".true." >2000</stream_year_last_popdens>
2017

0 commit comments

Comments
 (0)