Deconflict PR 632 with FATES master (commit 8abef14) #2
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
…routine calculating conductance. Need to revisit stem path lengths and use the Savage fractal stuff.
…ydraulicsMod, used FatesPlantHydraulics HEAD to resolve manually.
…ns not summing to unity.
…nd have primitive arguments, to allow simpler unit testing.
…in hydro routine to use new functions.
…edotransfer functions to handle unconstrained regimes.
Move all the patch-level hist vars to site-level
Fixes to initialization order and circular dependencies
Change license field in zenodo to BSD-3-Clause
Add Zenodo DOI badge to README
…g trampled in merge deconflict
|
Test in progress: UPDATE: 4x5 grid case ran to completion. |
|
@rosiealice when I was deconflicting this branch I noticed that this code seems to be unused: fates/biogeochem/EDPhysiologyMod.F90 Line 1201 in 347270b It looks like it was added here during this commit: 05ac748, but then removed at this commit: e39ad3f. Was it alright that I left out the |
rosiealice
pushed a commit
that referenced
this pull request
Jul 9, 2020
update my fork with original
rosiealice
pushed a commit
that referenced
this pull request
Oct 14, 2021
Dynamic roots md bugfix rkupdates
rosiealice
pushed a commit
that referenced
this pull request
Jul 13, 2023
merge root density disagregation
rosiealice
pushed a commit
that referenced
this pull request
Jul 13, 2023
Adding the fates_rad_model to the parameter file
rosiealice
pushed a commit
that referenced
this pull request
Jan 30, 2024
Update to `sci.1.57.2_api.23.0.0` and add distance utilities
rosiealice
pushed a commit
that referenced
this pull request
Jan 30, 2024
memory and restart updates to TRS
rosiealice
pushed a commit
that referenced
this pull request
Jan 30, 2024
Small quality of life update to cohort age in create_cohort
rosiealice
added a commit
that referenced
this pull request
Apr 1, 2024
Merging this as the code is now running and calculating emissions.
rosiealice
pushed a commit
that referenced
this pull request
Oct 10, 2024
migrating unit testing to folder unit_testing
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:
This PR pre-merges FATES master to resolve the merge conflicts in PR NGEET#632. This is mostly due to the creation of FatesInterfaceTypesMod.F90 during PR NGEET#647.
Note there are also two small updates that were missed in PR 647. Some dead code was removed and
set_bcswas made public (see also NGEET#648).Collaborators: @rgknox
Expectation of Answer Changes:
This should not changes answers relative to the original PR test results.
Checklist:
Test Results:
TBD
CTSM (or) E3SM (specify which) test hash-tag:
CTSM (or) E3SM (specify which) baseline hash-tag:
FATES baseline hash-tag:
Test Output: