Closed davidfgold closed 5 years ago
Hi Dave,
You merged your branch into the master branch. You should actually do the inverse, which is merging the differences between the master and yours into your branch. I reverted your commit but you should still have all the code in your computer. If not, just look at one commit ago in the master branch.
Bernardo
On Thu, Jan 3, 2019 at 7:23 PM dgoldri25 notifications@github.com wrote:
Reflecting changes suggested by CAC
You can view, comment on, or merge this pull request online at:
https://github.com/bernardoct/WaterPaths/pull/8 Commit Summary
- Creating new branch for paper test problem.
- Creating new branch for paper test problem.
- Added water balance
- Updated water balance, still need to fix graph, create utilities and test.
- Fixed problem with Graph
- We are free of syntax/coding errors! Still could be errors in model structure, next step is testing of the continuity model.
- Updated PaperTestProblem. Still having issues running continuity simulation. right now problem seems to be with water_sources vector being created in the simulation object.
- Fixed inputs.
- Fixed inputs.
- Merge remote-tracking branch 'origin/PaperTestProblem' into PaperTestProblem
- Fixed test case inputs -- there are 3 utility allocations in lake
- Changed Continuity graph, Sugar Creek now in Autumn watershed.
- Testing reservoir simulations for 30 years. Need to make sure inflows and demands are realisticly balanced.
- Added policies, instruments seem to be working. ROF tables being constructed and working properly. Need to test the system across multiple realizations and make sure balance is working.
- Updated Dryville/Fallsland allocations for Autumn Lake, Fallsland was routinely running into trouble while dryville always had enough water (over a small number of realizations). Need to extensively test on the cube, 1000 realizations without tables takes far too long in serial (around ~22 hours). Output is not currently being printed when tables are generated, need to figure out why.
File Changes
- A .idea/codeStyles/Project.xml https://github.com/bernardoct/WaterPaths/pull/8/files#diff-0 (29)
- A .idea/codeStyles/codeStyleConfig.xml https://github.com/bernardoct/WaterPaths/pull/8/files#diff-1 (5)
- M CMakeLists.txt https://github.com/bernardoct/WaterPaths/pull/8/files#diff-2 (10)
- M Tests/Tests.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-3 (31)
- M src/ContinuityModels/Base/ContinuityModel.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-4 (38)
- M src/ContinuityModels/Base/ContinuityModel.h https://github.com/bernardoct/WaterPaths/pull/8/files#diff-5 (8)
- M src/Controls/Base/MinEnvFlowControl.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-6 (9)
- M src/Controls/InflowMinEnvFlowControl.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-7 (2)
- M src/DataCollector/AllocatedReservoirDataCollector.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-8 (2)
- M src/DataCollector/MasterDataCollector.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-9 (30)
- M src/Problem/Base/Problem.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-10 (6)
- M src/Problem/Base/Problem.h https://github.com/bernardoct/WaterPaths/pull/8/files#diff-11 (2)
- A src/Problem/PaperTestProblem.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-12 (815)
- A src/Problem/PaperTestProblem.h https://github.com/bernardoct/WaterPaths/pull/8/files#diff-13 (68)
- M src/Problem/Triangle.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-14 (12)
- M src/Simulation/Simulation.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-15 (67)
- M src/SystemComponents/Utility/InfrastructureManager.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-16 (17)
- M src/SystemComponents/Utility/Utility.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-17 (61)
- M src/SystemComponents/Utility/Utility.h https://github.com/bernardoct/WaterPaths/pull/8/files#diff-18 (2)
- M src/SystemComponents/WaterSources/AllocatedReservoir.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-19 (22)
- M src/SystemComponents/WaterSources/Base/WaterSource.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-20 (10)
- M src/SystemComponents/WaterSources/Base/WaterSource.h https://github.com/bernardoct/WaterPaths/pull/8/files#diff-21 (4)
- M src/Utils/Graph/Graph.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-22 (22)
- M src/Utils/Graph/Graph.h https://github.com/bernardoct/WaterPaths/pull/8/files#diff-23 (4)
- M src/main.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-24 (64)
Patch Links:
- https://github.com/bernardoct/WaterPaths/pull/8.patch
- https://github.com/bernardoct/WaterPaths/pull/8.diff
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/bernardoct/WaterPaths/pull/8, or mute the thread https://github.com/notifications/unsubscribe-auth/AIlZrVNOJq0g54StGUBGTMnig9Yr-RPwks5u_oLcgaJpZM4Zo3U8 .
Thanks! I thought something seemed off about the way I had done it, sorry about that.
On Thu, Jan 3, 2019 at 8:19 PM bernardoct notifications@github.com wrote:
Hi Dave,
You merged your branch into the master branch. You should actually do the inverse, which is merging the differences between the master and yours into your branch. I reverted your commit but you should still have all the code in your computer. If not, just look at one commit ago in the master branch.
Bernardo
On Thu, Jan 3, 2019 at 7:23 PM dgoldri25 notifications@github.com wrote:
Reflecting changes suggested by CAC
You can view, comment on, or merge this pull request online at:
https://github.com/bernardoct/WaterPaths/pull/8 Commit Summary
- Creating new branch for paper test problem.
- Creating new branch for paper test problem.
- Added water balance
- Updated water balance, still need to fix graph, create utilities and test.
- Fixed problem with Graph
- We are free of syntax/coding errors! Still could be errors in model structure, next step is testing of the continuity model.
- Updated PaperTestProblem. Still having issues running continuity simulation. right now problem seems to be with water_sources vector being created in the simulation object.
- Fixed inputs.
- Fixed inputs.
- Merge remote-tracking branch 'origin/PaperTestProblem' into PaperTestProblem
- Fixed test case inputs -- there are 3 utility allocations in lake
- Changed Continuity graph, Sugar Creek now in Autumn watershed.
- Testing reservoir simulations for 30 years. Need to make sure inflows and demands are realisticly balanced.
- Added policies, instruments seem to be working. ROF tables being constructed and working properly. Need to test the system across multiple realizations and make sure balance is working.
- Updated Dryville/Fallsland allocations for Autumn Lake, Fallsland was routinely running into trouble while dryville always had enough water (over a small number of realizations). Need to extensively test on the cube, 1000 realizations without tables takes far too long in serial (around ~22 hours). Output is not currently being printed when tables are generated, need to figure out why.
File Changes
- A .idea/codeStyles/Project.xml https://github.com/bernardoct/WaterPaths/pull/8/files#diff-0 (29)
- A .idea/codeStyles/codeStyleConfig.xml https://github.com/bernardoct/WaterPaths/pull/8/files#diff-1 (5)
- M CMakeLists.txt https://github.com/bernardoct/WaterPaths/pull/8/files#diff-2 (10)
- M Tests/Tests.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-3 (31)
- M src/ContinuityModels/Base/ContinuityModel.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-4 (38)
- M src/ContinuityModels/Base/ContinuityModel.h https://github.com/bernardoct/WaterPaths/pull/8/files#diff-5 (8)
- M src/Controls/Base/MinEnvFlowControl.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-6 (9)
- M src/Controls/InflowMinEnvFlowControl.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-7 (2)
- M src/DataCollector/AllocatedReservoirDataCollector.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-8 (2)
- M src/DataCollector/MasterDataCollector.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-9 (30)
- M src/Problem/Base/Problem.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-10 (6)
- M src/Problem/Base/Problem.h https://github.com/bernardoct/WaterPaths/pull/8/files#diff-11 (2)
- A src/Problem/PaperTestProblem.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-12 (815)
- A src/Problem/PaperTestProblem.h https://github.com/bernardoct/WaterPaths/pull/8/files#diff-13 (68)
- M src/Problem/Triangle.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-14 (12)
- M src/Simulation/Simulation.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-15 (67)
- M src/SystemComponents/Utility/InfrastructureManager.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-16 (17)
- M src/SystemComponents/Utility/Utility.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-17 (61)
- M src/SystemComponents/Utility/Utility.h https://github.com/bernardoct/WaterPaths/pull/8/files#diff-18 (2)
- M src/SystemComponents/WaterSources/AllocatedReservoir.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-19 (22)
- M src/SystemComponents/WaterSources/Base/WaterSource.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-20 (10)
- M src/SystemComponents/WaterSources/Base/WaterSource.h https://github.com/bernardoct/WaterPaths/pull/8/files#diff-21 (4)
- M src/Utils/Graph/Graph.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-22 (22)
- M src/Utils/Graph/Graph.h https://github.com/bernardoct/WaterPaths/pull/8/files#diff-23 (4)
- M src/main.cpp https://github.com/bernardoct/WaterPaths/pull/8/files#diff-24 (64)
Patch Links:
- https://github.com/bernardoct/WaterPaths/pull/8.patch
- https://github.com/bernardoct/WaterPaths/pull/8.diff
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub https://github.com/bernardoct/WaterPaths/pull/8, or mute the thread < https://github.com/notifications/unsubscribe-auth/AIlZrVNOJq0g54StGUBGTMnig9Yr-RPwks5u_oLcgaJpZM4Zo3U8
.
— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHub https://github.com/bernardoct/WaterPaths/pull/8#issuecomment-451329757, or mute the thread https://github.com/notifications/unsubscribe-auth/ASgHLluF6HZBZkCD4LztqpbkKTYuqAx0ks5u_qwigaJpZM4Zo3U8 .
-- David Gold PhD Candidate Environmental & Water Resources Systems School of Civil & Environmental Engineering 207 Hollister Hall Cornell University Ithaca, NY 14850-3501
Reflecting changes suggested by CAC