Expansion data file and model for expansion pumps #154
Conversation
Parses a .neinp file to read in expansion data. Made sure constraints for expansion pumps are added the same way as regular pumps
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## v0.10-cleanup #154 +/- ##
=================================================
- Coverage 80.42% 76.71% -3.71%
=================================================
Files 42 43 +1
Lines 5501 5819 +318
=================================================
+ Hits 4424 4464 +40
- Misses 1077 1355 +278
... and 6 files with indirect coverage changes Continue to review full report in Codecov by Sentry.
|
src/WaterModels.jl
Outdated
| @@ -102,6 +102,7 @@ include("util/obbt.jl") | |||
| # Deprecated functions. | |||
| include("deprecated.jl") | |||
|
|
|||
| println("Running the cleaned up version of WaterModels.jl") | |||
| error_message *= "$(replace(comp_type, "_" => " ")) $(i) is not defined." | ||
| Memento.error(_LOGGER, error_message) | ||
| end | ||
| if(haskey(data,comp_type)) |
There was a problem hiding this comment.
data should always include ne_pump as a key, even if there are no corresponding entries. This if statement should be removed.
| warning_message *= "from node $(comp["node_fr"])." | ||
| Memento.warn(_LOGGER, warning_message) | ||
| end | ||
| if(haskey(data,comp_type)) |
There was a problem hiding this comment.
Same here concerning the ne_pump key.
| @@ -1139,6 +1151,78 @@ function _apply_pump_unit_transform!( | |||
| end | |||
| end | |||
|
|
|||
| function _apply_ne_pump_unit_transform!( | |||
There was a problem hiding this comment.
Are there additional constants associated with network expansion, here, that need to be scaled? For example, construction cost?
src/core/pump.jl
Outdated
| base_flow = wm_data["per_unit"] ? wm_data["base_flow"] : 1.0 | ||
| correction_func = x -> _correct_ne_pumps!(x, base_flow) | ||
| apply_wm!(correction_func, data; apply_to_subnetworks = true) | ||
| if(haskey(data,"ne_pump")) |
There was a problem hiding this comment.
Same comment that ne_pump should always be within data.
src/prob/wf.jl
Outdated
| @@ -114,6 +119,7 @@ function build_wf(wm::AbstractWaterModel) | |||
|
|
|||
| # Add the objective. | |||
| objective_wf(wm) | |||
| println(wm.model) | |||
src/prob/wf.jl
Outdated
| @@ -266,6 +272,7 @@ function build_mn_wf(wm::AbstractWaterModel) | |||
|
|
|||
| # Add the objective. | |||
| objective_wf(wm) | |||
| println(wm.model) | |||
| @@ -12,9 +12,9 @@ dictionary of data). Here, `skip_correct` will skip data correction routines | |||
| (e.g., component status propagation) if set to `true`, and `per_unit` will | |||
| translate the data model to a per-unit measurement system if set to `true`. | |||
| """ | |||
| function parse_file(path::String; skip_correct::Bool = false, per_unit::Bool = true) | |||
| function parse_file(path::String; ne_path::String = "", skip_correct::Bool = false, per_unit::Bool = true) | |||
There was a problem hiding this comment.
I'm not sure this should be the preferred method for passing in network expansion data. For nonstandard network components, the preferred way would be to pass in modifications via an auxiliary JSON file, then update the base network data with these modifications. For example,
network = WaterModels.parse_file(network_path)
modifications = WaterModels.parse_file(modifications_path; skip_correct = true)
InfrastructureModels.update_data!(network, modifications)
WaterModels.correct_network_data!(network)Here, network_path would be the original .inp file and modifications_path would be a JSON file that includes the data for ne_pump that would ultimately extend network. Does this make sense? Happy to help if there's a more concrete example of these data.
| @@ -70,7 +70,9 @@ function correct_network_data!(data::Dict{String, <:Any}; per_unit::Bool = true) | |||
| correct_pipes!(data) | |||
| correct_des_pipes!(data) | |||
| correct_pumps!(data) | |||
| correct_ne_pumps!(data) | |||
| if(haskey(data,"ne_pump")) | |||
| @@ -4,6 +4,13 @@ function _initialize_epanet_dictionary() | |||
| return data # Return an empty dictionary of the sectional data. | |||
| end | |||
|
|
|||
| function _initialize_epanet_ne_dictionary(data::Dict{String,<:Any}) | |||
There was a problem hiding this comment.
Let's discuss whether these changes to epanet.jl are necessary or if these network expansion data can instead be passed in through an auxiliary JSON file.
To solve the problem for multiple non-consecutive representative days, tank volume needs to be updated at the end of every day.
Updating objective_ne to minimize the build cost over the first time step only Adding temporary commits to support using scip
NC: Pump power lin apprx wf: fixing binaries from a solution fixing_binary_variables update balerma.inp demand pattern
Currently, while merging ne tanks with regular tanks, if a non-numeric id is given to ne tanks, merging replaces one of the tanks. Fixed this by modifying the ids of ne tanks while merging
Parses a .neinp file to read in expansion data. Made sure constraints for expansion pumps are added the same way as regular pumps