Skip to content

Commit faab5e0

Browse files
committed
Enforce free signs only for transport flows
1 parent 4c346d3 commit faab5e0

File tree

1 file changed

+7
-10
lines changed

1 file changed

+7
-10
lines changed

src/variables/flows.jl

+7-10
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@ function add_flow_variables!(connection, model, variables)
1212
indices = _create_flow_table(connection)
1313

1414
lower_bound(row) =
15-
if row.from_asset_type in ("producer", "conversion", "storage") ||
16-
row.to_asset_type in ("conversion", "storage")
17-
0.0
18-
else
15+
if row.is_transport
1916
-Inf
17+
else
18+
0.0
2019
end
2120

2221
variables[:flow].container = [
@@ -35,13 +34,11 @@ function _create_flow_table(connection)
3534
connection,
3635
"SELECT
3736
var_flow.*,
38-
from_asset.type AS from_asset_type,
39-
to_asset.type AS to_asset_type,
37+
flow.is_transport,
4038
FROM var_flow
41-
LEFT JOIN asset AS from_asset
42-
ON var_flow.from_asset = from_asset.asset
43-
LEFT JOIN asset AS to_asset
44-
ON var_flow.to_asset = to_asset.asset
39+
LEFT JOIN flow
40+
ON flow.from_asset = var_flow.from_asset
41+
AND flow.to_asset = var_flow.to_asset
4542
ORDER BY var_flow.id
4643
",
4744
)

0 commit comments

Comments
 (0)