Move to transport flows

Author: gnawin

src/constraints/capacity.jl

@@ -352,48 +352,6 @@ function add_capacity_constraints!(connection, model, expressions, constraints,
             ],
         )
     end
-
-    cons_name = Symbol("min_output_flows_limit_for_transport_flows_without_unit_commitment")
-    table_name = :min_outgoing_flow_for_transport_flows_without_unit_commitment
-
-    # - Minmum output flows limit if any of the flows is transport flow
-    # - This allows negative flows but not all negative flows, so flows can pass through this asset
-    # - Holds for producers, conversion and storage assets
-    attach_constraint!(
-        model,
-        constraints[table_name],
-        cons_name,
-        [
-            @constraint(
-                model,
-                outgoing_flow ≥ 0,
-                base_name = "$cons_name[$(row.asset),$(row.year),$(row.rep_period),$(row.time_block_start):$(row.time_block_end)]"
-            ) for (row, outgoing_flow) in
-            zip(constraints[table_name].indices, constraints[table_name].expressions[:outgoing])
-        ],
-    )
-
-    # - Minmum input flows limit if any of the flows is transport flow
-    # - This allows negative flows but not all negative flows, so flows can pass through this asset
-    # - Holds for onversion and storage assets
-    cons_name = Symbol("min_input_flows_limit_for_transport_flows")
-    table_name = :min_incoming_flow_for_transport_flows
-
-    attach_constraint!(
-        model,
-        constraints[table_name],
-        cons_name,
-        [
-            @constraint(
-                model,
-                incoming_flow ≥ 0,
-                base_name = "$cons_name[$(row.asset),$(row.year),$(row.rep_period),$(row.time_block_start):$(row.time_block_end)]"
-            ) for (row, incoming_flow) in
-            zip(constraints[table_name].indices, constraints[table_name].expressions[:incoming])
-        ],
-    )
-
-    return
 end
 
 # The below two functions are very similar

src/constraints/create.jl

@@ -16,8 +16,6 @@ function compute_constraints_indices(connection)
             :capacity_outgoing_simple_method,
             :capacity_outgoing_simple_method_non_investable_storage_with_binary,
             :capacity_outgoing_simple_method_investable_storage_with_binary,
-            :min_outgoing_flow_for_transport_flows_without_unit_commitment,
-            :min_incoming_flow_for_transport_flows,
             :limit_units_on_compact_method,
             :limit_units_on_simple_method,
             :min_output_flow_with_unit_commitment,
@@ -29,6 +27,8 @@ function compute_constraints_indices(connection)
             :min_energy_over_clustered_year,
             :max_energy_over_clustered_year,
             :transport_flow_limit_simple_method,
+            :min_outgoing_flow_for_transport_flows_without_unit_commitment,
+            :min_incoming_flow_for_transport_flows,
             :group_max_investment_limit,
             :group_min_investment_limit,
         )

src/constraints/transport.jl

@@ -18,6 +18,7 @@ function add_transport_constraints!(
     expr_avail_export = expr_avail.expressions[:export]
     expr_avail_import = expr_avail.expressions[:import]
 
+    # - Capacity limits for transport flows
     let table_name = :transport_flow_limit_simple_method, cons = constraints[table_name]
         indices = _append_transport_data_to_indices(connection)
         var_flow = variables[:flow].container
@@ -89,6 +90,48 @@ function add_transport_constraints!(
         )
     end
 
+    # - Minmum output flows limit if any of the flows is transport flow
+    # - This allows some negative flows but not all negative flows, so transport flows can pass through this asset
+    # - Holds for producers, conversion and storage assets
+    let table_name = :min_outgoing_flow_for_transport_flows_without_unit_commitment,
+        cons_name = Symbol("min_output_flows_limit_for_transport_flows_without_unit_commitment")
+
+        attach_constraint!(
+            model,
+            constraints[table_name],
+            cons_name,
+            [
+                @constraint(
+                    model,
+                    outgoing_flow ≥ 0,
+                    base_name = "$cons_name[$(row.asset),$(row.year),$(row.rep_period),$(row.time_block_start):$(row.time_block_end)]"
+                ) for (row, outgoing_flow) in
+                zip(constraints[table_name].indices, constraints[table_name].expressions[:outgoing])
+            ],
+        )
+    end
+
+    # - Minmum input flows limit if any of the flows is transport flow
+    # - This allows some negative flows but not all negative flows, so transport flows can pass through this asset
+    # - Holds for onversion and storage assets
+    let table_name = :min_incoming_flow_for_transport_flows,
+        cons_name = Symbol("min_input_flows_limit_for_transport_flows")
+
+        attach_constraint!(
+            model,
+            constraints[table_name],
+            cons_name,
+            [
+                @constraint(
+                    model,
+                    incoming_flow ≥ 0,
+                    base_name = "$cons_name[$(row.asset),$(row.year),$(row.rep_period),$(row.time_block_start):$(row.time_block_end)]"
+                ) for (row, incoming_flow) in
+                zip(constraints[table_name].indices, constraints[table_name].expressions[:incoming])
+            ],
+        )
+    end
+
     return
 end