Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP #359dc nodal expansion #638

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions src/constraints/constraint_node_voltage_angle.jl
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
Outer approximation of the non-linear terms.
"""
function add_constraint_node_voltage_angle!(m::Model)
@fetch node_voltage_angle, connection_flow = m.ext[:variables]
@fetch node_voltage_angle, connection_flow, connections_invested_available = m.ext[:variables]
t0 = _analysis_time(m)
m.ext[:constraints][:node_voltage_angle] = Dict(
(connection=conn, node1=n_to, node2=n_from, stochastic_scenario=s, t=t) => @constraint(
Expand All @@ -47,7 +47,7 @@ function add_constraint_node_voltage_angle!(m::Model)
t=t,
)
)
==
<=
1 / connection_reactance[(connection=conn, stochastic_scenario=s, analysis_time=t0, t=t)]
* connection_reactance_base[(connection=conn, stochastic_scenario=s, analysis_time=t0, t=t)]
* (sum(
Expand All @@ -57,6 +57,16 @@ function add_constraint_node_voltage_angle!(m::Model)
node_voltage_angle[n_to, s, t]
for (n_to, s, t) in node_voltage_angle_indices(m; node=n_to, stochastic_scenario=s, t=t)
))
+ ((candidate_connections(connection=conn) != nothing) ?
big_m(model=m.ext[:instance])*(1 - expr_sum(
connections_invested_available[conn, s, t1] for (conn, s, t1) in connections_invested_available_indices(
m;
connection=conn,
stochastic_scenario=s,
t=t_in_t(m; t_short=t),
);
init=0,
)) : 0)
) for (conn, n_to, n_from, s, t) in constraint_node_voltage_angle_indices(m)
)
end
Expand Down
47 changes: 47 additions & 0 deletions src/data_structure/check_data_structure.jl
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ function check_data_structure(; log_level=3)
#check_islands(; log_level=log_level)
check_rolling_branching()
check_parameter_values()
check_binary_investments_voltage_angle_lines()
end

"""
Expand Down Expand Up @@ -298,6 +299,52 @@ function check_rolling_branching()
end
end

function check_binary_investments_voltage_angle_lines()
errors_cont = [
(m,conn)
for m in model()
for conn in intersect(SpineOpt.indices(candidate_connections),SpineOpt.indices(connection_reactance))
#for conn in SpineOpt.indices(has_voltage_angle)
if SpineOpt.connection_investment_variable_type(connection=conn) == :variable_type_continuous
]
errors_int = [
(m,conn)
for m in model()
for conn in intersect(SpineOpt.indices(candidate_connections),SpineOpt.indices(connection_reactance))
#for conn in SpineOpt.indices(has_voltage_angle)
if (SpineOpt.connection_investment_variable_type(connection=conn) == :variable_type_integer && SpineOpt.candidate_connections(connection=conn) != 1)
]
warnings = [
(m,conn)
for m in model()
for conn in intersect(SpineOpt.indices(candidate_connections),SpineOpt.indices(connection_reactance))
#for conn in SpineOpt.indices(has_voltage_angle)
if SpineOpt.candidate_connections(connection=conn) != 1
]
_check(
isempty(errors_cont),
"This connection has a continous investment variable type:
$(join(errors_cont, ", ", " and ")) "
* "Investment structure only supported for binary investments.
By defining a connection reactance, your model will run a DC power flow calculation, which does not support integer or continuous investment decisions",
)

_check(
isempty(errors_int),
"This connection has multiple investment candidates:
$(join(errors_int, ", ", " and ")) "
* "Investment structure only supported for binary investments.
By defining a connection reactance, your model will run a DC power flow calculation, which does not support integer or continuous investment decisions",
)

_check_warn(
isempty(warnings),
"This connection has multiple investment candidates:
$(join(warnings, ", ", " and ")) "
* "Investment structure only supported for binary investment decisions, the model will invest at most in 1 connection",
)
end

