Hillslope hydrology #1715
Merged
Hillslope hydrology #1715
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
first set of changes for hillslope hydrology global implementation
added new routines
removed intials
merged to r226
added hillslope factory modules
fixed positive drainage in soilhydrologymod
fixed patch%column assinment in histfilemod
added getglobalindex to histfilemod
update SoilHydrology
Update to clm4_5_18_r270
break long line, needed for nag
tag clm4_5_18_r270 from svn No changes here, just doing the merge so history shows us being up-to-date with r270
Will allow running from a standalone checkout
(The latter 2 have no theme; they are intended to exercise all options.) * HillslopeFromFile * HillslopeC * HillslopeD
Suites aux_clm and hillslope: * ERP_D_P64x2_Ld10.f10_f10_mg37.I2000Clm51Bgc.derecho_intel.clm-Hillslope * SMS_D_Mmpi-serial_Ld5.5x5_amazon.I1850Clm51Bgc.derecho_gnu.clm-HillslopeC * SMS_D_Ld3.f10_f10_mg37.I2000Clm51Bgc.izumi_nag.clm-HillslopeD Suite hillslope: * SMS_D_Ld3.f10_f10_mg37.I1850Clm51Bgc.derecho_intel.clm-HillslopeFromFile
samsrabin
added
priority: high
Hillslope hydrology pre-merge changes
|
Per meeting today with @swensosc:
@billsacks, per our recent conversation, would you mind going ahead and approving this PR? With the recent branch protection changes, we can't merge until all approvals are given. Thanks! |
billsacks
approved these changes
Feb 8, 2024
There was a problem hiding this comment.
Thank you for all of your amazing work on this @swensosc and @samsrabin !!!
|
Scripts will come in later. |
Merged
samsrabin
added
enhancement
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
Add hillslope hydrology parameterization
Specific notes
Changes include multiple soil columns per vegetated landunit, additional meteorological downscaling, new subsurface lateral flow equations, and a hillslope routing parameterization.
Described in:
Swenson, S. C., Clark, M., Fan, Y., Lawrence, D. M., & Perket, J. (2019). Representing intra-hillslope lateral subsurface flow in the community land model. Journal of Advances in Modeling Earth Systems, 11, 4044–4065. https://doi.org/10.1029/ 2019MS001833
Contributors other than yourself, if any: None
CTSM Issues Fixed (include github issue #): None
Are answers expected to change (and if so in what way)?
FSDSanswers change due to rounding differences, since the history field now uses a column-level variable instead of a gridcell-level one. (Confirmed using this branch.)oldhydtest changes answers due to the removal of theorigflagparameter, which was intended to replicate CLM4 behavior.Any User Interface Changes (namelist or namelist defaults changes)?
Adds namelist parameters:
use_hillslope: Toggle to turn on the hillslope modeldownscale_hillslope_meteorology: Toggle to turn on meteorological downscaling in hillslope modeluse_hillslope_routing: Toggle to turn on surface water routing in the hillslope hydrology modelhillslope_head_gradient_method: Method for calculating hillslope saturated head gradienthillslope_transmissivity_method: Method for calculating transmissivity of hillslope columnshillslope_pft_distribution_method: Method for distributing PFTs across hillslope columnshillslope_soil_profile_method: Method for distributing soil thickness across hillslope columnsTesting performed, if any:
aux_clmon Derecho and Izumi is bit-for-bit identical toctsm5.1.dev169aside from the changes mentioned above.