Skip to content

Commit

Permalink
Merge pull request #2965 from glemieux/fates-api37.1
Browse files Browse the repository at this point in the history
ctsm5.3.025: Update default FATES parameter file to API 37.1
  • Loading branch information
ekluzek authored Feb 20, 2025
2 parents 70b8730 + 24e4d76 commit dfc19aa
Show file tree
Hide file tree
Showing 5 changed files with 89 additions and 3 deletions.
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.80.11_api.37.0.0
fxtag = sci.1.81.0_api.37.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
2 changes: 1 addition & 1 deletion bld/namelist_files/namelist_defaults_ctsm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ 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.1.0_14pft_c241003.nc</fates_paramfile>
<fates_paramfile>lnd/clm2/paramdata/fates_params_api.37.1.0_14pft_c250214.nc</fates_paramfile>


<!-- ================================================================== -->
Expand Down
85 changes: 85 additions & 0 deletions doc/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,89 @@
===============================================================
Tag name: ctsm5.3.025
Originator(s): glemieux (Gregory Lemieux, LBNL, [email protected])
Date: Thu Feb 20 14:24:45 MST 2025
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 parameters for land use grazing
- updates the FATES z0mr turbulence parameters for consistency with CLM
- adds FATES pft-dependent btran model switches for a forthcoming update
- updates the default hydro solver switch to Picard 2D

This also updates the default FATES tag which includes two issue fixes and introduces
the aforementioned land use grazing capability.

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_0

[ ] ctsm5_0-nwp

[ ] clm4_5


Bugs fixed
----------
List of CTSM issues fixed (include CTSM Issue # and description) [one per line]:
Fixes FATES#1316 -- z0mr parameters are all the same in the default parameter file
Fixes FATES#773 -- update the default hydraulics solver?

Notes of particular relevance for users
---------------------------------------
Changes to CTSM's user interface (e.g., new/renamed XML or namelist variables):
The FATES tag update includes new history outputs associated with land use grazing.

Changes made to namelist defaults (e.g., changed parameter values):
The fates default parameter file has been updated. See the associated FATES pull
requests for more detail.


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

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

derecho -----
izumi -------

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: Yes, for FATES tests only

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


Other details
-------------
List any git submodules updated (cime, rtm, mosart, cism, fates, etc.):
fates: sci.1.80.11_api.37.0.0 -> sci.1.81.0_api.37.1.0

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

===============================================================
===============================================================
Tag name: ctsm5.3.024
Originator(s): xinchang (Cathy Xinchang Li, U of Illinois - Urbana-Champaign)
Date: Tue Feb 11 09:56:24 MST 2025
Expand Down
1 change: 1 addition & 0 deletions doc/ChangeSum
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Tag Who Date Summary
============================================================================================================================
ctsm5.3.025 glemieux 02/20/2025 FATES default parameter file update
ctsm5.3.024 xinchang 02/11/2025 Change choice of pressure in CLMU building energy model
ctsm5.3.023 afoster 02/08/2025 merge b4b-dev
ctsm5.3.022 glemieux 02/06/2025 Update FATES namelist build to avoid Meier2022
Expand Down
2 changes: 1 addition & 1 deletion src/fates
Submodule fates updated 61 files
+71 −0 .github/ISSUE_TEMPLATE/bug.yml
+30 −0 .github/ISSUE_TEMPLATE/feature.yml
+14 −0 .github/ISSUE_TEMPLATE/task.yml
+1 −1 CODE_OF_CONDUCT.md
+1 −0 biogeochem/CMakeLists.txt
+6 −10 biogeochem/EDCanopyStructureMod.F90
+104 −377 biogeochem/EDCohortDynamicsMod.F90
+23 −137 biogeochem/EDPatchDynamicsMod.F90
+29 −14 biogeochem/EDPhysiologyMod.F90
+4 −5 biogeochem/FatesCohortMod.F90
+41 −0 biogeochem/FatesLandUseChangeMod.F90
+304 −61 biogeochem/FatesPatchMod.F90
+19 −18 biogeochem/FatesSoilBGCFluxMod.F90
+2 −1 biogeophys/CMakeLists.txt
+5 −5 biogeophys/EDAccumulateFluxesMod.F90
+6 −5 biogeophys/EDBtranMod.F90
+4 −4 biogeophys/FatesPlantHydraulicsMod.F90
+5 −3 biogeophys/FatesPlantRespPhotosynthMod.F90
+0 −7 main/CMakeLists.txt
+8 −6 main/EDInitMod.F90
+19 −8 main/EDMainMod.F90
+61 −1 main/EDParamsMod.F90
+12 −1 main/EDPftvarcon.F90
+53 −6 main/EDTypesMod.F90
+10 −4 main/FatesGlobals.F90
+16 −21 main/FatesHistoryInterfaceMod.F90
+26 −17 main/FatesInterfaceMod.F90
+1 −1 main/FatesInterfaceTypesMod.F90
+5 −6 main/FatesInventoryInitMod.F90
+40 −5 main/FatesRestartInterfaceMod.F90
+1,853 −0 parameter_files/archive/api37.1.0_021425_params_default.cdl
+73 −0 parameter_files/archive/api37.1.0_pr1140_patch_params.xml
+42 −0 parameter_files/archive/api37.1.0_pr1262_patch_params.xml
+33 −0 parameter_files/archive/api37.1.0_pr1263_patch_params.xml
+30 −0 parameter_files/archive/api37.1.0_pr1319_patch_params.xml
+51 −11 parameter_files/fates_params_default.cdl
+45 −3 parteh/PRTGenericMod.F90
+58 −1 parteh/PRTLossFluxesMod.F90
+1 −2 radiation/CMakeLists.txt
+10 −15 radiation/FatesRadiationDriveMod.F90
+5 −0 testing/CMakeLists.txt
+24 −0 testing/functional_testing/patch/CMakeLists.txt
+52 −0 testing/functional_testing/patch/FatesTestPatch.F90
+39 −0 testing/functional_testing/patch/patch_test.py
+7 −0 testing/functional_tests.cfg
+8 −0 testing/load_functional_tests.py
+3 −13 testing/run_functional_tests.py
+3 −1 testing/testing_shr/CMakeLists.txt
+536 −0 testing/testing_shr/FatesFactoryMod.F90
+4 −1 testing/testing_shr/FatesUnitTestParamReaderMod.F90
+32 −0 testing/testing_shr/FatesUnitTestUtils.F90
+241 −0 testing/testing_shr/SyntheticPatchTypes.F90
+6 −0 testing/unit_testing/count_cohorts_test/CMakeLists.txt
+112 −0 testing/unit_testing/count_cohorts_test/test_CountCohorts.pf
+6 −0 testing/unit_testing/insert_cohort_test/CMakeLists.txt
+379 −0 testing/unit_testing/insert_cohort_test/test_InsertCohort.pf
+6 −0 testing/unit_testing/sort_cohorts_test/CMakeLists.txt
+282 −0 testing/unit_testing/sort_cohorts_test/test_SortCohorts.pf
+6 −0 testing/unit_testing/validate_cohorts_test/CMakeLists.txt
+246 −0 testing/unit_testing/validate_cohorts_test/test_ValidateCohorts.pf
+14 −0 testing/unit_tests.cfg

0 comments on commit dfc19aa

Please sign in to comment.