Update hymod to include an ET function that uses pdm03 from Fred. #39
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
…me delay); Update header file names in src files
hellkite500
previously approved these changes
Apr 3, 2020
| @@ -91,8 +91,19 @@ class hymod_kernel | |||
| return 0.0; | |||
| } | |||
|
|
|||
| //! stub function to simulate losses due to evapotransportation | |||
| static double calc_et2(double soil_m, void* et_params) | |||
There was a problem hiding this comment.
I think we should rename this function to calc_et_
There was a problem hiding this comment.
maybe calc_et_pdm03?
| @@ -14,6 +14,7 @@ extern "C" | |||
| double Cpar; | |||
| double B; | |||
| double XHuz; | |||
| double Huz; | |||
There was a problem hiding this comment.
We really need to fix up all these variable names. Will open an issue to do so.
| */ | ||
|
|
||
|
|
||
| inline double greg_2_jul(long year, long mon, long day, long h, long mi, double se) |
There was a problem hiding this comment.
If we keep these around long enough, a date/time utility header might be a good idea.
|
@donaldwj There are some conflicts with master, can you rebase and update your branch? |
|
Can you give the syntax for the rebase. I normally use just use pull upstream to resolve upstream conflicts. |
donaldwj
commented
Apr 3, 2020
hellkite500
approved these changes
Apr 3, 2020
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.
[Short description explaining the high-level reason for the pull request]
Additions
Removals
Changes
Testing
Screenshots
Notes
Todos
Checklist
Testing checklist (automated report can be put here)
Target Environment support