Rename flow_coefficient_in_capacity_constraint to capacity_coefficient

Author: datejada

benchmark/EU/flow-commission.csv

@@ -1,4 +1,4 @@
-commission_year,efficiency,fixed_cost,flow_coefficient_in_capacity_constraint,from_asset,investment_cost,investment_limit,to_asset
+commission_year,efficiency,fixed_cost,capacity_coefficient,from_asset,investment_cost,investment_limit,to_asset
 2050,1.0,0.0,1,NL_E_Balance,0.0,,NL_E_Demand
 2050,1.0,0.0,1,NL_E_ENS,0.0,,NL_E_Demand
 2050,1.0,0.0,1,NL_Wind_Onshore,0.0,,NL_E_Balance

docs/src/20-how-to-use.md

@@ -403,4 +403,4 @@ $\text{flow process A} + 0.8 \cdot \text{flow process B} \leq \text{C}$
 
 In that case the sum must be always below the total capacity $\text{C}$, but if you only produce flow through B then you can produce $1.25 \cdot \text{C}$ and still satisfy this constraint.
 
-To set up this parameter you need to fill in the information for the `flow_coefficient_in_capacity_constraint` in the `flow_commission` table, see more in the [model parameters](@ref table_schemas) section.
+To set up this parameter you need to fill in the information for the `capacity_coefficient` in the `flow_commission` table, see more in the [model parameters](@ref table_schemas) section.

src/data-preparation.jl

@@ -198,8 +198,8 @@ function _append_given_durations(appender, row, durations)
         if haskey(row, :efficiency)
             DuckDB.append(appender, row.efficiency)
         end
-        if haskey(row, :flow_coefficient_in_capacity_constraint)
-            DuckDB.append(appender, row.flow_coefficient_in_capacity_constraint)
+        if haskey(row, :capacity_coefficient)
+            DuckDB.append(appender, row.capacity_coefficient)
         end
         DuckDB.append(appender, s)
         DuckDB.append(appender, e)
@@ -277,7 +277,7 @@ function create_unrolled_partition_tables!(connection)
             COALESCE(frpp.specification, 'uniform') AS specification,
             COALESCE(frpp.partition::string, '1') AS partition,
             flow_commission.efficiency,
-            flow_commission.flow_coefficient_in_capacity_constraint,
+            flow_commission.capacity_coefficient,
             rep_periods_data.num_timesteps,
         FROM flow
         CROSS JOIN rep_periods_data
@@ -348,7 +348,7 @@ function create_unrolled_partition_tables!(connection)
             year INT,
             rep_period INT,
             efficiency DOUBLE,
-            flow_coefficient_in_capacity_constraint DOUBLE,
+            capacity_coefficient DOUBLE,
             time_block_start INT,
             time_block_end INT
         )",

src/input-schemas.json

