Skip to content

Commit

Permalink
Merge pull request #23 from rl-institut/feature/results-processing
Browse files Browse the repository at this point in the history 
 Pack oemof.solph results into a single MultiIndex Dataframe
  • Loading branch information
@Bachibouzouk
Bachibouzouk authored Jun 24, 2024
2 parents 84a62be + 60b5b39 commit eda6e06
Show file tree
Hide file tree
Showing 46 changed files with 1,114 additions and 1,265 deletions.
5 changes: 1 addition & 4 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,4 @@ cython_debug/
# remove it from .gitignore and push this change
# make changes to your scenario then push them
# re-add the scenario to .gitignore and push
examples/scenarios/general_basic
examples/scenarios/general_add_cost_inputs
examples/scenarios/general_custom_attributes
examples/scenarios/general_constraints
examples/scenarios
2 changes: 1 addition & 1 deletion examples/scenarios/general_add_cost_inputs/data/elements/conversion.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
name;type;carrier;tech;capacity;capacity_cost;marginal_cost;carrier_cost;efficiency;from_bus;to_bus;expandable;capex;opex_fix;lifetime
gas-pp;conversion;gas;ocgt;50;;1.5;0;0.48;gas-bus;elec-bus;False;975000;11625;20
gas-pp;conversion;gas;ocgt;50;96629.94;1.5;0;0.48;gas-bus;elec-bus;False;975000;11625;20
2 changes: 1 addition & 1 deletion examples/scenarios/general_add_cost_inputs/data/elements/storage.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
name;carrier;tech;storage_capacity;storage_capacity_potential;capacity;efficiency;capacity_cost;storage_capacity_cost;marginal_cost;type;bus;invest_relation_output_capacity;invest_relation_input_output;expandable;capex;opex_fix;lifetime
battery-storage;lithium;battery;0;;0;0.92;0;;1.8;storage;elec-bus;1;1;True;338000;10140;15
battery-storage;electricity;battery;0;;0;0.92;0;44941.41;1.8;storage;elec-bus;1;1;True;338000;10140;15
6 changes: 3 additions & 3 deletions examples/scenarios/general_add_cost_inputs/data/elements/volatile.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name;type;carrier;tech;capacity;capacity_cost;bus;marginal_cost;profile;expandable;capex;opex_fix;lifetime
wind;volatile;wind;onshore;0.0;;elec-bus;0.0;wind-profile;True;1362500;27500;20
pv;volatile;solar;pv;0.0;;elec-bus;0.0;pv-profile;True;1050000;10500;30
hydro;volatile;hydro;hydro;0.0;;elec-bus;0.0;1;True;2150000;47300;40
wind;volatile;electricity;onshore;0.0;146288.96;elec-bus;0.0;wind-profile;True;1362500;27500;20
pv;volatile;electricity;pv;0.0;86781.36;elec-bus;0.0;pv-profile;True;1050000;10500;30
hydro;volatile;electricity;hydro;0.0;190192.3;elec-bus;0.0;1;True;2150000;47300;40
2 changes: 1 addition & 1 deletion examples/scenarios/general_basic/data/elements/storage.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
name;carrier;tech;storage_capacity;storage_capacity_potential;capacity;efficiency;capacity_cost;storage_capacity_cost;marginal_cost;type;bus;invest_relation_output_capacity;invest_relation_input_output;expandable
battery-storage;lithium;battery;0;100;0;0.92;0;61553;1.8;storage;elec-bus;1;1;True
battery-storage;electricity;battery;0;100;0;0.92;0;61553;1.8;storage;elec-bus;1;1;True
6 changes: 3 additions & 3 deletions examples/scenarios/general_basic/data/elements/volatile.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name;type;carrier;tech;capacity;capacity_cost;bus;marginal_cost;profile;expandable
wind;volatile;wind;onshore;0;161151;elec-bus;0;wind-profile;True
pv;volatile;solar;pv;0;99405;elec-bus;0;pv-profile;True
hydro;volatile;hydro;hydro;0;218011;elec-bus;0;1;True
wind;volatile;electricity;onshore;0;161151;elec-bus;0;wind-profile;True
pv;volatile;electricity;pv;0;99405;elec-bus;0;pv-profile;True
hydro;volatile;electricity;hydro;0;218011;elec-bus;0;1;True
2 changes: 0 additions & 2 deletions examples/scenarios/general_constraints/data/elements/shortage.csv
View file

