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

A few fixes and extend mksurfdata to set PFT/CFT fractions but use veg-cover from dataset #814

Merged
merged 71 commits into from
Nov 15, 2019
Merged

A few fixes and extend mksurfdata to set PFT/CFT fractions but use veg-cover from dataset #814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
c40e1ef
Update to latest cime5.6 version
ekluzek Sep 13, 2019
ed821fa
Add mkpftMod.F90 to the list of subroutines to compile, which also re…
ekluzek Sep 15, 2019
3c04ffa
Add a simple test that just runs pftInit
ekluzek Sep 15, 2019
6698b81
Some changes for unit testing, and add more tests
ekluzek Sep 15, 2019
77e06f6
Add a abort subroutine for unit testing, and add a test that uses it,…
ekluzek Sep 16, 2019
29a169a
Add some more exception tests
ekluzek Sep 16, 2019
e13c35c
Add more exception tests, fix two issues in mkpft one to do test on n…
ekluzek Sep 16, 2019
cda9280
Add a test to set all the PFT's. This test detects a problem in the e…
ekluzek Sep 16, 2019
43dbdac
Start adding tests for the main mkpft subroutine (just for zero_out a…
ekluzek Sep 16, 2019
a31ffe6
Add a method to set domain for unit-testing, and call mkpft for the z…
ekluzek Sep 16, 2019
a62d4d8
Start checking more things
ekluzek Sep 16, 2019
09e98c7
Add some more checks that results are correct after running mkpft
ekluzek Sep 17, 2019
32c394c
Add a test that includes a crop and natural PFT index, so divided bet…
ekluzek Sep 17, 2019
162c393
Add another more complicated test with two nat-veg PFTs and two crop …
ekluzek Sep 17, 2019
f57efe3
Remove allow_no_crops and missing_crops
ekluzek Sep 17, 2019
4a64e18
Remove the oldformat option from the reading section, now will die if…
ekluzek Sep 17, 2019
b01ff1d
Start adding a pft override object to handle the overriding the PFT f…
ekluzek Sep 17, 2019
2d2a3cd
Add pft_oride constructor and Clean methods as well as a simple test …
ekluzek Sep 17, 2019
b0e7f80
Implement the InitAllPFTIndex method, and add some tests for it, also…
ekluzek Sep 17, 2019
6f25e79
Add a mixed crop and nat-veg test for 4 total
ekluzek Sep 17, 2019
303e233
Add PFT override object and set it inside the mkpftInit
ekluzek Sep 18, 2019
a82183b
Handle error from mkpft_check_oride more clearly
ekluzek Sep 18, 2019
27df3e2
Remove use of oldformat for zero_out and use_input_pft options
ekluzek Sep 18, 2019
d9d52cc
Remove oldformat option except on read of file followed by an abort i…
ekluzek Sep 18, 2019
cee61f5
Remove global zero_out, and use PFT oride settings to set PFT's as a …
ekluzek Sep 18, 2019
a75bb78
Add a test to check for a bad all_veg setting
ekluzek Sep 18, 2019
be671e4
Allow PFT's to be prescribed but use overall veg cover from dataset
ekluzek Oct 4, 2019
af31c18
Remove an unneeded else
ekluzek Oct 4, 2019
e5e67aa
Have mkharv listen to all_veg rather than pft_frc>0, so harvesting wi…
ekluzek Oct 4, 2019
b79a6ef
Update intel version to fix #809
ekluzek Oct 4, 2019
43529b6
Set stream_year_*_urbantv for clm4_5 to fix issue #175
ekluzek Oct 4, 2019
a297c0b
Update cime version to latest available
ekluzek Oct 4, 2019
9b71ec6
Move lai_interp and SoilMoistureStreamsInterp outside of OMP loops so…
ekluzek Oct 4, 2019
1993926
Change the error when use_init_interp=T for a branch run to a warning
ekluzek Oct 6, 2019
626c038
Print a warning if branch and use_init_interp=T, and add a test for it
ekluzek Oct 6, 2019
d54d51c
Point ndep SSP files to ones that have historical period 1849-2013 ad…
ekluzek Oct 7, 2019
8d9b26a
Merge branch 'relfixesfor5028' of github.com:ekluzek/ctsm into relfix…
ekluzek Oct 7, 2019
fcb4b0c
Change hobart tests to izumi and remove edison tests, because edison …
ekluzek Oct 7, 2019
892bb90
Add clm4_5 version of ndep for 1850/hist (same as for clm5_0)
ekluzek Oct 8, 2019
06f9611
Fix wallclock for a test
ekluzek Oct 10, 2019
8e4a2c3
Remove the update of pointing clm4_5 for 1850_control to the 1850-PI …
ekluzek Oct 10, 2019
709bd85
Revert "Set stream_year_*_urbantv for clm4_5 to fix issue #175"
ekluzek Oct 11, 2019
11efa7c
Update to cime version that works (without cime bug ESMCI/cime#3259)
ekluzek Oct 11, 2019
6173fe4
Seperate out PrescribedSoilMoistureAdvance to different subroutine to…
ekluzek Oct 29, 2019
391722e
Correct arguments to setup_logic_soilm_streams
ekluzek Nov 1, 2019
31ed384
Change H2OSOI_PRESRIBED to be gridcell only
ekluzek Nov 1, 2019
ef35f63
Move it back to just operating over nat-veg
ekluzek Nov 1, 2019
0710e29
Add in soilm_offset
ekluzek Nov 1, 2019
9bd6929
Fix write of soilm_offset
ekluzek Nov 1, 2019
b2e8f7d
Merge branch 'relfixesfor5028' of github.com:ekluzek/ctsm into relfix…
ekluzek Nov 1, 2019
c8a0ccb
Add soilm_ignore_data_if_missing as a namelist option
ekluzek Nov 4, 2019
c8b4127
Add soilm_ignore_data_if_missing
ekluzek Nov 6, 2019
46a146c
Checkin version that is identical to release-clm5.0.27
ekluzek Nov 7, 2019
8f85fe0
OK now separate out the calls to SoilMoistureAdvance to the processor…
ekluzek Nov 7, 2019
6b9c698
Divide LAI into lai_advance for streams to be in a non-OpenMP area, a…
ekluzek Nov 7, 2019
beabec6
Get working with threading
ekluzek Nov 10, 2019
ec59232
Make H2OSOI_PRESCRIBED_GRC optional, and add it to the prescribed tes…
ekluzek Nov 10, 2019
e803762
Make a theading test run with the prescribed streams
ekluzek Nov 10, 2019
dbc5ac9
Add tintalgo for: lai, lightning, pop-dens, urbantv, and ndep
ekluzek Nov 11, 2019
4591d1f
Point to cime5.6.25
ekluzek Nov 11, 2019
e71b025
Change threaded prescribed test to f09 and present-day (as required f…
ekluzek Nov 11, 2019
f3d9807
Rename testname with mp24 to crp for crop turned on
ekluzek Nov 11, 2019
4d492dd
Correct to compset that can run for this
ekluzek Nov 13, 2019
b9023af
Add support to run tools tests on izumi
ekluzek Nov 13, 2019
790a61d
Mark PGI tests as failing on izumi as well (until we get a fix for ci…
ekluzek Nov 13, 2019
0467225
all_veg if was backwards
ekluzek Nov 13, 2019
c2bddc9
Merge branch 'relfixesfor5028' of github.com:ekluzek/ctsm into relfix…
ekluzek Nov 13, 2019
bc69725
Fix CPRNC version to point to
ekluzek Nov 15, 2019
3d968d6
10x15 grid for both hobart and izumi should be single node
ekluzek Nov 15, 2019
ad95aef
Add an expected fail, and increase the time limit on a test
ekluzek Nov 15, 2019
93444b3
Update Change files
ekluzek Nov 15, 2019
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
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ clm.input_data_list
clm.input_data_list.previous
*.stdout.txt.o*

# mksurfdata unit tests
unit_test_build

# Tools executables
/tools/mksurfdata_map/mksurfdata_map
/tools/mkprocdata_map/mkprocdata_map
Expand Down
2 changes: 1 addition & 1 deletion Externals.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ required = True
local_path = cime
protocol = git
repo_url = https://github.com/ESMCI/cime
tag = cime5.6.20
tag = cime5.6.25
required = True

[externals_description]
Expand Down
59 changes: 44 additions & 15 deletions bld/CLMBuildNamelist.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1041,12 +1041,22 @@ sub setup_cmdl_maxpft {
$log->verbose_message("Using $nl_flags->{'maxpft'} for maxpft.");

$var = "maxpatch_pft";
$val = $nl_flags->{'maxpft'};
my $group = $definition->get_group_name($var);
$nl->set_variable_value($group, $var, $val);
if ( ! $definition->is_valid_value( $var, $val ) ) {
my @valid_values = $definition->get_valid_values( $var );
$log->fatal_error("$var has a value ($val) that is NOT valid. Valid values are: @valid_values");
if ( ! defined($nl->get_variable_value($group, $var)) ) {
$val = $nl_flags->{'maxpft'};
$nl->set_variable_value($group, $var, $val);
}
$val = $nl->get_variable_value($group, $var);
my @valid_values = ($maxpatchpft{'.true.'}, $maxpatchpft{'.false.'} );
my $found = 0;
foreach my $valid_val ( @valid_values ) {
if ( $val == $valid_val ) {
$found = 1;
last;
}
}
if ( ! $found ) {
$log->warning("$var has a value ($val) that is normally NOT valid. Normal valid values are: @valid_values");
}
}
}
Expand Down Expand Up @@ -1931,6 +1941,12 @@ sub setup_logic_start_type {
if (not defined $nl->get_value('nrevsn')) {
$log->fatal_error("nrevsn is required for a branch type.");
}
if (defined $nl->get_value('use_init_interp')) {
if ( &value_is_true($nl->get_value('use_init_interp') ) ) {
# Always print this warning, but don't stop if it happens
print "\nWARNING: use_init_interp will NOT happen for a branch case.\n\n";
}
}
} else {
if (defined $nl->get_value('nrevsn')) {
$log->fatal_error("nrevsn should ONLY be set for a branch type.");
Expand Down Expand Up @@ -3379,9 +3395,10 @@ sub setup_logic_popd_streams {
if ( defined($nl->get_value('stream_year_first_popdens')) ||
defined($nl->get_value('stream_year_last_popdens')) ||
defined($nl->get_value('model_year_align_popdens')) ||
defined($nl->get_value('popdens_tintalgo' )) ||
defined($nl->get_value('stream_fldfilename_popdens')) ) {
$log->fatal_error("When bgc is SP (NOT CN or BGC) or fire_method==nofire none of: stream_year_first_popdens,\n" .
"stream_year_last_popdens, model_year_align_popdens, nor\n" .
"stream_year_last_popdens, model_year_align_popdens, popdens_tintalgo nor\n" .
"stream_fldfilename_popdens can be set!");
}
}
Expand Down Expand Up @@ -3445,9 +3462,10 @@ sub setup_logic_lightning_streams {
if ( defined($nl->get_value('stream_year_first_lightng')) ||
defined($nl->get_value('stream_year_last_lightng')) ||
defined($nl->get_value('model_year_align_lightng')) ||
defined($nl->get_value('lightng_tintalgo' )) ||
defined($nl->get_value('stream_fldfilename_lightng')) ) {
$log->fatal_error("When bgc is SP (NOT CN or BGC) or fire_method==nofire none of: stream_year_first_lightng,\n" .
"stream_year_last_lightng, model_year_align_lightng, nor\n" .
"stream_year_last_lightng, model_year_align_lightng, lightng_tintalgo nor\n" .
"stream_fldfilename_lightng can be set!");
}
}
Expand Down Expand Up @@ -3525,35 +3543,45 @@ sub setup_logic_megan {

sub setup_logic_soilm_streams {
# prescribed soil moisture streams require clm4_5/clm5_0
my ($test_files, $nl_flags, $definition, $defaults, $nl, $physv) = @_;
my ($opts, $nl_flags, $definition, $defaults, $nl, $physv) = @_;

if ( $physv->as_long() >= $physv->as_long("clm4_5") ) {
add_default($test_files, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_soil_moisture_streams');
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'use_soil_moisture_streams');
if ( &value_is_true( $nl->get_value('use_soil_moisture_streams') ) ) {
add_default($test_files, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'soilm_tintalgo',
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'soilm_tintalgo',
'hgrid'=>$nl_flags->{'res'} );
add_default($test_files, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_year_first_soilm', 'phys'=>$nl_flags->{'phys'},
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'soilm_offset',
'hgrid'=>$nl_flags->{'res'} );
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_year_first_soilm', 'phys'=>$nl_flags->{'phys'},
'sim_year'=>$nl_flags->{'sim_year'},
'sim_year_range'=>$nl_flags->{'sim_year_range'});
add_default($test_files, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_year_last_soilm', 'phys'=>$nl_flags->{'phys'},
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_year_last_soilm', 'phys'=>$nl_flags->{'phys'},
'sim_year'=>$nl_flags->{'sim_year'},
'sim_year_range'=>$nl_flags->{'sim_year_range'});
# Set align year, if first and last years are different
if ( $nl->get_value('stream_year_first_soilm') !=
$nl->get_value('stream_year_last_soilm') ) {
add_default($test_files, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl,
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl,
'model_year_align_soilm', 'sim_year'=>$nl_flags->{'sim_year'},
'sim_year_range'=>$nl_flags->{'sim_year_range'});
}
add_default($test_files, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_fldfilename_soilm', 'phys'=>$nl_flags->{'phys'},
add_default($opts, $nl_flags->{'inputdata_rootdir'}, $definition, $defaults, $nl, 'stream_fldfilename_soilm', 'phys'=>$nl_flags->{'phys'},
'hgrid'=>$nl_flags->{'res'} );
if ( ($opts->{'use_case'} =~ /_transient$/) &&
(remove_leading_and_trailing_quotes($nl->get_value("soilm_tintalgo")) eq "linear") ) {
$log->warning("For a transient case, soil moisture streams, should NOT use soilm_tintalgo='linear'" .
" since vegetated areas could go from missing to not missing or vice versa" );
}
} else {
if ( defined($nl->get_value('stream_year_first_soilm')) ||
defined($nl->get_value('model_year_align_soilm')) ||
defined($nl->get_value('stream_fldfilename_soilm')) ||
defined($nl->get_value('soilm_tintalgo')) ||
defined($nl->get_value('soilm_offset')) ||
defined($nl->get_value('stream_year_last_soilm')) ) {
$log->fatal_error("One of the soilm streams namelist items (stream_year_first_soilm, " .
" model_year_align_soilm, stream_fldfilename_soilm, stream_fldfilename_soilm)" .
" soilm_tintalgo soilm_offset" .
" is defined, but use_soil_moisture_streams option NOT set to true");
}
}
Expand Down Expand Up @@ -3599,9 +3627,10 @@ sub setup_logic_lai_streams {
if ( defined($nl->get_value('stream_year_first_lai')) ||
defined($nl->get_value('stream_year_last_lai')) ||
defined($nl->get_value('model_year_align_lai')) ||
defined($nl->get_value('lai_tintalgo' )) ||
defined($nl->get_value('stream_fldfilename_lai')) ) {
$log->fatal_error("When bgc is NOT SP none of the following can be set: stream_year_first_lai,\n" .
"stream_year_last_lai, model_year_align_lai, nor\n" .
"stream_year_last_lai, model_year_align_lai, lai_tintalgo nor\n" .
"stream_fldfilename_lai (eg. don't use this option with BGC,CN,CNDV nor BGDCV).");
}
}
Expand Down
23 changes: 11 additions & 12 deletions bld/namelist_files/namelist_defaults_clm4_5.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,28 +1052,26 @@ lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_16pfts_Irrig_CMIP6_simyr18
<stream_year_last_ndep use_cn=".true." sim_year="constant" sim_year_range="1000-1004" >2000</stream_year_last_ndep>

<stream_fldfilename_ndep phys="clm5_0" 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>
<stream_fldfilename_ndep phys="clm4_5" 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>

<!-- Only the CMIP6 Tier I Nitogen deposition files are available -->
<stream_fldfilename_ndep phys="clm5_0" hgrid="0.9x1.25" use_cn=".true." ssp_rcp="SSP5-8.5"
>lnd/clm2/ndepdata/fndep_clm_SSP585_b.e21.BWSSP585cmip6.f09_g17.CMIP6-SSP5-8.5-WACCM.001_2014-2101_monthly_0.9x1.25_c190211.nc</stream_fldfilename_ndep>
<!-- We currently only have the Tier I Nitogen deposition files available -->
>lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP5-8.5-WACCM_1849-2101_monthly_c191007.nc</stream_fldfilename_ndep>
<stream_fldfilename_ndep phys="clm5_0" hgrid="0.9x1.25" use_cn=".true." ssp_rcp="SSP1-2.6"
>lnd/clm2/ndepdata/fndep_clm_SSP126_b.e21.BWSSP126cmip6.f09_g17.CMIP6-SSP1-2.6-WACCM.001_2014-2101_monthly_0.9x1.25_c190221.nc</stream_fldfilename_ndep>
>lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP1-2.6-WACCM_1849-2101_monthly_c191007.nc</stream_fldfilename_ndep>
<stream_fldfilename_ndep phys="clm5_0" hgrid="0.9x1.25" use_cn=".true." ssp_rcp="SSP2-4.5"
>lnd/clm2/ndepdata/fndep_clm_SSP245_b.e21.BWSSP245cmip6.f09_g17.CMIP6-SSP2-4.5-WACCM.001_2014-2101_monthly_0.9x1.25_c190401.nc</stream_fldfilename_ndep>
>lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP2-4.5-WACCM_1849-2101_monthly_c191007.nc</stream_fldfilename_ndep>
<stream_fldfilename_ndep phys="clm5_0" hgrid="0.9x1.25" use_cn=".true." ssp_rcp="SSP3-7.0"
>lnd/clm2/ndepdata/fndep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.001_2014-2101_monthly_0.9x1.25_c190401.nc</stream_fldfilename_ndep>

<stream_fldfilename_ndep phys="clm4_5" 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>
>lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP3-7.0-WACCM_1849-2101_monthly_c191007.nc</stream_fldfilename_ndep>

<!-- We currently only have the Tier I Nitogen deposition files available -->
<stream_fldfilename_ndep phys="clm4_5" hgrid="0.9x1.25" use_cn=".true." ssp_rcp="SSP5-8.5"
>lnd/clm2/ndepdata/fndep_clm_SSP585_b.e21.BWSSP585cmip6.f09_g17.CMIP6-SSP5-8.5-WACCM.001_2014-2101_monthly_0.9x1.25_c190211.nc</stream_fldfilename_ndep>
>lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP5-8.5-WACCM_1849-2101_monthly_c191007.nc</stream_fldfilename_ndep>
<stream_fldfilename_ndep phys="clm4_5" hgrid="0.9x1.25" use_cn=".true." ssp_rcp="SSP1-2.6"
>lnd/clm2/ndepdata/fndep_clm_SSP126_b.e21.BWSSP126cmip6.f09_g17.CMIP6-SSP1-2.6-WACCM.001_2014-2101_monthly_0.9x1.25_c190221.nc</stream_fldfilename_ndep>
>lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP1-2.6-WACCM_1849-2101_monthly_c191007.nc</stream_fldfilename_ndep>
<stream_fldfilename_ndep phys="clm4_5" hgrid="0.9x1.25" use_cn=".true." ssp_rcp="SSP2-4.5"
>lnd/clm2/ndepdata/fndep_clm_SSP245_b.e21.BWSSP245cmip6.f09_g17.CMIP6-SSP2-4.5-WACCM.001_2014-2101_monthly_0.9x1.25_c190401.nc</stream_fldfilename_ndep>
>lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP5-8.5-WACCM_1849-2101_monthly_c191007.nc</stream_fldfilename_ndep>
<stream_fldfilename_ndep phys="clm4_5" hgrid="0.9x1.25" use_cn=".true." ssp_rcp="SSP3-7.0"
>lnd/clm2/ndepdata/fndep_clm_SSP370_b.e21.BWSSP370cmip6.f09_g17.CMIP6-SSP3-7.0-WACCM.001_2014-2101_monthly_0.9x1.25_c190401.nc</stream_fldfilename_ndep>
>lnd/clm2/ndepdata/fndep_clm_f09_g17.CMIP6-SSP3-7.0-WACCM_1849-2101_monthly_c191007.nc</stream_fldfilename_ndep>

<ndep_taxmode phys="clm5_0" use_cn=".true.">cycle</ndep_taxmode>
<ndep_varlist phys="clm5_0" use_cn=".true.">NDEP_month</ndep_varlist>
Expand Down Expand Up @@ -1103,6 +1101,7 @@ lnd/clm2/surfdata_map/landuse.timeseries_ne30np4_hist_16pfts_Irrig_CMIP6_simyr18
<stream_fldfilename_soilm hgrid="0.9x1.25">lnd/clm2/prescribed_data/LFMIP-pdLC-SST.H2OSOI.0.9x1.25.20levsoi.natveg.climo1980-2014.MONS_c190709.nc</stream_fldfilename_soilm>

<soilm_tintalgo>linear</soilm_tintalgo>
<soilm_offset >0</soilm_offset>

<!-- LAI streams namelist defaults -->
<use_lai_streams >.false.</use_lai_streams>
Expand Down
38 changes: 38 additions & 0 deletions bld/namelist_files/namelist_definition_clm4_5.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1526,6 +1526,11 @@ Time interpolation mode to determine how to handle data before and after the tim
limit = Only use the data within the times available -- abort if the model tries to go outside it
</entry>

<entry id="ndep_tintalgo" type="char*80" category="datasets"
group="ndepdyn_nml" valid_values="linear,nearest,lower,upper" >
Time interpolation method to use for Nitrogen Deposition
</entry>

<entry id="ndep_varlist" type="char*256" category="datasets"
group="ndepdyn_nml" valid_values="" >
Colon delimited list of variables to read from the streams file for nitrogen deposition
Expand Down Expand Up @@ -1584,6 +1589,19 @@ Filename of input stream data for prescribed soil moisture streams data
Time interpolation method to use for prescribed soil moisture streams data
</entry>

<entry id="soilm_offset" type="integer" category="datasets"
group="soil_moisture_streams" >
Offset in time coordinate for soil moisture streams (sec)
</entry>

<entry id="soilm_ignore_data_if_missing" type="logical" category="datasets"
group="soil_moisture_streams" >
If false will abort if using soil moisture streams and find a point where the model shows H2OSOI_VOL
should be set because it's vegetated, but the input soilm streams dataset shows that point is missing.
If true, will ignore the prescribed soilm data for that point and let the model run for that point without
prescribed data.
</entry>

<!-- ======================================================================================== -->
<!-- lai_streams streams Namelist (when phys = CLM4_5) -->
<!-- ======================================================================================== -->
Expand Down Expand Up @@ -1615,6 +1633,11 @@ Simulation year that aligns with stream_year_first_lai value
Filename of input stream data for LAI
</entry>

<entry id="lai_tintalgo" type="char*80" category="datasets"
group="lai_streams" valid_values="linear,nearest,lower,upper" >
Time interpolation method to use with LAI streams
</entry>

<entry id="lai_mapalgo" type="char*256" category="datasets"
group="lai_streams" valid_values="bilinear,nn,nnoni,nnonj,spval,copy" >
Mapping method from LAI input file to the model resolution
Expand Down Expand Up @@ -1651,6 +1674,11 @@ Simulation year that aligns with stream_year_first_lightng value
Filename of input stream data for Lightning
</entry>

<entry id="lightng_tintalgo" type="char*80" category="datasets"
group="light_streams" valid_values="linear,nearest,lower,upper" >
Time interpolation method to use with Lightning streams
</entry>

<entry id="lightngmapalgo" type="char*256" category="datasets"
group="light_streams" valid_values="bilinear,nn,nnoni,nnonj,spval,copy" >
Mapping method from Lightning input file to the model resolution
Expand Down Expand Up @@ -1688,6 +1716,11 @@ Simulation year that aligns with stream_year_first_popdens value
Filename of input stream data for human population density
</entry>

<entry id="popdens_tintalgo" type="char*80" category="datasets"
group="popd_streams" valid_values="linear,nearest,lower,upper" >
Time interpolation method to use with human population density streams
</entry>

<entry id="popdensmapalgo" type="char*256" category="datasets"
group="popd_streams" valid_values="bilinear,nn,nnoni,nnonj,spval,copy" >
Mapping method from human population density input file to the model resolution
Expand Down Expand Up @@ -1725,6 +1758,11 @@ Simulation year that aligns with stream_year_first_urbantv value
Filename of input stream data for urban time varying
</entry>

<entry id="urbantv_tintalgo" type="char*80" category="datasets"
group="urbantv_streams" valid_values="linear,nearest,lower,upper" >
Time interpolation method to use with urban time varying streams
</entry>

<entry id="urbantvmapalgo" type="char*256" category="datasets"
group="urbantv_streams" valid_values="bilinear,nn,nnoni,nnonj,spval,copy" >
Mapping method from urban time varying input file to the model resolution
Expand Down
Loading