Merge master 20240313 #2421
Merged
Merge master 20240313 #2421
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
This reverts commit 04167dc.
Hillslope hydrology
Bring in hillslope hydrology.
Add hillslope hydrology parameterization Changes include multiple soil columns per vegetated landunit, additional meteorological downscaling, new subsurface lateral flow equations, and a hillslope routing parameterization. slevis resolved conflicts: doc/ChangeLog doc/ChangeSum
Set initial t_soisno=272 for soils and 274K for urban road
Set initial t_soisno=272K for soils and 274K for urban road
…ot really needed this resolves ESCOMP#2412
…the temporary directory, this is handling for ESCOMP#2405
Merge b4bdev 20240307
Merge b4b-dev Update of externals to what's expected in cesm2_3_beta17. Some documentation updates including a rebuild of the documentation and updating how images are handled with git lfs. Improvements to the documentation for residue removal and tillage for prognostic crops.
samsrabin
approved these changes
Mar 13, 2024
Merged
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
Merge ctsm5.1.dev172 to b4b-dev