This file was deleted.

2 changes: 1 addition & 1 deletion examples/scenarios/general_constraints/data/elements/storage.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
name;carrier;tech;storage_capacity;storage_capacity_potential;capacity;efficiency;capacity_cost;storage_capacity_cost;marginal_cost;type;bus;invest_relation_output_capacity;invest_relation_input_output;expandable;emission_factor
battery-storage;lithium;battery;0;100;0;0.92;0;61553;1.8;storage;elec-bus;0.1;1;True;0
battery-storage;electricity;battery;0;100;0;0.92;0;61553;1.8;storage;elec-bus;0.1;1;True;0
6 changes: 3 additions & 3 deletions examples/scenarios/general_constraints/data/elements/volatile.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name;type;carrier;tech;capacity;capacity_cost;bus;marginal_cost;profile;expandable;emission_factor;renewable_factor
wind;volatile;wind;onshore;0;161151;elec-bus;0;wind-profile;True;0;1
pv;volatile;solar;pv;0;99405;elec-bus;0;pv-profile;True;0;1
hydro;volatile;hydro;hydro;0;218011;elec-bus;0;1;True;0;1
wind;volatile;electricity;onshore;0;161151;elec-bus;0;wind-profile;True;0;1
pv;volatile;electricity;pv;0;99405;elec-bus;0;pv-profile;True;0;1
hydro;volatile;electricity;hydro;0;218011;elec-bus;0;1;True;0;1
2 changes: 0 additions & 2 deletions examples/scenarios/general_custom_attributes/data/elements/shortage.csv
View file

This file was deleted.

