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

updating fates default parameter file to api 36.1 #2700

Merged
merged 16 commits into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
[submodule "fates"]
path = src/fates
url = https://github.com/NGEET/fates
fxtag = sci.1.78.2_api.36.0.0
fxtag = sci.1.78.3_api.36.1.0
fxrequired = AlwaysRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/NCAR/fates-release
Expand Down
3 changes: 2 additions & 1 deletion bld/namelist_files/namelist_defaults_ctsm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,8 @@ attributes from the config_cache.xml file (with keys converted to upper-case).
<!-- FATES default parameter file -->
<!-- ================================================================== -->

<fates_paramfile>lnd/clm2/paramdata/fates_params_api.36.0.0_12pft_c240517.nc</fates_paramfile>
<fates_paramfile>lnd/clm2/paramdata/fates_params_api.36.1.0_14pft_c241003.nc</fates_paramfile>


<!-- ================================================================== -->
<!-- Default surface roughness parameterization -->
Expand Down
7 changes: 7 additions & 0 deletions cime_config/testdefs/ExpectedTestFails.xml
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,13 @@
</phase>
</test>

<test name="ERS_D_Ld30.f45_f45_mg37.I2000Clm50FatesCruRsGs.derecho_intel.clm-FatesColdLandUse">
<phase name="SHAREDLIB_BUILD">
<status>FAIL</status>
<issue>#2810</issue>
</phase>
</test>

<!-- Other submodule test list failures (MOSART, RTM, etc. -->

<test name="SMS_Lh3.f10_f10_mg37.I2000Clm51Sp.derecho_intel.mosart-clmAccelSpinupIgnoreWarn">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
SRCDIR=`./xmlquery SRCROOT --value`
CASEDIR=`./xmlquery CASEROOT --value`
FATESDIR=$SRCDIR/src/fates
FATESPARAMFILE=$CASEDIR/fates_params_hydrograsstempfix.nc

ncgen -o $FATESPARAMFILE $FATESDIR/parameter_files/fates_params_default.cdl

$FATESDIR/tools/modify_fates_paramfile.py --O --fin $FATESPARAMFILE --fout $FATESPARAMFILE --var fates_allom_smode --val 1 --allpfts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ hist_mfilt = 365
hist_nhtfrq = -24
hist_empty_htapes = .true.
use_fates_planthydro= .true.
fates_paramfile = '$CASEROOT/fates_params_hydrograsstempfix.nc'
hist_fincl1 = 'FATES_ERRH2O_SZPF', 'FATES_TRAN_SZPF',
'FATES_SAPFLOW_SZPF', 'FATES_ITERH1_SZPF','FATES_ABSROOT_H2O_SZPF',
'FATES_TRANSROOT_H2O_SZPF','FATES_STEM_H2O_SZPF','FATES_LEAF_H2O_SZPF',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

./xmlchange CLM_BLDNML_OPTS="-i-clm_demand -flanduse_timeseries" --append
./xmlchange CLM_BLDNML_OPTS="-clm_demand flanduse_timeseries" --append
87 changes: 87 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,91 @@
===============================================================
Tag name: ctsm5.3.003
Originator(s): rgknox (Ryan Knox, LBNL, [email protected])
glemieux (Gregory Lemieux, LBNL, [email protected])
Date: Mon Oct 07 10:33:14 AM MDT 2024
One-line Summary: FATES default parameter file update

Purpose and description of changes
----------------------------------

This tag updates the default parameter file for FATES bringing in a number of updates:
- adds two new arctic shrub pfts
- updates the default sapwood allometry mode for grass pfts
- updates understory leaf turnover specifications for longer turnover rates
- changes the default behavior of nutrient uptake

Significant changes to scientifically-supported configurations
--------------------------------------------------------------

Does this tag change answers significantly for any of the following physics configurations?
(Details of any changes will be given in the "Answer changes" section below.)

[Put an [X] in the box for any configuration with significant answer changes.]

[ ] clm6_0

[ ] clm5_1

[ ] clm5_0

[ ] ctsm5_0-nwp

[ ] clm4_5


Bugs fixed
----------
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
Fixes #2783 -- Error in FatescoldLandUse testmod
Fixes FATES#1211 -- Switching the default fates_cnp_prescribed_* parameters from 1 to 0

Notes of particular relevance for developers:
---------------------------------------------
Changes to tests or testing:
FatesColdLandUse build has been added to the list of expected failures due to #2810

Testing summary:
----------------

[PASS means all tests PASS; OK means tests PASS other than expected fails.]

regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing):

derecho ----- OK
izumi ------- OK

fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates-<FATES TAG>-<CTSM TAG>)
derecho ----- OK
izumi ------- OK

Answer changes
--------------

Changes answers relative to baseline:

Summarize any changes to answers, i.e.,
- what code configurations: FATES mode
- what platforms/compilers: ALL
- nature of change (roundoff; larger than roundoff/same climate; new climate): larger than roundoff

Other details
-------------
List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
fates: sci.1.78.2_api.36.0.0 -> sci.1.78.3_api.36.1.0

Pull Requests that document the changes (include PR ids):
https://github.com/ESCOMP/CTSM/pull/2700
https://github.com/NGEET/fates/pull/1255

===============================================================
===============================================================
Tag name: ctsm5.3.002
Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
Date: Thu 26 Sep 2024 03:10:40 PM MDT
One-line Summary: Duplicate tag of ctsm5.3.001

===============================================================
===============================================================
Tag name: ctsm5.3.001
Originator(s): slevis (Samuel Levis,UCAR/TSS,303-665-1310)
Date: Thu 26 Sep 2024 03:10:40 PM MDT
Expand Down
2 changes: 2 additions & 0 deletions doc/ChangeSum
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
Tag Who Date Summary
============================================================================================================================
ctsm5.3.003 multiple 10/07/2024 FATES default parameter file update
ctsm5.3.002 multiple 09/26/2024 Duplicate tag (same as 5.3.001)
ctsm5.3.001 multiple 09/26/2024 Merge b4b-dev
ctsm5.3.0 multiple 09/24/2024 Update surface datasets, CN Matrix, CLM60: excess ice on, explicit A/C on, crop calendars, Sturm snow, Leung dust emissions, prigent roughness data
ctsm5.2.029 multiple 09/24/2024 New surface datasets: double tag of ctsm5.3.0
Expand Down
Loading