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

ctsm5.3.022: Update FATES namelist and build options to avoid Meier2022 #2934

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
+132 −27
Open

ctsm5.3.022: Update FATES namelist and build options to avoid Meier2022 #2934

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b441507
moved the passing of the use_luh2 flag to fates earlier in the sequen…
rgknox Dec 4, 2024
4bff2f2
updated naming convention of local variables
rgknox Dec 4, 2024
cf5d00d
add graceful failure if for Meier2022 and use_fates combo
glemieux Jan 14, 2025
dbb6192
add default option to z0param_method
glemieux Jan 14, 2025
43407e1
add endrun call during initialization if Meier2022 is run with fates
glemieux Jan 14, 2025
cb361eb
update comment and error message with issue number
glemieux Jan 15, 2025
57f3d21
add failure unit test for Meier2022 and fates
glemieux Jan 15, 2025
97ac823
add use_fates to add_default call in roughness bld logic
glemieux Jan 15, 2025
17ca334
change secondary forest history names per ngeet/fates#1273
glemieux Jan 15, 2025
23b30ae
Revert "add endrun call during initialization if Meier2022 is run wit…
glemieux Jan 15, 2025
ccb55da
add Meier2022 check in control_init fates section
glemieux Jan 15, 2025
51d5bf5
fix fates secondary history output name in allvars
glemieux Jan 31, 2025
1137ffa
add missing variables that should be in allvars
glemieux Jan 31, 2025
cdaa96b
Merge remote-tracking branch 'rgknox/fates-luh2flag-order' into fates…
glemieux Jan 31, 2025
00026b0
Merge remote-tracking branch 'glemieux/fates-allvar-testupdate' into …
glemieux Jan 31, 2025
dec3271
Merge tag 'ctsm5.3.021' into fates-meier-bldcheck
glemieux Jan 31, 2025
b1668f4
remove fates_l2fr_clszpf for fatescoldallvars
glemieux Jan 31, 2025
9d987f3
Merge remote-tracking branch 'glemieux/fates-allvar-testupdate' into …
glemieux Jan 31, 2025
a346a18
update fates tag to sci.1.80.11_api.37.0.0
glemieux Jan 31, 2025
0ac98fb
add fates issue 1324 to the expected failure list
glemieux Feb 3, 2025
f31299b
Revert "add fates issue 1324 to the expected failure list"
glemieux Feb 3, 2025
2322c7b
remove FATES_C13_DISC_SZPF
glemieux Feb 3, 2025
85fbb83
update Changelog and Changesum
glemieux Feb 4, 2025
57f5518
update fates izumi results for ctsm5.3.022
glemieux Feb 4, 2025
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
7 changes: 5 additions & 2 deletions bld/CLMBuildNamelist.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2125,10 +2125,13 @@ sub setup_logic_roughness_methods {
$log->fatal_error("$var is incorrect entry for the namelist variable z0param_method; expected Meier2022 or ZengWang2007");
}
my $phys = $physv->as_string();
ekluzek marked this conversation as resolved.
Show resolved Hide resolved
if ( $phys eq "clm4_5" || $phys eq "clm5_0" ) {
if ( $var eq "Meier2022" ) {
if ( $var eq "Meier2022" ) {
if ( $phys eq "clm4_5" || $phys eq "clm5_0" ) {
$log->fatal_error("z0param_method = $var and phys = $phys, but this method has been tested only with clm6_0 and later versions; to use with earlier versions, disable this error, and add Meier2022 parameters to the corresponding params file");
}
if ( &value_is_true($nl_flags->{'use_fates'}) ) {
$log->fatal_error("z0param_method = $var and use_fates currently are not compatible. Please update the z0param_method to ZengWang2007")
glemieux marked this conversation as resolved.
Show resolved Hide resolved
}
}
}
#-------------------------------------------------------------------------------
Expand Down
4 changes: 3 additions & 1 deletion bld/namelist_files/namelist_defaults_ctsm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,9 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<!-- ================================================================== -->

<z0param_method>ZengWang2007</z0param_method>
<z0param_method phys="clm6_0">Meier2022</z0param_method>
<!-- <z0param_method phys="clm6_0">Meier2022</z0param_method> -->
<z0param_method use_fates=".true." phys="clm6_0" >ZengWang2007</z0param_method>
ekluzek marked this conversation as resolved.
Show resolved Hide resolved
<z0param_method use_fates=".false." phys="clm6_0" >Meier2022</z0param_method>

<use_z0m_snowmelt z0param_method="Meier2022" >.true.</use_z0m_snowmelt>
<use_z0m_snowmelt >.false.</use_z0m_snowmelt>
Expand Down
Loading