@@ -548,6 +548,15 @@
     }
   },
   "flow_commission": {
+    "capacity_coefficient": {
+      "constraints": {
+        "minimum": 0
+      },
+      "default": 1,
+      "description": "Coefficient for the flow in the maximum capacity constraints.",
+      "type": "DOUBLE",
+      "unit_of_measure": "p.u."
+    },
     "commission_year": {
       "description": "Year of commissioning",
       "type": "INTEGER"
@@ -567,15 +576,6 @@
       "type": "DOUBLE",
       "unit_of_measure": "CUR/MW/year"
     },
-    "flow_coefficient_in_capacity_constraint": {
-      "constraints": {
-        "minimum": 0
-      },
-      "default": 1,
-      "description": "Coefficient for the flow in the maximum capacity constraints.",
-      "type": "DOUBLE",
-      "unit_of_measure": "p.u."
-    },
     "from_asset": {
       "description": "Name of the asset. Same as the one in the `asset` table.",
       "type": "VARCHAR"

src/model-preparation.jl

@@ -98,13 +98,7 @@ function add_expression_terms_rep_period_constraints!(
             flow.table_name,
             grouped_var_table_name,
             [case.asset_match, :year, :rep_period],
-            [
-                :id,
-                :time_block_start,
-                :time_block_end,
-                :efficiency,
-                :flow_coefficient_in_capacity_constraint,
-            ];
+            [:id, :time_block_start, :time_block_end, :efficiency, :capacity_coefficient];
             rename_columns = Dict(case.asset_match => :asset),
         )
 
@@ -125,7 +119,7 @@ function add_expression_terms_rep_period_constraints!(
                 var.time_block_start AS var_time_block_start_vec,
                 var.time_block_end AS var_time_block_end_vec,
                 var.efficiency,
-                var.flow_coefficient_in_capacity_constraint,
+                var.capacity_coefficient,
                 asset.type AS type,
                 $resolution_query AS resolution,
             FROM $grouped_cons_table_name AS cons
@@ -152,13 +146,13 @@ function add_expression_terms_rep_period_constraints!(
                 time_block_start::Int32,
                 time_block_end::Int32,
                 efficiency::Float64,
-                flow_coefficient_in_capacity_constraint::Float64,
+                capacity_coefficient::Float64,
             ) in zip(
                 group_row.var_id_vec::Vector{Union{Missing,Int64}},
                 group_row.var_time_block_start_vec::Vector{Union{Missing,Int32}},
                 group_row.var_time_block_end_vec::Vector{Union{Missing,Int32}},
                 group_row.efficiency::Vector{Union{Missing,Float64}},
-                group_row.flow_coefficient_in_capacity_constraint::Vector{Union{Missing,Float64}},
+                group_row.capacity_coefficient::Vector{Union{Missing,Float64}},
             )
                 time_block = time_block_start:time_block_end
                 # Step 1.1.1.
@@ -171,7 +165,7 @@ function add_expression_terms_rep_period_constraints!(
                     flow_coefficient =
                         if group_row.type::String in case.selected_assets || use_highest_resolution
                             if multiply_by_capacity_coefficient
-                                flow_coefficient_in_capacity_constraint
+                                capacity_coefficient
                             else
                                 1.0
                             end

src/sql/create-variables.sql

@@ -15,7 +15,7 @@ select
     year,
     rep_period,
     efficiency,
-    flow_coefficient_in_capacity_constraint,
+    capacity_coefficient,
     time_block_start,
     time_block_end,
 from

test/inputs/Multi-year Investments/flow-commission.csv

@@ -1,4 +1,4 @@
-from_asset,to_asset,commission_year,fixed_cost,investment_cost,efficiency,investment_limit,flow_coefficient_in_capacity_constraint
+from_asset,to_asset,commission_year,fixed_cost,investment_cost,efficiency,investment_limit,capacity_coefficient
 battery,demand,2030,0.0,350.0,0.95,,1
 wind,demand,2030,0.0,350.0,0.0,,1
 ens,demand,2050,0.0,350.0,0.0,,1

test/inputs/Norse/flow-commission.csv

@@ -1,4 +1,4 @@
-from_asset,to_asset,commission_year,fixed_cost,investment_cost,efficiency,investment_limit,flow_coefficient_in_capacity_constraint
+from_asset,to_asset,commission_year,fixed_cost,investment_cost,efficiency,investment_limit,capacity_coefficient
 G_imports,Midgard_CCGT,2030,0.0,0.0,1.0,0.0,1
 Midgard_E_demand,Midgard_Hydro,2030,0.0,0.0,0.7,0.0,1
 Midgard_PHS,Midgard_E_demand,2030,0.0,0.0,0.85,0.0,1

test/inputs/Power-flow/flow-commission.csv

@@ -1,4 +1,4 @@
-from_asset,to_asset,commission_year,fixed_cost,investment_cost,efficiency,investment_limit,flow_coefficient_in_capacity_constraint
+from_asset,to_asset,commission_year,fixed_cost,investment_cost,efficiency,investment_limit,capacity_coefficient
 ccgt,demand,2030,0.0,0.0,0.0,,1
 ccgt,hub,2030,0.0,0.0,0.0,,1
 hub,demand,2030,0.0,0.0,0.0,,1

test/inputs/Storage/flow-commission.csv

@@ -1,4 +1,4 @@
-from_asset,to_asset,commission_year,fixed_cost,investment_cost,efficiency,investment_limit,flow_coefficient_in_capacity_constraint
+from_asset,to_asset,commission_year,fixed_cost,investment_cost,efficiency,investment_limit,capacity_coefficient
 wind,demand,2030,0.0,0.0,0.0,,1
 battery,demand,2030,0.0,0.0,0.95,,1
 phs,demand,2030,0.0,0.0,0.85,,1