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.

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

FATES Land use V2 API update #6353

Merged
merged 30 commits into from
Jul 23, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
4156260
add logic to avoid rho and tau calculation when fates is on
glemieux Mar 21, 2023
8771e50
Add fates landuse x pft API code
glemieux Sep 19, 2023
d6ce037
update fates submodule
glemieux Jul 8, 2024
e1f94eb
remove out-of-date comment
glemieux Jul 9, 2024
b17beff
change fates_harvest_mode option name
glemieux Jul 9, 2024
5dd6c46
add clarifying language to FATES namelist options
glemieux Jul 9, 2024
4b8c230
rename clmlanduse to hlmlanduse
glemieux Jul 9, 2024
c1bf030
add new fates luh2 tests and update existing
glemieux Jul 9, 2024
4420c0d
change logging test to use replacement fates harvest mode
glemieux Jul 9, 2024
8bd0372
add new fates test mods to test list
glemieux Jul 9, 2024
512c499
add trim to the write statement output
glemieux Jul 9, 2024
6c1cb2e
minor change in call to GetLandusePFTData
glemieux Jul 9, 2024
27003a0
update fates parameter file
glemieux Jul 9, 2024
7b3f8fa
refactor fates build namelist options
glemieux Jul 9, 2024
f636d9b
correct how fates sp mode value is passed to add_default for building…
glemieux Jul 10, 2024
342e6f5
update fates build namelist add_default calls for modes that depend o…
glemieux Jul 10, 2024
df1901d
add graceful failures to the fates build namelist for land use
glemieux Jul 10, 2024
4bb13ed
correct add default call for use_fates_luh option
glemieux Jul 10, 2024
e43b554
correct graceful failure write statement
glemieux Jul 10, 2024
52f1bd1
fix use_fates_potentialveg call in build namelist
glemieux Jul 10, 2024
1414a18
add namelist check allowing empty string for fluh_timeseries
glemieux Jul 11, 2024
0c94275
do not add default for fates landuse files prior to checks
glemieux Jul 11, 2024
348dc46
whitespace fixes in elm build namelist
glemieux Jul 11, 2024
229fb93
add constant simyear range until transient compset working for fates
glemieux Jul 11, 2024
ebf6dd8
correct flandusepftdat default location name
glemieux Jul 11, 2024
09d0bf3
correct fates harvest mode namelist check
glemieux Jul 11, 2024
e565c34
remove old comment from elmfates_interfaceMod
glemieux Jul 11, 2024
1b0772c
correct how harvest mode setting is passed to add_default for fates l…
glemieux Jul 13, 2024
6d21ce5
reinstate default settings for various fates modes
glemieux Jul 13, 2024
ee9cd55
update fates to sci.1.77.1_api.36.0.0
glemieux Jul 17, 2024
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
Prev Previous commit
Next Next commit
reinstate default settings for various fates modes
  • Loading branch information
glemieux committed Jul 13, 2024
commit 6d21ce5657efeab9d7f6f63f1b72b15fafd18c00
2 changes: 1 addition & 1 deletion components/elm/bld/ELMBuildNamelist.pm
Original file line number Diff line number Diff line change
Expand Up @@ -3545,7 +3545,7 @@ sub setup_logic_fates {
if ( $mode eq "luhdata_area" || $mode eq "luhdata_mass" ) {
# Make sure that use_fates_luh is true when using raw fates luh2 harvest data
if ( ! &value_is_true($nl->get_value('use_fates_luh')) ) {
fatal_error("use_fates_luh is required to be true when $var is greater than 2" );
fatal_error("use_fates_luh is required to be true when $var is luhdata_mass or luhdata_area" );
}
} elsif ( $mode eq 'landuse_timeseries' ) {
# Check to make sure that the user set the flanduse_timeseries file
Expand Down
6 changes: 6 additions & 0 deletions components/elm/bld/namelist_files/namelist_defaults.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2195,11 +2195,17 @@ this mask will have smb calculated over the entire global land surface
<use_fates_sp use_fates=".true.">.false.</use_fates_sp>
<use_fates_lupft use_fates=".true.">.false.</use_fates_lupft>
<use_fates_potentialveg use_fates=".true.">.false.</use_fates_potentialveg>
<use_fates_luh use_fates=".true." fates_harvest_mode="luhdata_area" >.true.</use_fates_luh>
<use_fates_luh use_fates=".true." fates_harvest_mode="luhdata_mass" >.true.</use_fates_luh>
<use_fates_luh use_fates=".true." use_fates_lupft=".true.">.true.</use_fates_luh>
<use_fates_luh use_fates=".true." use_fates_potentialveg=".true.">.true.</use_fates_luh>
<use_fates_luh use_fates=".true." >.false.</use_fates_luh>
<use_fates_inventory_init use_fates=".true.">.false.</use_fates_inventory_init>
<use_fates_nocomp use_fates=".true." use_fates_sp=".true.">.true.</use_fates_nocomp>
<use_fates_nocomp use_fates=".true." use_fates_lupft=".true.">.true.</use_fates_nocomp>
<use_fates_nocomp use_fates=".true." >.false.</use_fates_nocomp>
<use_fates_fixed_biogeog use_fates=".true." use_fates_sp=".true.">.true.</use_fates_fixed_biogeog>
<use_fates_fixed_biogeog use_fates=".true." use_fates_lupft=".true.">.true.</use_fates_fixed_biogeog>
<use_fates_fixed_biogeog use_fates=".true." >.false.</use_fates_fixed_biogeog>
<use_vertsoilc bgc_mode="fates" >.true.</use_vertsoilc>
<use_century_decomp bgc_mode="fates" >.true.</use_century_decomp>
Expand Down