Skip to content

Add capacity_potential as attribute to facade_attrs files #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jnnr merged 7 commits into from
Nov 10, 2021
Merged

Add capacity_potential as attribute to facade_attrs files #26

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
36b264f
Add capacity_potential as attribute to facade_attrs files
MaGering Jul 12, 2021
3eb272f
Fix tests
MaGering Jul 12, 2021
50666c7
Add storage_capacity_potential as attribute to facade_attrs files
MaGering Jul 19, 2021
d1184b4
Fix test after adding storage_capacity_potential as attribute
MaGering Jul 19, 2021
8ef2469
Merge branch 'dev' into features/add_capacity_potential
MaGering Sep 28, 2021
93f2b87
Re-insert accidentally deleted line in the csv files
MaGering Sep 28, 2021
3126798
Update asymmetric storage to charging and discharging capacity potent…
MaGering Sep 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions oemoflex/model/facade_attrs/asymmetric_storage.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ 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,float,MW,Potential of the investment for 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
Expand Down
1 change: 1 addition & 0 deletions oemoflex/model/facade_attrs/conversion.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions oemoflex/model/facade_attrs/storage.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions oemoflex/model/facade_attrs/volatile.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 3 additions & 3 deletions tests/_files/default_edp/data/elements/biomass-gt.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions tests/_files/default_edp/data/elements/ch4-boiler.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions tests/_files/default_edp/data/elements/ch4-gt.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions tests/_files/default_edp/data/elements/electricity-h2_cavern.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,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
6 changes: 3 additions & 3 deletions tests/_files/default_edp/data/elements/electricity-heatpump.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions tests/_files/default_edp/data/elements/electricity-liion_battery.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions tests/_files/default_edp/data/elements/electricity-pth.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions tests/_files/default_edp/data/elements/h2-gt.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions tests/_files/default_edp/data/elements/heat-storage.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions tests/_files/default_edp/data/elements/hydro-ror.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions tests/_files/default_edp/data/elements/solar-pv.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions tests/_files/default_edp/data/elements/uranium-nuclear_st.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions tests/_files/default_edp/data/elements/wind-offshore.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions tests/_files/default_edp/data/elements/wind-onshore.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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