From d75d3c163775d57b962d0c559aa7d98826232f61 Mon Sep 17 00:00:00 2001 From: Ni Wang <125902905+gnawin@users.noreply.github.com> Date: Wed, 13 Dec 2023 17:10:33 +0100 Subject: [PATCH] Refactor transport capacity (#357) --- benchmark/EU/assets-data.csv | 36 ++++++++-------- benchmark/EU/flows-data.csv | 40 +++++++++--------- docs/src/mathematical-formulation.md | 41 +++++++++---------- src/input-tables.jl | 6 +-- src/model.jl | 23 ++++------- src/structures.jl | 14 +++---- test/inputs/Norse/flows-data.csv | 6 +-- test/inputs/Tiny/flows-data.csv | 4 +- .../inputs/Variable Resolution/flows-data.csv | 2 +- 9 files changed, 81 insertions(+), 91 deletions(-) diff --git a/benchmark/EU/assets-data.csv b/benchmark/EU/assets-data.csv index 9f1a5434..0d3b91d0 100644 --- a/benchmark/EU/assets-data.csv +++ b/benchmark/EU/assets-data.csv @@ -1,20 +1,20 @@ ,{producer;consumer;storage;hub;conversion},{true;false},{true;false},kEUR/MWh,kEUR/MW/year,MW,MW,MW,MW,MW/unit,MW/unit,MW,MW,MWh,MWh,h,kEUR/MW/year,year,0 name,type,active,investable,variable_cost,investment_cost,investment_limit,capacity,initial_capacity,peak_demand,charging_capacity,discharging_capacity,initial_charging_capacity,initial_discharging_capacity,initial_storage_capacity,initial_storage_level,energy_to_power_ratio,fixed_cost,lifetime,efficiency -NL_E_Demand,consumer,TRUE,FALSE,0,0,,0,0,21291.22,0,0,0,0,0,0,0,0,0,0 -NL_Wind_Onshore,producer,TRUE,FALSE,0.0023,1040,,7976,7976,0,0,0,0,0,0,0,0,12.6,30,0 -NL_Wind_Offshore,producer,TRUE,FALSE,0.0027,1930,,11470,11470,0,0,0,0,0,0,0,0,36.1,30,0 -NL_Solar,producer,TRUE,FALSE,0,870,,27264,27264,0,0,0,0,0,0,0,0,10.8,40,0 -NL_Gas,producer,TRUE,FALSE,0.03867,830,,10615,10615,0,0,0,0,0,0,0,0,0,0,0 -NL_Battery,storage,TRUE,FALSE,0,4733,,5800,5800,0,1,1,5800,5800,17400,0,3,27.8,25,0.9 -NL_OCGT,producer,TRUE,FALSE,0.05471,435,,628,628,0,0,0,0,0,0,0,0,7.7,25,0 -NL_E_Balance,hub,TRUE,FALSE,0,0,,0,0,0,0,0,0,0,0,0,0,0,0,0 -NL_E_Import,producer,TRUE,FALSE,0.1,0,,21291,21291,0,0,0,0,0,0,0,0,0,0,0 -BE_E_Demand,consumer,TRUE,FALSE,0,0,,0,0,14380.34,0,0,0,0,0,0,0,0,0,0 -BE_Wind_Onshore,producer,TRUE,FALSE,0.0023,1040,,4669,4669,0,0,0,0,0,0,0,0,12.6,30,0 -BE_Wind_Offshore,producer,TRUE,FALSE,0.0027,1930,,5800,5800,0,0,0,0,0,0,0,0,36.1,30,0 -BE_Solar,producer,TRUE,FALSE,0,870,,10400,10400,0,0,0,0,0,0,0,0,10.8,40,0 -BE_Gas,producer,TRUE,FALSE,0.03867,830,,8731,8731,0,0,0,0,0,0,0,0,0,0,0 -BE_Battery,storage,TRUE,FALSE,0,4733,,5800,5800,0,1,1,767,767,2301,0,3,27.8,25,0.9 -BE_OCGT,producer,TRUE,FALSE,0.05471,435,,294,294,0,0,0,0,0,0,0,0,7.7,25,0 -BE_E_Balance,hub,TRUE,FALSE,0,0,,0,0,0,0,0,0,0,0,0,0,0,0,0 -BE_Pump_Hydro,storage,TRUE,FALSE,0,1265,,1224,1224,0,1,1,1224,1224,4896,0,4,0,40,0.8 +NL_E_Demand,consumer,true,false,0,0,,0,0,21291.22,0,0,0,0,0,0,0,0,0,0 +NL_Wind_Onshore,producer,true,false,0.0023,1040,,7976,7976,0,0,0,0,0,0,0,0,12.6,30,0 +NL_Wind_Offshore,producer,true,false,0.0027,1930,,11470,11470,0,0,0,0,0,0,0,0,36.1,30,0 +NL_Solar,producer,true,false,0,870,,27264,27264,0,0,0,0,0,0,0,0,10.8,40,0 +NL_Gas,producer,true,false,0.03867,830,,10615,10615,0,0,0,0,0,0,0,0,0,0,0 +NL_Battery,storage,true,false,0,4733,,5800,5800,0,1,1,5800,5800,17400,0,3,27.8,25,0.9 +NL_OCGT,producer,true,false,0.05471,435,,628,628,0,0,0,0,0,0,0,0,7.7,25,0 +NL_E_Balance,hub,true,false,0,0,,0,0,0,0,0,0,0,0,0,0,0,0,0 +NL_E_Import,producer,true,false,0.1,0,,21291,21291,0,0,0,0,0,0,0,0,0,0,0 +BE_E_Demand,consumer,true,false,0,0,,0,0,14380.34,0,0,0,0,0,0,0,0,0,0 +BE_Wind_Onshore,producer,true,false,0.0023,1040,,4669,4669,0,0,0,0,0,0,0,0,12.6,30,0 +BE_Wind_Offshore,producer,true,false,0.0027,1930,,5800,5800,0,0,0,0,0,0,0,0,36.1,30,0 +BE_Solar,producer,true,false,0,870,,10400,10400,0,0,0,0,0,0,0,0,10.8,40,0 +BE_Gas,producer,true,false,0.03867,830,,8731,8731,0,0,0,0,0,0,0,0,0,0,0 +BE_Battery,storage,true,false,0,4733,,5800,5800,0,1,1,767,767,2301,0,3,27.8,25,0.9 +BE_OCGT,producer,true,false,0.05471,435,,294,294,0,0,0,0,0,0,0,0,7.7,25,0 +BE_E_Balance,hub,true,false,0,0,,0,0,0,0,0,0,0,0,0,0,0,0,0 +BE_Pump_Hydro,storage,true,false,0,1265,,1224,1224,0,1,1,1224,1224,4896,0,4,0,40,0.8 diff --git a/benchmark/EU/flows-data.csv b/benchmark/EU/flows-data.csv index 38327431..0dd63e32 100644 --- a/benchmark/EU/flows-data.csv +++ b/benchmark/EU/flows-data.csv @@ -1,21 +1,21 @@ ,asset_name,asset_name,{true;false},{true;false},{true;false},kEUR/MWh,kEUR/MW/year,MW,MW,MW,MW,p.u. -carrier,from_asset,to_asset,active,is_transport,investable,variable_cost,investment_cost,investment_limit,export_capacity,import_capacity,initial_capacity,efficiency -electricity,NL_Battery,NL_E_Balance,TRUE,FALSE,TRUE,0,0,,0,0,0,1 -electricity,NL_E_Balance,NL_Battery,TRUE,FALSE,TRUE,0,0,,0,0,0,1 -electricity,NL_Wind_Onshore,NL_E_Balance,TRUE,FALSE,TRUE,0.0023,0,,0,0,0,1 -electricity,NL_Wind_Offshore,NL_E_Balance,TRUE,FALSE,TRUE,0.0027,0,,0,0,0,1 -electricity,NL_Solar,NL_E_Balance,TRUE,FALSE,TRUE,0,0,,0,0,0,1 -electricity,NL_Gas,NL_E_Balance,TRUE,FALSE,TRUE,0.03867,0,,0,0,0,1 -electricity,NL_OCGT,NL_E_Balance,TRUE,FALSE,TRUE,0.05471,0,,0,0,0,1 -electricity,NL_E_Balance,NL_E_Demand,TRUE,FALSE,TRUE,0,0,,0,0,0,1 -electricity,NL_E_Import,NL_E_Demand,TRUE,FALSE,TRUE,0.1,0,,0,0,0,1 -electricity,NL_E_Balance,BE_E_Balance,TRUE,FALSE,FALSE,0,0,,0,0,2400,0.9 -electricity,BE_E_Balance,NL_E_Balance,TRUE,FALSE,FALSE,0,0,,0,0,3400,0.9 -electricity,BE_Battery,BE_E_Balance,TRUE,FALSE,TRUE,0,0,,0,0,0,1 -electricity,BE_E_Balance,BE_Battery,TRUE,FALSE,TRUE,0,0,,0,0,0,1 -electricity,BE_Wind_Onshore,BE_E_Balance,TRUE,FALSE,TRUE,0.0023,0,,0,0,0,1 -electricity,BE_Wind_Offshore,BE_E_Balance,TRUE,FALSE,TRUE,0.0027,0,,0,0,0,1 -electricity,BE_Solar,BE_E_Balance,TRUE,FALSE,TRUE,0,0,,0,0,0,1 -electricity,BE_Gas,BE_E_Balance,TRUE,FALSE,TRUE,0.03867,0,,0,0,0,1 -electricity,BE_OCGT,BE_E_Balance,TRUE,FALSE,TRUE,0.05471,0,,0,0,0,1 -electricity,BE_E_Balance,BE_E_Demand,TRUE,FALSE,TRUE,0,0,,0,0,0,1 +carrier,from_asset,to_asset,active,is_transport,investable,variable_cost,investment_cost,investment_limit,capacity,initial_export_capacity,initial_import_capacity,efficiency +electricity,NL_Battery,NL_E_Balance,true,false,true,0,0,,0,0,0,1 +electricity,NL_E_Balance,NL_Battery,true,false,true,0,0,,0,0,0,1 +electricity,NL_Wind_Onshore,NL_E_Balance,true,false,true,0.0023,0,,0,0,0,1 +electricity,NL_Wind_Offshore,NL_E_Balance,true,false,true,0.0027,0,,0,0,0,1 +electricity,NL_Solar,NL_E_Balance,true,false,true,0,0,,0,0,0,1 +electricity,NL_Gas,NL_E_Balance,true,false,true,0.03867,0,,0,0,0,1 +electricity,NL_OCGT,NL_E_Balance,true,false,true,0.05471,0,,0,0,0,1 +electricity,NL_E_Balance,NL_E_Demand,true,false,true,0,0,,0,0,0,1 +electricity,NL_E_Import,NL_E_Demand,true,false,true,0.1,0,,0,0,0,1 +electricity,NL_E_Balance,BE_E_Balance,true,false,false,0,0,,0,0,2400,0.9 +electricity,BE_E_Balance,NL_E_Balance,true,false,false,0,0,,0,0,3400,0.9 +electricity,BE_Battery,BE_E_Balance,true,false,true,0,0,,0,0,0,1 +electricity,BE_E_Balance,BE_Battery,true,false,true,0,0,,0,0,0,1 +electricity,BE_Wind_Onshore,BE_E_Balance,true,false,true,0.0023,0,,0,0,0,1 +electricity,BE_Wind_Offshore,BE_E_Balance,true,false,true,0.0027,0,,0,0,0,1 +electricity,BE_Solar,BE_E_Balance,true,false,true,0,0,,0,0,0,1 +electricity,BE_Gas,BE_E_Balance,true,false,true,0.03867,0,,0,0,0,1 +electricity,BE_OCGT,BE_E_Balance,true,false,true,0.05471,0,,0,0,0,1 +electricity,BE_E_Balance,BE_E_Demand,true,false,true,0,0,,0,0,0,1 diff --git a/docs/src/mathematical-formulation.md b/docs/src/mathematical-formulation.md index 9826101f..3cdb9546 100644 --- a/docs/src/mathematical-formulation.md +++ b/docs/src/mathematical-formulation.md @@ -28,24 +28,23 @@ NOTE: Asset types are mutually exclusive. Name|Domain|Description|Units ---|---|---|--- -$p^{investment\_cost}_{a}$ | $\mathcal{A}_i$ | Investment cost of asset units | [kEUR/MW/year] -$p^{investment\_limit}_{a}$ | $\mathcal{A}_i$ | Investment limit of asset units | [MW] -$p^{unit\_capacity}_{a}$ | $\mathcal{A}$ | Capacity of asset units | [MW] -$p^{peak\_demand}_{a}$ | $\mathcal{A}_c$ | Peak demand | [MW] -$p^{init\_capacity}_{a}$ | $\mathcal{A}$ | Initial capacity of asset units | [MW] -$p^{investment\_cost}_{f}$ | $\mathcal{F}_i$ | Investment cost of flow connections | [kEUR/MW/year] -$p^{variable\_cost}_{f}$ | $\mathcal{F}$ | Variable cost of flow connections | [kEUR/MWh] -$p^{unit\_capacity}_{f}$ | $\mathcal{F}$ | Capacity of flow connections | [MW] -$p^{init\_capacity}_{f}$ | $\mathcal{F}$ | Initial capacity of flow connections | [MW] -$p^{export\_capacity}_{f}$ | $\mathcal{F}_t$ | Export capacity of flow connections | [MW] -$p^{import\_capacity}_{f}$ | $\mathcal{F}_t$ | Import capacity of flow connections | [MW] -$p^{rp\_weight}_{rp}$ | $\mathcal{RP}$ | Representative period weight | [h] -$p^{profile}_{a,rp,k}$ | $\mathcal{A,RP,K}$ | Asset profile | [p.u.] -$p^{profile}_{f,rp,k}$ | $\mathcal{F,RP,K}$ | Flow connections profile | [p.u.] -$p^{ene\_to\_pow\_ratio}_a$ | $\mathcal{A}_s$ | Energy to power ratio | [h] -$p^{init\_storage\_level}_{a}$ | $\mathcal{A}_s$ | Initial storage level | [MWh] -$p^{inflow}_{a}$ | $\mathcal{A}_s$ | Energy storage inflows | [MWh] -$p^{eff}_f$ | $\mathcal{F}$ | Flow efficiency | [p.u.] +$p^{investment\_cost}_{a}$ | $\mathcal{A}_i$ | Investment cost of asset units | [kEUR/MW/year] +$p^{investment\_limit}_{a}$ | $\mathcal{A}_i$ | Investment limit of asset units | [MW] +$p^{unit\_capacity}_{a}$ | $\mathcal{A}$ | Capacity of asset units | [MW] +$p^{peak\_demand}_{a}$ | $\mathcal{A}_c$ | Peak demand | [MW] +$p^{init\_capacity}_{a}$ | $\mathcal{A}$ | Initial capacity of asset units | [MW] +$p^{investment\_cost}_{f}$ | $\mathcal{F}_i$ | Investment cost of flow connections | [kEUR/MW/year] +$p^{variable\_cost}_{f}$ | $\mathcal{F}$ | Variable cost of flow connections | [kEUR/MWh] +$p^{unit\_capacity}_{f}$ | $\mathcal{F}_t$ | Capacity increment for flow connections investment (both exports and imports) | [MW] +$p^{init\_export\_capacity}_{f}$ | $\mathcal{F}_t$ | Initial export capacity of flow connections | [MW] +$p^{init\_import\_capacity}_{f}$ | $\mathcal{F}_t$ | Initial import capacity of flow connections | [MW] +$p^{rp\_weight}_{rp}$ | $\mathcal{RP}$ | Representative period weight | [h] +$p^{profile}_{a,rp,k}$ | $\mathcal{A,RP,K}$ | Asset profile | [p.u.] +$p^{profile}_{f,rp,k}$ | $\mathcal{F,RP,K}$ | Flow connections profile | [p.u.] +$p^{ene\_to\_pow\_ratio}_a$ | $\mathcal{A}_s$ | Energy to power ratio | [h] +$p^{init\_storage\_level}_{a}$ | $\mathcal{A}_s$ | Initial storage level | [MWh] +$p^{inflow}_{a}$ | $\mathcal{A}_s$ | Energy storage inflows | [MWh] +$p^{eff}_f$ | $\mathcal{F}$ | Flow efficiency | [p.u.] ## [Variables](@id math-variables) @@ -149,7 +148,7 @@ v^{flow}_{f,rp,k} \geq 0 \quad \forall f \notin \mathcal{F}_t, \forall rp \in \m ```math \begin{aligned} -v^{flow}_{f,rp,k} \leq p^{profile}_{f,rp,k} \cdot \left(p^{init\_capacity}_{f} + p^{export\_capacity}_f \cdot v^{investment}_f \right) \quad +v^{flow}_{f,rp,k} \leq p^{profile}_{f,rp,k} \cdot \left(p^{init\_export\_capacity}_{f} + p^{unit\_capacity}_f \cdot v^{investment}_f \right) \quad \\ \\ \forall f \in \mathcal{F}_t, \forall rp \in \mathcal{RP},\forall k \in \mathcal{K} \end{aligned} ``` @@ -158,7 +157,7 @@ v^{flow}_{f,rp,k} \leq p^{profile}_{f,rp,k} \cdot \left(p^{init\_capacity}_{f} + ```math \begin{aligned} -v^{flow}_{f,rp,k} \geq - p^{profile}_{f,rp,k} \cdot \left(p^{init\_capacity}_{f} + p^{import\_capacity}_f \cdot v^{investment}_f \right) \quad +v^{flow}_{f,rp,k} \geq - p^{profile}_{f,rp,k} \cdot \left(p^{init\_import\_capacity}_{f} + p^{unit\_capacity}_f \cdot v^{investment}_f \right) \quad \\ \\ \forall f \in \mathcal{F}_t, \forall rp \in \mathcal{RP},\forall k \in \mathcal{K} \end{aligned} ``` @@ -191,6 +190,6 @@ v^{investment}_a \leq \frac{p^{investment\_limit}_a}{ p^{unit\_capacity}_a} \qua #### Maximum Investment Limit for $\mathcal{F}_i$ ```math -v^{investment}_f \leq \frac{p^{investment\_limit}_f}{\max\{p^{export\_capacity}_f,p^{import\_capacity}_f\}} \quad +v^{investment}_f \leq \frac{p^{investment\_limit}_f}{p^{unit\_capacity}_f} \quad \\ \\ \forall f \in \mathcal{F}_i ``` diff --git a/src/input-tables.jl b/src/input-tables.jl index 742c01f6..308a346b 100644 --- a/src/input-tables.jl +++ b/src/input-tables.jl @@ -49,9 +49,9 @@ struct FlowData variable_cost::Float64 # kEUR/MWh investment_cost::Float64 # kEUR/MW/year investment_limit::Union{Missing,Float64} # MW - export_capacity::Float64 # MW - import_capacity::Float64 # MW - initial_capacity::Float64 # MW + capacity::Float64 # MW + initial_export_capacity::Float64 # MW + initial_import_capacity::Float64 # MW efficiency::Float64 # p.u. (per unit) end diff --git a/src/model.jl b/src/model.jl index f930f58f..c25c2bcc 100644 --- a/src/model.jl +++ b/src/model.jl @@ -97,8 +97,8 @@ function create_model( flows_investment_cost = @expression( model, sum( - graph[u, v].investment_cost * graph[u, v].unit_capacity * flows_investment[(u, v)] - for (u, v) ∈ Fi + graph[u, v].investment_cost * graph[u, v].capacity * flows_investment[(u, v)] for + (u, v) ∈ Fi ) ) @@ -259,8 +259,8 @@ function create_model( model, upper_bound_transport_flow[(u, v) ∈ F, rp ∈ RP, B_flow ∈ graph[u, v].partitions[rp]], flows_profile_sum(u, v, rp, B_flow, 1.0) * ( - graph[u, v].initial_capacity + - (graph[u, v].investable ? graph[u, v].export_capacity * flows_investment[(u, v)] : 0.0) + graph[u, v].initial_export_capacity + + (graph[u, v].investable ? graph[u, v].capacity * flows_investment[(u, v)] : 0.0) ) ) @@ -268,8 +268,8 @@ function create_model( model, lower_bound_transport_flow[(u, v) ∈ F, rp ∈ RP, B_flow ∈ graph[u, v].partitions[rp]], flows_profile_sum(u, v, rp, B_flow, 1.0) * ( - graph[u, v].initial_capacity + - (graph[u, v].investable ? graph[u, v].import_capacity * flows_investment[(u, v)] : 0.0) + graph[u, v].initial_import_capacity + + (graph[u, v].investable ? graph[u, v].capacity * flows_investment[(u, v)] : 0.0) ) ) @@ -300,13 +300,6 @@ function create_model( set_lower_bound(storage_level[a, rp, Pl[(a, rp)][end]], graph[a].initial_storage_level) end - ## Expressions for the extra constraints of investment limits - @expression( - model, - flow_max_capacity[(u, v) ∈ Fi], - max(graph[u, v].export_capacity, graph[u, v].import_capacity) - ) - ## Extra constraints for investment limits # - maximum (i.e., potential) investment limit for assets for a ∈ Ai @@ -317,10 +310,10 @@ function create_model( # - maximum (i.e., potential) investment limit for flows for (u, v) ∈ Fi - if flow_max_capacity[(u, v)] > 0 && !ismissing(graph[u, v].investment_limit) + if graph[u, v].capacity > 0 && !ismissing(graph[u, v].investment_limit) set_upper_bound( flows_investment[(u, v)], - graph[u, v].investment_limit / flow_max_capacity[(u, v)], + graph[u, v].investment_limit / graph[u, v].capacity, ) end end diff --git a/src/structures.jl b/src/structures.jl index d0d7d56c..1ee30080 100644 --- a/src/structures.jl +++ b/src/structures.jl @@ -82,10 +82,9 @@ mutable struct GraphFlowData variable_cost::Float64 investment_cost::Float64 investment_limit::Union{Missing,Float64} - import_capacity::Float64 - export_capacity::Float64 - unit_capacity::Float64 - initial_capacity::Float64 + capacity::Float64 + initial_export_capacity::Float64 + initial_import_capacity::Float64 efficiency::Float64 profiles::Dict{Int,Vector{Float64}} partitions::Dict{Int,Vector{TimeBlock}} @@ -103,10 +102,9 @@ function GraphFlowData(flow_data::FlowData) flow_data.variable_cost, flow_data.investment_cost, flow_data.investment_limit, - flow_data.import_capacity, - flow_data.export_capacity, - max(flow_data.export_capacity, flow_data.import_capacity), - flow_data.initial_capacity, + flow_data.capacity, + flow_data.initial_export_capacity, + flow_data.initial_import_capacity, flow_data.efficiency, Dict{Int,Vector{Float64}}(), Dict{Int,Vector{TimeBlock}}(), diff --git a/test/inputs/Norse/flows-data.csv b/test/inputs/Norse/flows-data.csv index 2ae6753c..b7d7b927 100644 --- a/test/inputs/Norse/flows-data.csv +++ b/test/inputs/Norse/flows-data.csv @@ -1,5 +1,5 @@ ,asset_name,asset_name,{true;false},{true;false},{true;false},kEUR/MWh,kEUR/MW/year,MW,MW,MW,MW,p.u. -carrier,from_asset,to_asset,active,is_transport,investable,variable_cost,investment_cost,investment_limit,export_capacity,import_capacity,initial_capacity,efficiency +carrier,from_asset,to_asset,active,is_transport,investable,variable_cost,investment_cost,investment_limit,capacity,initial_export_capacity,initial_import_capacity,efficiency electricity,Asgard_Battery,Asgard_E_demand,true,false,false,0.003,0,0,0,0,0,0.95 electricity,Asgard_Solar,Asgard_Battery,true,false,false,0.001,0,0,0,0,0,0.95 electricity,Asgard_Solar,Asgard_E_demand,true,false,false,0.001,0,0,0,0,0,1 @@ -8,9 +8,9 @@ gas,G_imports,Asgard_CCGT,true,false,false,0.0015,0,0,0,0,0,1 gas,G_imports,Midgard_CCGT,true,false,false,0.0015,0,0,0,0,0,1 gas,G_imports,Valhalla_GT,true,false,false,0.0015,0,0,0,0,0,1 gas,G_imports,Valhalla_H2_generator,true,false,false,0.0015,0,0,0,0,0,1 -electricity,Asgard_E_demand,Midgard_E_demand,true,true,true,0,2000,50000,1000,1000,0,1 +electricity,Asgard_E_demand,Midgard_E_demand,true,true,true,0,2000,50000,1000,0,0,1 electricity,Asgard_E_demand,Valhalla_E_balance,true,true,true,0,5000,,1000,1000,1000,1 -electricity,Midgard_E_demand,Valhalla_E_balance,true,true,true,0,3500,,1000,1000,0,1 +electricity,Midgard_E_demand,Valhalla_E_balance,true,true,true,0,3500,,1000,0,0,1 electricity,Midgard_Wind,Midgard_E_demand,true,false,false,0.002,0,0,0,0,0,0 electricity,Midgard_Nuclear_SMR,Midgard_E_demand,true,false,false,0.015,0,0,0,0,0,1 electricity,Midgard_E_imports,Midgard_E_demand,true,false,false,0.02,0,0,0,0,0,1 diff --git a/test/inputs/Tiny/flows-data.csv b/test/inputs/Tiny/flows-data.csv index 8b5fc98d..28734a3c 100644 --- a/test/inputs/Tiny/flows-data.csv +++ b/test/inputs/Tiny/flows-data.csv @@ -1,7 +1,7 @@ ,asset_name,asset_name,{true;false},{true;false},{true;false},kEUR/MWh,kEUR/MW/year,MW,MW,MW,MW,p.u. -carrier,from_asset,to_asset,active,is_transport,investable,variable_cost,investment_cost,investment_limit,export_capacity,import_capacity,initial_capacity,efficiency +carrier,from_asset,to_asset,active,is_transport,investable,variable_cost,investment_cost,investment_limit,capacity,initial_export_capacity,initial_import_capacity,efficiency electricity,ocgt,demand,true,false,false,0.07,0,,0,0,0,0 electricity,ccgt,demand,true,false,false,0.05,0,,0,0,0,0 electricity,wind,demand,true,false,false,0.001,0,,0,0,0,0 -electricity,solar,demand,true,false,false,0.0,0,,0,0,0,0 +electricity,solar,demand,true,false,false,0,0,,0,0,0,0 electricity,ens,demand,true,false,false,0.18,0,,0,0,0,0 diff --git a/test/inputs/Variable Resolution/flows-data.csv b/test/inputs/Variable Resolution/flows-data.csv index 90a7c2f9..30f6eb97 100644 --- a/test/inputs/Variable Resolution/flows-data.csv +++ b/test/inputs/Variable Resolution/flows-data.csv @@ -1,5 +1,5 @@ ,asset_name,asset_name,{true;false},{true;false},{true;false},kEUR/MWh,kEUR/MW/year,MW,MW,MW,MW,p.u. -carrier,from_asset,to_asset,active,is_transport,investable,variable_cost,investment_cost,investment_limit,export_capacity,import_capacity,initial_capacity,efficiency +carrier,from_asset,to_asset,active,is_transport,investable,variable_cost,investment_cost,investment_limit,capacity,initial_export_capacity,initial_import_capacity,efficiency hydrogen,H2,ccgt,true,false,false,0.01,0,,0,0,0,1 electricity,ccgt,balance,true,false,false,0.05,0,,0,0,0,0.5 electricity,wind,balance,true,false,false,0.005,0,,0,0,0,0