conflict resolutions with PARTEH #1
Merged
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
…on pass. Not hooked into FATES though.
…nit testing framework.
…e the CNP hypothesis (external).
…y and needs cleanup.
…on parameter, and checks.
…e organ variable to describe the organ dimension in the parameter files.
…able base procedure. Also, added support variables to the global instance for number of variables, number of boundary conditions, and number of positions. Also, removed the plant instance prt_vartypes structures pointer to the global instance. This was unnecessary, as there is only one global intance, which has a generic pointer.
… Also added flexibility in leaf flushing algorithm.
…al, fixed day-> conversion factor
|
I can't really see the relevant diffs of this, but I will accept this PR and then look at the diff between my PR and the current master. |
ckoven
pushed a commit
that referenced
this pull request
Nov 3, 2018
…to_merge parteh conflict resolutions
ckoven
pushed a commit
that referenced
this pull request
Jan 17, 2019
conflict resolutions performed by @rgknox to bring this branch up to speed with parteh-master. This will make testing and eventual merge into master much faster.
ckoven
pushed a commit
that referenced
this pull request
Apr 25, 2019
Changed default seed_rain to maintain behavior with base
ckoven
pushed a commit
that referenced
this pull request
Jul 15, 2019
Updates to PR NGEET#468 (phenology status timers)
ckoven
pushed a commit
that referenced
this pull request
Mar 27, 2020
…merged-rkfixes conditioning age mortality rate and history output
ckoven
pushed a commit
that referenced
this pull request
Jul 24, 2020
merge medlyn changes up to master
glemieux
pushed a commit
that referenced
this pull request
Jul 13, 2022
Bring fatesluc up to latest tag and deconflict
ckoven
pushed a commit
that referenced
this pull request
Dec 2, 2022
updates to live grass fire pools and other changes. Adding to original PR
glemieux
pushed a commit
that referenced
this pull request
Aug 10, 2023
…actor Refactor `SeedlingParPatch` to avoid code duplication
glemieux
pushed a commit
that referenced
this pull request
Oct 14, 2024
remove damage and parameter changes, merge in main
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.
also added a restart variable.