Update to Hymod and header names in source files #27
Conversation
…me delay); Update header file names in src files
models/hymod/include/Hymod.h
Outdated
| {} | ||
| }; | ||
|
|
||
| enum HighModeErrorCodes |
There was a problem hiding this comment.
Is this supposed to be HyModErrorCodes?
There was a problem hiding this comment.
Should fix this before we merge
| // increase final mass by calculated fluxes | ||
| final_mass += (calculated_fluxes.et_loss + calculated_fluxes.runnoff + calculated_fluxes.slow_flow); | ||
|
|
||
| if ( inital_mass - final_mass > 0.000001 ) |
There was a problem hiding this comment.
This tolerance should ultimately be a little more dynamic, perhaps a macro to define application wide mass balance tolerance?
There was a problem hiding this comment.
That was a first cut
There was a problem hiding this comment.
according to my git this did not add new files just modify existing files.
There was a problem hiding this comment.
New commit removed the duplicate files
src/main.cpp
Outdated
| @@ -0,0 +1,29 @@ | |||
| #include "HY_Catchment.hpp" | |||
There was a problem hiding this comment.
This file was moved to src/test_main.cpp, please remove this one too.
models/hymod/include/Hymod.h
Outdated
| {} | ||
| }; | ||
|
|
||
| enum HighModeErrorCodes |
There was a problem hiding this comment.
Should fix this before we merge
models/hymod/include/Hymod.h
Outdated
| @@ -67,7 +68,7 @@ struct hymod_fluxes | |||
| {} | |||
| }; | |||
|
|
|||
| enum HighModeErrorCodes | |||
| enum HighModErrorCodes | |||
There was a problem hiding this comment.
@donaldwj can you push this last fix and I'll merge this PR.
|
The file was missing put it is the DT function from the C implementation of
hymod. Yes it should be renamed.
Donald Johnson
…On Mon, Mar 23, 2020 at 12:38 PM Nels ***@***.***> wrote:
***@***.**** requested changes on this pull request.
------------------------------
In models/hymod/include/Hymod.h
<#27 (comment)>:
> @@ -67,7 +68,7 @@ struct hymod_fluxes
{}
};
-enum HighModeErrorCodes
+enum HighModErrorCodes
High != Hy
------------------------------
In models/hymod/include/Hymod.h
<#27 (comment)>:
> @@ -4,6 +4,7 @@
#include <cmath>
#include <vector>
#include "LinearReservoir.hpp"
+#include "Pdm03.h"
What is Pdm03.h? I don't see it as an addition in this PR nor is it in the
source already. Is it needed? If so we need to stage it and maybe name it
something a little more clear?
—
You are receiving this because you authored the thread.
Reply to this email directly, view it on GitHub
<#27 (review)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AF6KABE2S4VXUWKAJNE3S6TRI6NBRANCNFSM4LPNNG6A>
.
--
Donald W Johnson
205-347-1467
National Water Center
Tuscaloosa AL
|
[Short description explaining the high-level reason for the pull request]
Change hymod to use a linear reservoir for slow flow instead of a time delay.
Update the name of include files in source to be *.hpp when necessary
Additions
Removals
Changes
Testing
Screenshots
Notes
Todos
Checklist
Testing checklist (automated report can be put here)
Target Environment support