function check_parameter_values()
check_model_start_smaller_than_end()
check_operating_points()
Expand Down
107 changes: 87 additions & 20 deletions test/constraints/constraint_connection.jl
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
relationship_parameter_values =
[["connection__node__node", ["connection_ca", "node_c","node_a"], "fixed_pressure_constant_1", fixed_pressure_constant_1_[("connection_ca", "node_c","node_a")]]]
SpineInterface.import_data(
url_in;
url_in;
object_parameter_values=object_parameter_values, relationship_parameter_values=relationship_parameter_values, relationships=relationships
)
m = run_spineopt(url_in; log_level=0, optimize=false)
Expand Down Expand Up @@ -173,7 +173,7 @@
["connection__node__node", ["connection_ca", "node_c","node_a"], "fixed_pressure_constant_0", fixed_pressure_constant_0_[("connection_ca", "node_c","node_a")]]
]
SpineInterface.import_data(url_in; object_parameter_values=object_parameter_values, relationship_parameter_values=relationship_parameter_values, relationships=relationships)

m = run_spineopt(url_in; log_level=0, optimize=false)
var_connection_flow = m.ext[:variables][:connection_flow]
var_binary_flow = m.ext[:variables][:binary_gas_connection_flow]
Expand Down Expand Up @@ -232,7 +232,7 @@
relationship_parameter_values =
[["connection__node__node", ["connection_ca", "node_c","node_a"], "fixed_pressure_constant_1", fixed_pr_constant_1_[("connection_ca", "node_c","node_a")]]]
SpineInterface.import_data(url_in; object_parameter_values=object_parameter_values, relationship_parameter_values=relationship_parameter_values, relationships=relationships)

m = run_spineopt(url_in; log_level=0, optimize=false)
var_binary_flow = m.ext[:variables][:binary_gas_connection_flow]
constraint = m.ext[:constraints][:connection_unitary_gas_flow]
Expand Down Expand Up @@ -279,10 +279,73 @@
]
_load_test_data(url_in, test_data)
SpineInterface.import_data(url_in; object_parameter_values=object_parameter_values, relationship_parameter_values=relationship_parameter_values, relationships=relationships)


m = run_spineopt(url_in; log_level=0, optimize=false)
var_connection_flow = m.ext[:variables][:connection_flow]
var_voltage_angle = m.ext[:variables][:node_voltage_angle]
constraint = m.ext[:constraints][:node_voltage_angle]
@test length(constraint) == 2
scenarios = (stochastic_scenario(:parent),)
time_slices = time_slice(m; temporal_block=temporal_block(:hourly))
@testset for (s, t) in zip(scenarios, time_slices)
@testset for ((conn,n_to,n_from), val) in fix_ratio_out_in
react = conn_react[conn]
react_p_u = conn_react_p_u[conn]
conn = connection(Symbol(conn))
n_from = node(Symbol(n_from))
n_to = node(Symbol(n_to))
var_conn_flow_key1 = (conn, n_from, direction(:from_node), s, t)
var_conn_flow_key2 = (conn, n_to, direction(:from_node), s, t)
var_volt_ang_key1 = (n_from , s, t)
var_volt_ang_key2 = (n_to, s, t)
var_conn_flow1 = var_connection_flow[var_conn_flow_key1...]
var_conn_flow2 = var_connection_flow[var_conn_flow_key2...]
var_volt_ang1 = var_voltage_angle[var_volt_ang_key1...]
var_volt_ang2 = var_voltage_angle[var_volt_ang_key2...]
con_key = (conn, n_to, n_from, [s], t)
expected_con = @build_constraint(var_conn_flow1 - var_conn_flow2 <= -(var_volt_ang1-var_volt_ang2)/react*react_p_u)
con = constraint[con_key...]
observed_con = constraint_object(con)
@show(expected_con)
@show(observed_con)
@test _is_constraint_equal(observed_con, expected_con)
end
end
end
@testset "constraint_node_voltage_angle_with_candidates" begin
conn_react = Dict("connection_ca" => 0.17)
conn_react_p_u = Dict("connection_ca" => 250)
has_volt_ang = Dict("node_c" => true,"node_a" => true,)
fix_ratio_out_in = Dict(("connection_ca", "node_a","node_c") => 1)
candidates = Dict("connection_ca" => 1)


