Update master branch of NorESMhub/CTSM to be in line with ESCOMP/CTSM master branch #19
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Merge ctsm5.1.dev020 tag into fates_main_api
… into heat_storage_biomass_merge
…e about fates options only being relevant for FATES be consistent between options
…x/CTSM into fates_main_api-merge-ctsm_master Conflicts: bld/namelist_files/namelist_definition_ctsm.xml
…nothing which allows fates namelist tests to work, also add clm5_1 physics default for fates light_res, and remote the fail test for fates and transient
Add heat stored in biomass (for trees and shrubs) to the surface energy balance calculation. Add a switch for it and turn it on by default for clm5_1 physics. It's turned off for clm4_5, clm5_0 physics and when FATES is turned on. Those cases are identical to before, answers only change when it's turned on. Papers describing BHS simulations: R. Meier, Davin, E., Swenson, S., Lawrence, D., and Schwaab, Jo. (2019). Biomass heat storage dampens diurnal temperature variations in forests. Environmental Research Letters. 14. 084026. 10.1088/1748-9326/ab2b4e. S.C. Swenson, Burns, S. P., and Lawrence, D. M. ( 2019). The impact of biomass heat storage on the canopy energy balance and atmospheric stability in the community land model, Journal of Advances in Modeling Earth Systems, 11, 83– 98. https://doi.org/10.1029/2018MS001476 Resolved Conflicts: doc/ChangeLog doc/ChangeSum
…spitfire settings that don't need it to 'none' when light_res is none do not set any of the lighting settings, remove use_cn setting for lightning as not needed
…x/CTSM into fates_main_api-merge-ctsm_master
…on't have to have a different copy for each
There is a compiler error with nag when building in non-debug mode with the latest FATES code. The non-debug nag tests don't seem to have much value, so I'm removing them - either changing them to debug tests or removing them entirely, depending on whether a given configuration seems to have sufficient test coverage.
Arctic changes branch with Kattge in place of Leuning in LUNA
Committing: - two new unit tests and the new scale_by_thickness=.true. version of the vertical interpolation - minor revisions from latest code review
Misc bfb enhancements and fixes
(1) If CISM is running over Antarctica, use virtual glacier columns over
Antarctica
(2) Remove "mec" from some glacier/ice variable names (it is misleading
to have "mec" in variable names when the ice landunit can actually
have multiple columns *or* a single column) (#1294)
(3) Add history file metadata on each variable's l2g_scale_type (adds a
landunit_mask attribute) (#1343)
(4) Use python3 in more shebang lines - needed to run python unit tests
on cheyenne
(5) New compset naming for IG compsets (#1289)
(6) Remove calculation of fun_cost_fix that is overwritten
(#1115)
(7) Bypass grid-level water mass check when fates hydro is active
(#1334)
(8) Remove some dead code (#1333)
- Resolves #1115 (overwrite fun_cost_fix)
- Resolves #1289 (After updating to cism2_1_76 or later,
change compsets involving CISM)
- Resolves #1294 (Replace istice_mec with istice)
- Resolves #1333 (Remove some dead code)
- Resolves #1343 (Add landunit_mask (formerly l2g_scale_type)
metadata to history file)
Misc bfb enhancements and fixes
(1) If CISM is running over Antarctica, use virtual glacier columns over
Antarctica
(2) Remove "mec" from some glacier/ice variable names (it is misleading
to have "mec" in variable names when the ice landunit can actually
have multiple columns *or* a single column) (#1294)
(3) Add history file metadata on each variable's l2g_scale_type (adds a
landunit_mask attribute) (#1343)
(4) Use python3 in more shebang lines - needed to run python unit tests
on cheyenne
(5) New compset naming for IG compsets (#1289)
(6) Remove calculation of fun_cost_fix that is overwritten
(#1115)
(7) Bypass grid-level water mass check when fates hydro is active
(#1334)
(8) Remove some dead code (#1333)
HLM-side changes to allow FATES snow occlusion of LAI
This tag updates the way in which fates is called during restarts to appropriately handle the fates-side snow occlusion code. Additionally, this update points to the most recent fates tag, which includes a number of fates science updates (including the snow occlusion fix) and fates-side bug fixes (see below for list of issues addressed).
Tests recommended by @billsacks SMS_Ld1.nldas2_rnldas2_mnldas2.I2000Ctsm50NwpSpNldasRs.cheyenne_gnu.clm-default ERS_D_Ld3.f10_f10_mg37.I2000Clm50BgcCru.cheyenne_intel.clm-deepsoil_bedrock with scale_by_thickness=.false. PASS bfb against baseline dev036
Correct vert. interpolation in init_interp when soil thicknesses change To correct how init_interp handles soil variables with units of kg/m2 or mm or mm/s (generally speaking so-called extensive properties), we now add DZSOI and a scale_by_thickness flag to restart files. In init_interp we use these to scale the vertical interpolation by soil layer thickness. Resolves #1298
Correct vert. interpolation in init_interp when soil thicknesses change To correct how init_interp handles soil variables with units of kg/m2 or mm or mm/s (generally speaking so-called extensive properties), we now add DZSOI and a scale_by_thickness flag to restart files. In init_interp we use these to scale the vertical interpolation by soil layer thickness. Conflicts: cime_config/config_compsets.xml cime_config/testdefs/testmods_dirs/clm/FatesAllVars/user_nl_clm doc/ChangeSum tools/mkmapdata/mkmapdata.sh
…t be declared as failing
Bring in changes from release-cesm2.2.01 to main-development
MichaelSchulzMETNO
approved these changes
May 10, 2021
kjetilaas
approved these changes
May 10, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Update master branch of NorESMhub/CTSM to be in line with ESCOMP/CTSM master branch
Specific notes
Contributors other than yourself, if any:
No
CTSM Issues Fixed (include github issue #):
#5
Are answers expected to change (and if so in what way)?
Yes
Any User Interface Changes (namelist or namelist defaults changes)?
Yes
Testing performed, if any:
(List what testing you did to show your changes worked as expected)
(This can be manual testing or running of the different test suites)
(Documentation on system testing is here: https://github.com/ESCOMP/ctsm/wiki/System-Testing-Guide)
(aux_clm on cheyenne for gnu/pgi and hobart for gnu/pgi/nag is the standard for tags on master)
NOTE: Be sure to check your Coding style against the standard:
https://github.com/ESCOMP/ctsm/wiki/CTSM-coding-guidelines