diff --git a/oemoflex/model/facade_attrs/asymmetric_storage.csv b/oemoflex/model/facade_attrs/asymmetric_storage.csv index 9824e4e..7857a1e 100644 --- a/oemoflex/model/facade_attrs/asymmetric_storage.csv +++ b/oemoflex/model/facade_attrs/asymmetric_storage.csv @@ -13,6 +13,9 @@ efficiency_discharge,float,unitless,Efficiency of discharging marginal_cost,float,Eur/MWh,Marginal cost of charging/discharging loss_rate,float,unitless,Losses due to self discharging expandable,boolean,n/a,Capacity can be expanded +capacity_potential_charge,float,MW,Potential of the investment for charging capacity +capacity_potential_discharge,float,MW,Potential of the investment for discharging capacity +storage_capacity_potential,float,MWh,Potential of the investment for storage capacity capacity_cost_charge,float,Eur/MW,Annualized investment cost per charging capacity capacity_cost_discharge,float,Eur/MW,Annualized investment cost per discharging capacity storage_capacity_cost,float,Eur/MWh,Annualized investment cost per storage capacity diff --git a/oemoflex/model/facade_attrs/conversion.csv b/oemoflex/model/facade_attrs/conversion.csv index ccdd502..e085196 100644 --- a/oemoflex/model/facade_attrs/conversion.csv +++ b/oemoflex/model/facade_attrs/conversion.csv @@ -12,4 +12,5 @@ efficiency,float,unitless,Efficiency of the conversion biomass to electricity carrier_cost,float,Eur/MWh,Cost per unit of used fuel marginal_cost,float,Eur/MWh,Marginal cost expandable,boolean,n/a,Capacity can be expanded +capacity_potential,float,MW,Maximum invest capacity in unit of output capacity output_parameters,dict,n/a,Optional parameters passed to oemof-solph's output flow diff --git a/oemoflex/model/facade_attrs/storage.csv b/oemoflex/model/facade_attrs/storage.csv index 3139133..5c0d8cc 100644 --- a/oemoflex/model/facade_attrs/storage.csv +++ b/oemoflex/model/facade_attrs/storage.csv @@ -11,6 +11,8 @@ efficiency,float,unitless,Efficiency of charging/discharging marginal_cost,float,Eur/MWh,Marginal cost of charging/discharging loss_rate,float,unitless,Losses due to self discharging expandable,boolean,n/a,Capacity can be expanded +capacity_potential,float,MW,Potential of the investment for capacity +storage_capacity_potential,float,MWh,Potential of the investment for storage capacity capacity_cost,float,Eur/MW,Annualized investment cost per charging/discharging capacity storage_capacity_cost,float,Eur/MWh,Annualized investment cost per storage capacity input_parameters,dict,n/a,Optional parameters passed to oemof-solph's input flow diff --git a/oemoflex/model/facade_attrs/volatile.csv b/oemoflex/model/facade_attrs/volatile.csv index cbdda7f..624f78a 100644 --- a/oemoflex/model/facade_attrs/volatile.csv +++ b/oemoflex/model/facade_attrs/volatile.csv @@ -8,6 +8,7 @@ bus,str,n/a,The bus this component is connected to capacity,float,MW,Installed capacity capacity_cost,float,Eur/MW,Annualized costs of capacity expansion expandable,boolean,n/a,Capacity can be expanded +capacity_potential,float,MW,Max install capacity if investment marginal_cost,float,Eur/MWh,Marginal cost profile,str,,Name of the profile output_parameters,dict,n/a,Optional parameters passed to oemof-solph's output flow diff --git a/tests/_files/default_edp/data/elements/biomass-gt.csv b/tests/_files/default_edp/data/elements/biomass-gt.csv index eaa94f3..47d5583 100644 --- a/tests/_files/default_edp/data/elements/biomass-gt.csv +++ b/tests/_files/default_edp/data/elements/biomass-gt.csv @@ -1,3 +1,3 @@ -name,capacity,capacity_cost,carrier,carrier_cost,efficiency,expandable,from_bus,marginal_cost,output_parameters,region,tech,to_bus,type -A-biomass-gt,,,biomass,,,,A-biomass,,{},A,gt,A-electricity,conversion -B-biomass-gt,,,biomass,,,,B-biomass,,{},B,gt,B-electricity,conversion +name,capacity,capacity_cost,capacity_potential,carrier,carrier_cost,efficiency,expandable,from_bus,marginal_cost,output_parameters,region,tech,to_bus,type +A-biomass-gt,,,,biomass,,,,A-biomass,,{},A,gt,A-electricity,conversion +B-biomass-gt,,,,biomass,,,,B-biomass,,{},B,gt,B-electricity,conversion diff --git a/tests/_files/default_edp/data/elements/ch4-boiler.csv b/tests/_files/default_edp/data/elements/ch4-boiler.csv index e71bade..23d8bf8 100644 --- a/tests/_files/default_edp/data/elements/ch4-boiler.csv +++ b/tests/_files/default_edp/data/elements/ch4-boiler.csv @@ -1,3 +1,3 @@ -name,capacity,capacity_cost,carrier,carrier_cost,efficiency,expandable,from_bus,marginal_cost,output_parameters,region,tech,to_bus,type -A-ch4-boiler,,,ch4,,,,A-ch4,,{},A,boiler,A-heat,conversion -B-ch4-boiler,,,ch4,,,,B-ch4,,{},B,boiler,B-heat,conversion +name,capacity,capacity_cost,capacity_potential,carrier,carrier_cost,efficiency,expandable,from_bus,marginal_cost,output_parameters,region,tech,to_bus,type +A-ch4-boiler,,,,ch4,,,,A-ch4,,{},A,boiler,A-heat,conversion +B-ch4-boiler,,,,ch4,,,,B-ch4,,{},B,boiler,B-heat,conversion diff --git a/tests/_files/default_edp/data/elements/ch4-gt.csv b/tests/_files/default_edp/data/elements/ch4-gt.csv index 678c532..938fb19 100644 --- a/tests/_files/default_edp/data/elements/ch4-gt.csv +++ b/tests/_files/default_edp/data/elements/ch4-gt.csv @@ -1,3 +1,3 @@ -name,capacity,capacity_cost,carrier,carrier_cost,efficiency,expandable,from_bus,marginal_cost,output_parameters,region,tech,to_bus,type -A-ch4-gt,,,ch4,,,,A-ch4,,{},A,gt,A-electricity,conversion -B-ch4-gt,,,ch4,,,,B-ch4,,{},B,gt,B-electricity,conversion +name,capacity,capacity_cost,capacity_potential,carrier,carrier_cost,efficiency,expandable,from_bus,marginal_cost,output_parameters,region,tech,to_bus,type +A-ch4-gt,,,,ch4,,,,A-ch4,,{},A,gt,A-electricity,conversion +B-ch4-gt,,,,ch4,,,,B-ch4,,{},B,gt,B-electricity,conversion diff --git a/tests/_files/default_edp/data/elements/electricity-h2_cavern.csv b/tests/_files/default_edp/data/elements/electricity-h2_cavern.csv index f3b41fd..097c979 100644 --- a/tests/_files/default_edp/data/elements/electricity-h2_cavern.csv +++ b/tests/_files/default_edp/data/elements/electricity-h2_cavern.csv @@ -1,3 +1,3 @@ -name,bus,capacity_charge,capacity_cost_charge,capacity_cost_discharge,capacity_discharge,carrier,efficiency_charge,efficiency_discharge,expandable,input_parameters,loss_rate,marginal_cost,output_parameters,region,storage_capacity,storage_capacity_cost,tech,type -A-electricity-h2_cavern,A-electricity,,,,,electricity,,,,{},,,{},A,,,h2_cavern,asymmetric_storage -B-electricity-h2_cavern,B-electricity,,,,,electricity,,,,{},,,{},B,,,h2_cavern,asymmetric_storage +name,bus,capacity_charge,capacity_cost_charge,capacity_cost_discharge,capacity_discharge,capacity_potential_charge,capacity_potential_discharge,carrier,efficiency_charge,efficiency_discharge,expandable,input_parameters,loss_rate,marginal_cost,output_parameters,region,storage_capacity,storage_capacity_cost,storage_capacity_potential,tech,type +A-electricity-h2_cavern,A-electricity,,,,,,,electricity,,,,{},,,{},A,,,,h2_cavern,asymmetric_storage +B-electricity-h2_cavern,B-electricity,,,,,,,electricity,,,,{},,,{},B,,,,h2_cavern,asymmetric_storage diff --git a/tests/_files/default_edp/data/elements/electricity-heatpump.csv b/tests/_files/default_edp/data/elements/electricity-heatpump.csv index c61aa27..5c603de 100644 --- a/tests/_files/default_edp/data/elements/electricity-heatpump.csv +++ b/tests/_files/default_edp/data/elements/electricity-heatpump.csv @@ -1,3 +1,3 @@ -name,capacity,capacity_cost,carrier,carrier_cost,efficiency,expandable,from_bus,marginal_cost,output_parameters,region,tech,to_bus,type -A-electricity-heatpump,,,electricity,,A-cop-profile,,A-electricity,,{},A,heatpump,A-heat,conversion -B-electricity-heatpump,,,electricity,,B-cop-profile,,B-electricity,,{},B,heatpump,B-heat,conversion +name,capacity,capacity_cost,capacity_potential,carrier,carrier_cost,efficiency,expandable,from_bus,marginal_cost,output_parameters,region,tech,to_bus,type +A-electricity-heatpump,,,,electricity,,A-cop-profile,,A-electricity,,{},A,heatpump,A-heat,conversion +B-electricity-heatpump,,,,electricity,,B-cop-profile,,B-electricity,,{},B,heatpump,B-heat,conversion diff --git a/tests/_files/default_edp/data/elements/electricity-liion_battery.csv b/tests/_files/default_edp/data/elements/electricity-liion_battery.csv index 6b97c49..00ff3e8 100644 --- a/tests/_files/default_edp/data/elements/electricity-liion_battery.csv +++ b/tests/_files/default_edp/data/elements/electricity-liion_battery.csv @@ -1,3 +1,3 @@ -name,bus,capacity,capacity_cost,carrier,efficiency,expandable,input_parameters,loss_rate,marginal_cost,output_parameters,region,storage_capacity,storage_capacity_cost,tech,type -A-electricity-liion_battery,A-electricity,,,electricity,,,{},,,{},A,,,liion_battery,storage -B-electricity-liion_battery,B-electricity,,,electricity,,,{},,,{},B,,,liion_battery,storage +name,bus,capacity,capacity_cost,capacity_potential,carrier,efficiency,expandable,input_parameters,loss_rate,marginal_cost,output_parameters,region,storage_capacity,storage_capacity_cost,storage_capacity_potential,tech,type +A-electricity-liion_battery,A-electricity,,,,electricity,,,{},,,{},A,,,,liion_battery,storage +B-electricity-liion_battery,B-electricity,,,,electricity,,,{},,,{},B,,,,liion_battery,storage diff --git a/tests/_files/default_edp/data/elements/electricity-pth.csv b/tests/_files/default_edp/data/elements/electricity-pth.csv index 85287ec..a3f7c0e 100644 --- a/tests/_files/default_edp/data/elements/electricity-pth.csv +++ b/tests/_files/default_edp/data/elements/electricity-pth.csv @@ -1,3 +1,3 @@ -name,capacity,capacity_cost,carrier,carrier_cost,efficiency,expandable,from_bus,marginal_cost,output_parameters,region,tech,to_bus,type -A-electricity-pth,,,electricity,,,,A-electricity,,{},A,pth,A-heat,conversion -B-electricity-pth,,,electricity,,,,B-electricity,,{},B,pth,B-heat,conversion +name,capacity,capacity_cost,capacity_potential,carrier,carrier_cost,efficiency,expandable,from_bus,marginal_cost,output_parameters,region,tech,to_bus,type +A-electricity-pth,,,,electricity,,,,A-electricity,,{},A,pth,A-heat,conversion +B-electricity-pth,,,,electricity,,,,B-electricity,,{},B,pth,B-heat,conversion diff --git a/tests/_files/default_edp/data/elements/h2-gt.csv b/tests/_files/default_edp/data/elements/h2-gt.csv index f74c730..c68c455 100644 --- a/tests/_files/default_edp/data/elements/h2-gt.csv +++ b/tests/_files/default_edp/data/elements/h2-gt.csv @@ -1,3 +1,3 @@ -name,capacity,capacity_cost,carrier,carrier_cost,efficiency,expandable,from_bus,marginal_cost,output_parameters,region,tech,to_bus,type -A-h2-gt,,,h2,,,,A-h2,,{},A,gt,A-electricity,conversion -B-h2-gt,,,h2,,,,B-h2,,{},B,gt,B-electricity,conversion +name,capacity,capacity_cost,capacity_potential,carrier,carrier_cost,efficiency,expandable,from_bus,marginal_cost,output_parameters,region,tech,to_bus,type +A-h2-gt,,,,h2,,,,A-h2,,{},A,gt,A-electricity,conversion +B-h2-gt,,,,h2,,,,B-h2,,{},B,gt,B-electricity,conversion diff --git a/tests/_files/default_edp/data/elements/heat-storage.csv b/tests/_files/default_edp/data/elements/heat-storage.csv index 685d7e7..48209cd 100644 --- a/tests/_files/default_edp/data/elements/heat-storage.csv +++ b/tests/_files/default_edp/data/elements/heat-storage.csv @@ -1,3 +1,3 @@ -name,bus,capacity,capacity_cost,carrier,efficiency,expandable,input_parameters,loss_rate,marginal_cost,output_parameters,region,storage_capacity,storage_capacity_cost,tech,type -A-heat-storage,A-heat,,,heat,,,{},,,{},A,,,storage,storage -B-heat-storage,B-heat,,,heat,,,{},,,{},B,,,storage,storage +name,bus,capacity,capacity_cost,capacity_potential,carrier,efficiency,expandable,input_parameters,loss_rate,marginal_cost,output_parameters,region,storage_capacity,storage_capacity_cost,storage_capacity_potential,tech,type +A-heat-storage,A-heat,,,,heat,,,{},,,{},A,,,,storage,storage +B-heat-storage,B-heat,,,,heat,,,{},,,{},B,,,,storage,storage diff --git a/tests/_files/default_edp/data/elements/hydro-ror.csv b/tests/_files/default_edp/data/elements/hydro-ror.csv index 3c94d47..061cd52 100644 --- a/tests/_files/default_edp/data/elements/hydro-ror.csv +++ b/tests/_files/default_edp/data/elements/hydro-ror.csv @@ -1,3 +1,3 @@ -name,bus,capacity,capacity_cost,carrier,expandable,marginal_cost,output_parameters,profile,region,tech,type -A-hydro-ror,A-electricity,,,hydro,,0,{},A-hydro-ror-profile,A,ror,volatile -B-hydro-ror,B-electricity,,,hydro,,0,{},B-hydro-ror-profile,B,ror,volatile +name,bus,capacity,capacity_cost,capacity_potential,carrier,expandable,marginal_cost,output_parameters,profile,region,tech,type +A-hydro-ror,A-electricity,,,,hydro,,0,{},A-hydro-ror-profile,A,ror,volatile +B-hydro-ror,B-electricity,,,,hydro,,0,{},B-hydro-ror-profile,B,ror,volatile diff --git a/tests/_files/default_edp/data/elements/solar-pv.csv b/tests/_files/default_edp/data/elements/solar-pv.csv index efd08c0..9d3141d 100644 --- a/tests/_files/default_edp/data/elements/solar-pv.csv +++ b/tests/_files/default_edp/data/elements/solar-pv.csv @@ -1,3 +1,3 @@ -name,bus,capacity,capacity_cost,carrier,expandable,marginal_cost,output_parameters,profile,region,tech,type -A-solar-pv,A-electricity,,,solar,,0,{},A-solar-pv-profile,A,pv,volatile -B-solar-pv,B-electricity,,,solar,,0,{},B-solar-pv-profile,B,pv,volatile +name,bus,capacity,capacity_cost,capacity_potential,carrier,expandable,marginal_cost,output_parameters,profile,region,tech,type +A-solar-pv,A-electricity,,,,solar,,0,{},A-solar-pv-profile,A,pv,volatile +B-solar-pv,B-electricity,,,,solar,,0,{},B-solar-pv-profile,B,pv,volatile diff --git a/tests/_files/default_edp/data/elements/uranium-nuclear_st.csv b/tests/_files/default_edp/data/elements/uranium-nuclear_st.csv index 9f3a2ef..bf10868 100644 --- a/tests/_files/default_edp/data/elements/uranium-nuclear_st.csv +++ b/tests/_files/default_edp/data/elements/uranium-nuclear_st.csv @@ -1,3 +1,3 @@ -name,capacity,capacity_cost,carrier,carrier_cost,efficiency,expandable,from_bus,marginal_cost,output_parameters,region,tech,to_bus,type -A-uranium-nuclear_st,,,uranium,,,,A-uranium,,{},A,nuclear_st,A-electricity,conversion -B-uranium-nuclear_st,,,uranium,,,,B-uranium,,{},B,nuclear_st,B-electricity,conversion +name,capacity,capacity_cost,capacity_potential,carrier,carrier_cost,efficiency,expandable,from_bus,marginal_cost,output_parameters,region,tech,to_bus,type +A-uranium-nuclear_st,,,,uranium,,,,A-uranium,,{},A,nuclear_st,A-electricity,conversion +B-uranium-nuclear_st,,,,uranium,,,,B-uranium,,{},B,nuclear_st,B-electricity,conversion diff --git a/tests/_files/default_edp/data/elements/wind-offshore.csv b/tests/_files/default_edp/data/elements/wind-offshore.csv index 9643c99..83e2957 100644 --- a/tests/_files/default_edp/data/elements/wind-offshore.csv +++ b/tests/_files/default_edp/data/elements/wind-offshore.csv @@ -1,3 +1,3 @@ -name,bus,capacity,capacity_cost,carrier,expandable,marginal_cost,output_parameters,profile,region,tech,type -A-wind-offshore,A-electricity,,,wind,,0,{},A-wind-offshore-profile,A,offshore,volatile -B-wind-offshore,B-electricity,,,wind,,0,{},B-wind-offshore-profile,B,offshore,volatile +name,bus,capacity,capacity_cost,capacity_potential,carrier,expandable,marginal_cost,output_parameters,profile,region,tech,type +A-wind-offshore,A-electricity,,,,wind,,0,{},A-wind-offshore-profile,A,offshore,volatile +B-wind-offshore,B-electricity,,,,wind,,0,{},B-wind-offshore-profile,B,offshore,volatile diff --git a/tests/_files/default_edp/data/elements/wind-onshore.csv b/tests/_files/default_edp/data/elements/wind-onshore.csv index 34946d7..9d144e1 100644 --- a/tests/_files/default_edp/data/elements/wind-onshore.csv +++ b/tests/_files/default_edp/data/elements/wind-onshore.csv @@ -1,3 +1,3 @@ -name,bus,capacity,capacity_cost,carrier,expandable,marginal_cost,output_parameters,profile,region,tech,type -A-wind-onshore,A-electricity,,,wind,,0,{},A-wind-onshore-profile,A,onshore,volatile -B-wind-onshore,B-electricity,,,wind,,0,{},B-wind-onshore-profile,B,onshore,volatile +name,bus,capacity,capacity_cost,capacity_potential,carrier,expandable,marginal_cost,output_parameters,profile,region,tech,type +A-wind-onshore,A-electricity,,,,wind,,0,{},A-wind-onshore-profile,A,onshore,volatile +B-wind-onshore,B-electricity,,,,wind,,0,{},B-wind-onshore-profile,B,onshore,volatile