2 changes: 1 addition & 1 deletion examples/scenarios/general_custom_attributes/data/elements/storage.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
name;carrier;tech;storage_capacity;storage_capacity_potential;capacity;efficiency;capacity_cost;storage_capacity_cost;marginal_cost;type;bus;invest_relation_output_capacity;invest_relation_input_output;expandable;emission_factor
battery-storage;lithium;battery;0;100;0;0.92;0;61553;1.8;storage;elec-bus;0.1;1;True;0
battery-storage;electricity;battery;0;100;0;0.92;0;61553;1.8;storage;elec-bus;0.1;1;True;0
6 changes: 3 additions & 3 deletions examples/scenarios/general_custom_attributes/data/elements/volatile.csv
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name;type;carrier;tech;capacity;capacity_cost;bus;marginal_cost;profile;expandable;emission_factor;renewable_factor
wind;volatile;wind;onshore;0;161151;elec-bus;0;wind-profile;True;0;1
pv;volatile;solar;pv;0;99405;elec-bus;0;pv-profile;True;0;1
hydro;volatile;hydro;hydro;0;218011;elec-bus;0;1;True;0;1
wind;volatile;electricity;onshore;0;161151;elec-bus;0;wind-profile;True;0;1
pv;volatile;electricity;pv;0;99405;elec-bus;0;pv-profile;True;0;1
hydro;volatile;electricity;hydro;0;218011;elec-bus;0;1;True;0;1
3 changes: 3 additions & 0 deletions examples/scenarios/wefe_custom_attributes/data/elements/bus.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
name;type;balanced
solar-energy-bus;bus;True
elec-bus;bus;True
3 changes: 3 additions & 0 deletions examples/scenarios/wefe_custom_attributes/data/elements/dispatchable.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
name;type;carrier;tech;capacity;capacity_cost;bus;marginal_cost;carrier_cost;profile;expandable;renewable_factor;emission_factor
solar-radiation;dispatchable;solar-energy;source;0;0;solar-energy-bus;0.0;0;ghi-profile;True;;
back-up-elec;dispatchable;electricity;source;0;0;elec-bus;0.5;0;1;True;0.0;0.39
2 changes: 2 additions & 0 deletions examples/scenarios/wefe_custom_attributes/data/elements/excess.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name;type;bus;marginal_cost
electricity-excess;excess;elec-bus;0
2 changes: 2 additions & 0 deletions examples/scenarios/wefe_custom_attributes/data/elements/load.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name;amount;profile;type;bus
demand;1;electricity-load-profile;load;elec-bus
2 changes: 2 additions & 0 deletions examples/scenarios/wefe_custom_attributes/data/elements/pv_panel.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name;type;carrier;tech;capacity;capacity_cost;marginal_cost;carrier_cost;from_bus;to_bus;t_air;ghi;p_rpv;r_ref;n_t;t_c_ref;noct;expandable;renewable_factor;emission_factor;land_requirement_factor;water_footprint_factor
pv-panel;pv-panel;solar-energy;pv;0;0;0;0;solar-energy-bus;elec-bus;t-air;ghi;270;1000;-0.0037;25;48;False;1;0;10;5
25 changes: 25 additions & 0 deletions examples/scenarios/wefe_custom_attributes/data/sequences/dispatchable_profile.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
timeindex,ghi-profile,elec-profile
2019-01-01T00:00:00Z,3.47E-05,1
2019-01-01T01:00:00Z,3.47E-05,1
2019-01-01T02:00:00Z,3.47E-05,1
2019-01-01T03:00:00Z,3.47E-05,1
2019-01-01T04:00:00Z,3.47E-05,1
2019-01-01T05:00:00Z,3.47E-05,1
2019-01-01T06:00:00Z,3.47E-05,1
2019-01-01T07:00:00Z,3.47E-05,1
2019-01-01T08:00:00Z,17.453646,1
2019-01-01T09:00:00Z,105.80229,1
2019-01-01T10:00:00Z,213.95938,1
2019-01-01T11:00:00Z,279.92303,1
2019-01-01T12:00:00Z,305.4247,1
2019-01-01T13:00:00Z,277.91446,1
2019-01-01T14:00:00Z,208.47395,1
2019-01-01T15:00:00Z,103.83528,1
2019-01-01T16:00:00Z,13.256493,1
2019-01-01T17:00:00Z,3.47E-05,1
2019-01-01T18:00:00Z,3.47E-05,1
2019-01-01T19:00:00Z,3.47E-05,1
2019-01-01T20:00:00Z,3.47E-05,1
2019-01-01T21:00:00Z,3.47E-05,1
2019-01-01T22:00:00Z,3.47E-05,1
2019-01-01T23:00:00Z,3.47E-05,1
25 changes: 25 additions & 0 deletions examples/scenarios/wefe_custom_attributes/data/sequences/load_profile.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
timeindex,electricity-load-profile
2019-01-01T00:00:00Z,0.000101296
2019-01-01T01:00:00Z,9.94E-05
2019-01-01T02:00:00Z,9.94E-05
2019-01-01T03:00:00Z,9.75E-05
2019-01-01T04:00:00Z,0.000103208
2019-01-01T05:00:00Z,0.000114675
2019-01-01T06:00:00Z,0.000131876
2019-01-01T07:00:00Z,0.000131876
2019-01-01T08:00:00Z,0.00012232
2019-01-01T09:00:00Z,0.000116586
2019-01-01T10:00:00Z,0.000114675
2019-01-01T11:00:00Z,0.000114675
2019-01-01T12:00:00Z,0.000114675
2019-01-01T13:00:00Z,0.000114675
2019-01-01T14:00:00Z,0.000114675
2019-01-01T15:00:00Z,0.000116586
2019-01-01T16:00:00Z,0.000128054
2019-01-01T17:00:00Z,0.000139521
2019-01-01T18:00:00Z,0.000141433
2019-01-01T19:00:00Z,0.000139521
2019-01-01T20:00:00Z,0.000141433
2019-01-01T21:00:00Z,0.000139521
2019-01-01T22:00:00Z,0.000128054
2019-01-01T23:00:00Z,0.000114675
0 ...mosis/data/sequences/pv_panel_profile.csv → ...butes/data/sequences/pv_panel_profile.csv
View file
File renamed without changes.
Empty file added examples/scenarios/wefe_custom_attributes/scripts/.gitkeep
View file
Empty file.
5 changes: 0 additions & 5 deletions examples/scenarios/wefe_pv_panel/README.md
View file