relationships = [
["connection__node__node", [ "connection_ca", "node_a", "node_c"]],
["connection__from_node", [ "connection_ca", "node_a"]],
["connection__investment_temporal_block", ["connection_ca", "hourly"]],
["connection__investment_stochastic_structure", ["connection_ca", "stochastic"]],
]
object_parameter_values = [
["connection", "connection_ca", "connection_reactance", conn_react["connection_ca"]],
["connection", "connection_ca", "connection_reactance_base", conn_react_p_u["connection_ca"]],
["node", "node_c", "has_voltage_angle", has_volt_ang["node_c"]],
["node", "node_a", "has_voltage_angle", has_volt_ang["node_a"]],
["connection", "connection_ca", "candidate_connections", candidates["connection_ca"]],
["model", "instance", "big_m",10000],
]
relationship_parameter_values =
[
["connection__node__node", ["connection_ca", "node_a","node_c"], "fix_ratio_out_in_connection_flow", fix_ratio_out_in[("connection_ca", "node_a","node_c")]],
]
_load_test_data(url_in, test_data)
SpineInterface.import_data(url_in; object_parameter_values=object_parameter_values, relationship_parameter_values=relationship_parameter_values, relationships=relationships)

m = run_spineopt(url_in; log_level=0, optimize=false)
var_connection_flow = m.ext[:variables][:connection_flow]
var_voltage_angle = m.ext[:variables][:node_voltage_angle]
var_conn_invested_available = m.ext[:variables][:connections_invested_available]

constraint = m.ext[:constraints][:node_voltage_angle]
@test length(constraint) == 2
scenarios = (stochastic_scenario(:parent),)
Expand All @@ -296,16 +359,20 @@
n_to = node(Symbol(n_to))
var_conn_flow_key1 = (conn, n_from, direction(:from_node), s, t)
var_conn_flow_key2 = (conn, n_to, direction(:from_node), s, t)
var_conn_invested_available_key = (conn, s, t)
var_volt_ang_key1 = (n_from , s, t)
var_volt_ang_key2 = (n_to, s, t)
var_conn_flow1 = var_connection_flow[var_conn_flow_key1...]
var_conn_flow2 = var_connection_flow[var_conn_flow_key2...]
var_volt_ang1 = var_voltage_angle[var_volt_ang_key1...]
var_volt_ang2 = var_voltage_angle[var_volt_ang_key2...]
var_conn_inv_available1 = var_conn_invested_available[var_conn_invested_available_key...]
con_key = (conn, n_to, n_from, [s], t)
expected_con = @build_constraint(var_conn_flow1 - var_conn_flow2 == (var_volt_ang1-var_volt_ang2)/react*react_p_u)
expected_con = @build_constraint(var_conn_flow1 - var_conn_flow2 <= -(var_volt_ang1-var_volt_ang2)/react*react_p_u + big_m *(1-var_conn_inv_available1) )
con = constraint[con_key...]
observed_con = constraint_object(con)
@show(expected_con)
@show(observed_con)
@test _is_constraint_equal(observed_con, expected_con)
end
end
Expand Down Expand Up @@ -336,7 +403,7 @@
relationships=relationships,
relationship_parameter_values=relationship_parameter_values,
)

m = run_spineopt(url_in; log_level=0, optimize=false)
var_connection_flow = m.ext[:variables][:connection_flow]
var_connections_invested_available = m.ext[:variables][:connections_invested_available]
Expand Down Expand Up @@ -407,7 +474,7 @@
object_parameter_values=object_parameter_values,
relationship_parameter_values=relationship_parameter_values,
)

m = run_spineopt(url_in; log_level=0, optimize=false)

var_connection_flow = m.ext[:variables][:connection_intact_flow]
Expand Down Expand Up @@ -498,7 +565,7 @@
object_parameter_values=object_parameter_values,
relationship_parameter_values=relationship_parameter_values,
)

m = run_spineopt(url_in; log_level=0, optimize=false)
var_connection_flow = m.ext[:variables][:connection_flow]
constraint = m.ext[:constraints][:connection_flow_lodf]
Expand Down Expand Up @@ -589,7 +656,7 @@
object_parameter_values=object_parameter_values,
relationship_parameter_values=relationship_parameter_values,
)

m = run_spineopt(url_in; log_level=0, optimize=false)
var_connection_flow = m.ext[:variables][:connection_flow]
constraint = m.ext[:constraints][Symbol(ratio)]
Expand Down Expand Up @@ -641,7 +708,7 @@
["connection__investment_stochastic_structure", ["connection_ab", "stochastic"]],
]
SpineInterface.import_data(url_in; relationships=relationships, object_parameter_values=object_parameter_values)