This file was deleted.

5 changes: 0 additions & 5 deletions examples/scenarios/wefe_reverse_osmosis/README.md
View file

This file was deleted.

11 changes: 5 additions & 6 deletions examples/scenarios/wefe_reverse_osmosis/data/elements/bus.csv
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
name;type;balanced
solar-energy-bus;bus;true
dc-elec-bus;bus;true
ac-elec-bus;bus;true
water-bus;bus;true
permeate-bus;bus;true
brine-bus;bus;true
seawater-bus;bus;True
ac-elec-bus;bus;True
dc-elec-bus;bus;True
permeate-bus;bus;True
brine-bus;bus;True
5 changes: 2 additions & 3 deletions examples/scenarios/wefe_reverse_osmosis/data/elements/conversion.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
name;type;carrier;tech;capacity;capacity_cost;marginal_cost;carrier_cost;efficiency;from_bus;to_bus;expandable
inverter;conversion;electricity;inverter;0;10;0;0;0.9;dc-elec-bus;ac-elec-bus;true
r-o-unit;
name;type;carrier;tech;capacity;capacity_potential;capacity_minimum;capacity_cost;marginal_cost;carrier_cost;efficiency;from_bus;to_bus;expandable;capex;opex_fix;lifetime
inverter;conversion;electricity;inverter;0;;;9.72;0;0;0.9;dc-elec-bus;ac-elec-bus;True;100;1;20
6 changes: 3 additions & 3 deletions examples/scenarios/wefe_reverse_osmosis/data/elements/dispatchable.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name;type;carrier;tech;capacity;capacity_cost;bus;marginal_cost;carrier_cost;profile;output_parameters;expandable
solar-radiation;dispatchable;solar-energy;source;0;0;solar-energy-bus;0;0;ghi-profile;{};true
water-source;dispatchable;water;source;0;0;water-bus;0.5;0;1;{};true
name;type;carrier;tech;capacity;capacity_cost;bus;marginal_cost;carrier_cost;profile;expandable
seawater-source;dispatchable;water;source;0;0;seawater-bus;0.0;0;1;True
backup-electricity-grid;dispatchable;electricity;source;0;0;ac-elec-bus;0.2;0;1;True
4 changes: 2 additions & 2 deletions examples/scenarios/wefe_reverse_osmosis/data/elements/excess.csv
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
name;type;bus;marginal_cost
electricity-excess;excess;elec-bus;0
water-production;excess;water-bus;0
electricity-excess;excess;ac-elec-bus;0
brine-excess;excess;brine-bus;0
5 changes: 3 additions & 2 deletions examples/scenarios/wefe_reverse_osmosis/data/elements/load.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
name;amount;profile;type;bus
demand;1;electricity-load-profile;load;elec-bus
type;profile;name;region;year;bus;amount
load;permeate;permeate-demand;DE;2021;permeate-bus;1
load;elec;elec-demand;DE;2021;ac-elec-bus;1
2 changes: 2 additions & 0 deletions examples/scenarios/wefe_reverse_osmosis/data/elements/mimo.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
type;name;carrier;tech;expandable;primary;capacity;capacity_cost;from_bus_0;from_bus_1;to_bus_0;to_bus_1;conversion_factor_seawater-bus;conversion_factor_ac-elec-bus;conversion_factor_permeate-bus;conversion_factor_brine-bus;capex;opex_fix;lifetime
mimo;mimo;water;mimo;True;permeate-bus;0;287.4;seawater-bus;ac-elec-bus;permeate-bus;brine-bus;4.0;5.0;1.0;1.5;1000.0;50.0;5.0
2 changes: 0 additions & 2 deletions examples/scenarios/wefe_reverse_osmosis/data/elements/pv_panel.csv
View file