m = run_spineopt(url_in; log_level=0, optimize=false)
var_connections_invested_available = m.ext[:variables][:connections_invested_available]
var_connections_invested = m.ext[:variables][:connections_invested]
Expand Down Expand Up @@ -685,7 +752,7 @@
["connection__investment_stochastic_structure", ["connection_ab", "stochastic"]],
]
SpineInterface.import_data(url_in; relationships=relationships, object_parameter_values=object_parameter_values)

m, mp = run_spineopt(url_in; log_level=0, optimize=false)
var_connections_invested_available = m.ext[:variables][:connections_invested_available]
var_connections_invested = m.ext[:variables][:connections_invested]
Expand Down Expand Up @@ -759,7 +826,7 @@
["connection__investment_stochastic_structure", ["connection_ab", "stochastic"]],
]
SpineInterface.import_data(url_in; relationships=relationships, object_parameter_values=object_parameter_values)

m = run_spineopt(url_in; log_level=0, optimize=false)
var_connections_invested_available = m.ext[:variables][:connections_invested_available]
var_connections_invested = m.ext[:variables][:connections_invested]
Expand Down Expand Up @@ -816,7 +883,7 @@
["connection__investment_stochastic_structure", ["connection_ab", "investments_deterministic"]],
]
SpineInterface.import_data(url_in; relationships=relationships, object_parameter_values=object_parameter_values)

m, mp = run_spineopt(url_in; log_level=0, optimize=false)
var_connections_invested_available = m.ext[:variables][:connections_invested_available]
var_connections_invested = m.ext[:variables][:connections_invested]
Expand Down Expand Up @@ -893,7 +960,7 @@
["connection__investment_stochastic_structure", ["connection_ab", "stochastic"]],
]
SpineInterface.import_data(url_in; relationships=relationships, object_parameter_values=object_parameter_values)

m = run_spineopt(url_in; log_level=0, optimize=false)
var_connections_invested_available = m.ext[:variables][:connections_invested_available]
constraint = m.ext[:constraints][:connections_invested_available]
Expand Down Expand Up @@ -923,7 +990,7 @@
["connection__investment_stochastic_structure", ["connection_ab", "stochastic"]],
]
SpineInterface.import_data(url_in; relationships=relationships, object_parameter_values=object_parameter_values)

m, mp = run_spineopt(url_in; log_level=0, optimize=false)
var_connections_invested_available = m.ext[:variables][:connections_invested_available]
constraint = m.ext[:constraints][:connections_invested_available]
Expand Down Expand Up @@ -995,7 +1062,7 @@
object_parameter_values=object_parameter_values,
relationship_parameter_values=relationship_parameter_values,
)

m = run_spineopt(url_in; log_level=0, optimize=false)
var_unit_flow = m.ext[:variables][:unit_flow]
var_units_on = m.ext[:variables][:units_on]
Expand Down Expand Up @@ -1086,7 +1153,7 @@
object_parameter_values=object_parameter_values,
relationship_parameter_values=relationship_parameter_values,
)

m = run_spineopt(url_in; log_level=0, optimize=false)
constraint = m.ext[:constraints][:connection_flow_intact_flow]
var_connection_flow = m.ext[:variables][:connection_flow]
Expand Down Expand Up @@ -1199,7 +1266,7 @@
object_parameter_values=object_parameter_values,
relationship_parameter_values=relationship_parameter_values,
)

m = run_spineopt(url_in; log_level=0, optimize=false)
constraint = m.ext[:constraints][:candidate_connection_flow_lb]
var_connection_flow = m.ext[:variables][:connection_flow]
Expand Down Expand Up @@ -1317,7 +1384,7 @@
object_parameter_values=object_parameter_values,
relationship_parameter_values=relationship_parameter_values,
)

m = run_spineopt(url_in; log_level=0, optimize=false)
constraint = m.ext[:constraints][:ratio_out_in_connection_intact_flow]
var_connection_intact_flow = m.ext[:variables][:connection_intact_flow]
Expand Down Expand Up @@ -1471,7 +1538,7 @@
object_parameter_values=object_parameter_values,
relationship_parameter_values=relationship_parameter_values,
)

m = run_spineopt(url_in; log_level=0, optimize=false)
constraint = m.ext[:constraints][:candidate_connection_flow_ub]
var_connection_intact_flow = m.ext[:variables][:connection_intact_flow]
Expand Down