This file was deleted.

5 changes: 3 additions & 2 deletions examples/scenarios/wefe_reverse_osmosis/data/elements/storage.csv
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
name;carrier;tech;storage_capacity;storage_capacity_potential;capacity;efficiency;capacity_cost;storage_capacity_cost;marginal_cost;type;bus;invest_relation_output_capacity;invest_relation_input_output;expandable
battery-storage;lithium;battery;0;;0;0.92;0;100;0;storage;ac-elec-bus;0.1;1;True
name;carrier;tech;storage_capacity;storage_capacity_potential;capacity;efficiency;capacity_cost;storage_capacity_cost;marginal_cost;type;bus;invest_relation_output_capacity;expandable;capex;opex_fix;lifetime;land_requirement;output_parameters
battery-storage;electricity;battery;0;;0;0.92;0;44.04;0;storage;ac-elec-bus;1.0;True;350;8;15;2;"{""custom_attributes"": {""land_requirement"": 2}}"
water-storage;water;storage;0;;0;0.99;0;8.1;0;storage;permeate-bus;1.0;True;70;2;20;2;"{""custom_attributes"": {""land_requirement"": 2}}"
2 changes: 2 additions & 0 deletions examples/scenarios/wefe_reverse_osmosis/data/elements/volatile.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name;type;carrier;tech;capacity;capacity_cost;bus;marginal_cost;profile;expandable;capex;opex_fix;lifetime
pv;volatile;electricity;pv;0.0;97.18;dc-elec-bus;0.0;pv-profile;True;1000.0;10.0;20.0
25 changes: 0 additions & 25 deletions examples/scenarios/wefe_reverse_osmosis/data/sequences/dispatchable_profile.csv
View file

This file was deleted.

29 changes: 4 additions & 25 deletions examples/scenarios/wefe_reverse_osmosis/data/sequences/load_profile.csv
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,4 @@
timeindex,electricity-load-profile
2019-01-01T00:00:00Z,0.000101296
2019-01-01T01:00:00Z,9.94E-05
2019-01-01T02:00:00Z,9.94E-05
2019-01-01T03:00:00Z,9.75E-05
2019-01-01T04:00:00Z,0.000103208
2019-01-01T05:00:00Z,0.000114675
2019-01-01T06:00:00Z,0.000131876
2019-01-01T07:00:00Z,0.000131876
2019-01-01T08:00:00Z,0.00012232
2019-01-01T09:00:00Z,0.000116586
2019-01-01T10:00:00Z,0.000114675
2019-01-01T11:00:00Z,0.000114675
2019-01-01T12:00:00Z,0.000114675
2019-01-01T13:00:00Z,0.000114675
2019-01-01T14:00:00Z,0.000114675
2019-01-01T15:00:00Z,0.000116586
2019-01-01T16:00:00Z,0.000128054
2019-01-01T17:00:00Z,0.000139521
2019-01-01T18:00:00Z,0.000141433
2019-01-01T19:00:00Z,0.000139521
2019-01-01T20:00:00Z,0.000141433
2019-01-01T21:00:00Z,0.000139521
2019-01-01T22:00:00Z,0.000128054
2019-01-01T23:00:00Z,0.000114675
timeindex;permeate;elec
2021-01-01T00:00:00Z;10;20
2021-01-01T01:00:00Z;20;40
2021-01-01T02:00:00Z;30;60
4 changes: 4 additions & 0 deletions examples/scenarios/wefe_reverse_osmosis/data/sequences/volatile_profile.csv
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
timeindex;pv-profile
2021-01-01T00:00:00Z;0.2
2021-01-01T01:00:00Z;0.5
2021-01-01T02:00:00Z;0.8
Loading

0 comments on commit eda6e06

Please sign in to comment.