Skip to content
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

Jump to bottom

Upgrade to oemof.solph 0.5.2dev1 #157

Merged
merged 5 commits into from Feb 7, 2024
Merged

Upgrade to oemof.solph 0.5.2dev1 #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
617e6dc
Fix solph version & Update LP files
FelixMau Feb 7, 2024
b5f6eab
Adding comment
FelixMau Feb 7, 2024
8eac9f7
Update AUTHORS.rst
FelixMau Feb 7, 2024
0d3186e
solph 0.5.2dev1
FelixMau Feb 7, 2024
5d1f084
Merge remote-tracking branch 'origin/upgrade_to_oemof_solph_0_5_2dev2…
FelixMau Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions AUTHORS.rst
View file
Open in desktop
Expand Up @@ -13,3 +13,4 @@ Authors
* Sarah Berendes
* Marie-Claire Gering
* Julian Endres
* Felix Maurer
4 changes: 3 additions & 1 deletion setup.py
View file
Open in desktop
Expand Up @@ -68,7 +68,9 @@ def read(*names, **kwargs):
"datapackage==1.5.1",
"tableschema==1.7.4", # newer versions (v1.8.0 and up) fail!
# "oemof.solph>=0.5.1",
"oemof.solph==0.5.2dev0",
# Upcomming upgrade to solph 0.5.2 postponed due to many changes necessary for implementing
# explicit arguments and upgrade to network 0.5.1
"oemof.solph==0.5.2dev1",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

damn a "." was missing here... but also didnt see it

"pandas>=0.22",
"oemof.network==0.5.0a4", # Temporal fix due to braking changes in 0.5.1
"paramiko",
Expand Down
104 changes: 52 additions & 52 deletions tests/_files/lp_files/multi-period/backpressure_investment_brown_field_multi_period.lp
View file
Open in desktop
@@ -1,11 +1,11 @@
\* Source Pyomo model name=Model *\

min
min
objective:
+393187.4631175658 ONE_VAR_CONSTANT
+561.5105784699618 InvestmentFlowBlock_invest(backpressure_electricity_0)
+386.89361416194254 InvestmentFlowBlock_invest(backpressure_electricity_1)
+267.76218567632424 InvestmentFlowBlock_invest(backpressure_electricity_2)
+550.3538603446715 InvestmentFlowBlock_invest(backpressure_electricity_0)
+226.09002140491177 InvestmentFlowBlock_invest(backpressure_electricity_1)
+15.604198638169356 InvestmentFlowBlock_invest(backpressure_electricity_2)
+0.6 flow(fuel_backpressure_0_0)
+0.6 flow(fuel_backpressure_0_1)
+0.6 flow(fuel_backpressure_0_2)
Expand All @@ -18,40 +18,40 @@ objective:

s.t.

c_e_BusBlock_balance(heat_0_0)_:
+1 flow(backpressure_heat_0_0)
c_e_BusBlock_balance(electricity_0_0)_:
+1 flow(backpressure_electricity_0_0)
= 0

c_e_BusBlock_balance(heat_0_1)_:
+1 flow(backpressure_heat_0_1)
c_e_BusBlock_balance(electricity_0_1)_:
+1 flow(backpressure_electricity_0_1)
= 0

c_e_BusBlock_balance(heat_0_2)_:
+1 flow(backpressure_heat_0_2)
c_e_BusBlock_balance(electricity_0_2)_:
+1 flow(backpressure_electricity_0_2)
= 0

c_e_BusBlock_balance(heat_1_3)_:
+1 flow(backpressure_heat_1_3)
c_e_BusBlock_balance(electricity_1_3)_:
+1 flow(backpressure_electricity_1_3)
= 0

c_e_BusBlock_balance(heat_1_4)_:
+1 flow(backpressure_heat_1_4)
c_e_BusBlock_balance(electricity_1_4)_:
+1 flow(backpressure_electricity_1_4)
= 0

c_e_BusBlock_balance(heat_1_5)_:
+1 flow(backpressure_heat_1_5)
c_e_BusBlock_balance(electricity_1_5)_:
+1 flow(backpressure_electricity_1_5)
= 0

c_e_BusBlock_balance(heat_2_6)_:
+1 flow(backpressure_heat_2_6)
c_e_BusBlock_balance(electricity_2_6)_:
+1 flow(backpressure_electricity_2_6)
= 0

c_e_BusBlock_balance(heat_2_7)_:
+1 flow(backpressure_heat_2_7)
c_e_BusBlock_balance(electricity_2_7)_:
+1 flow(backpressure_electricity_2_7)
= 0

c_e_BusBlock_balance(heat_2_8)_:
+1 flow(backpressure_heat_2_8)
c_e_BusBlock_balance(electricity_2_8)_:
+1 flow(backpressure_electricity_2_8)
= 0

c_e_BusBlock_balance(fuel_0_0)_:
Expand Down Expand Up @@ -90,40 +90,40 @@ c_e_BusBlock_balance(fuel_2_8)_:
+1 flow(fuel_backpressure_2_8)
= 0

c_e_BusBlock_balance(electricity_0_0)_:
+1 flow(backpressure_electricity_0_0)
c_e_BusBlock_balance(heat_0_0)_:
+1 flow(backpressure_heat_0_0)
= 0

c_e_BusBlock_balance(electricity_0_1)_:
+1 flow(backpressure_electricity_0_1)
c_e_BusBlock_balance(heat_0_1)_:
+1 flow(backpressure_heat_0_1)
= 0

c_e_BusBlock_balance(electricity_0_2)_:
+1 flow(backpressure_electricity_0_2)
c_e_BusBlock_balance(heat_0_2)_:
+1 flow(backpressure_heat_0_2)
= 0

c_e_BusBlock_balance(electricity_1_3)_:
+1 flow(backpressure_electricity_1_3)
c_e_BusBlock_balance(heat_1_3)_:
+1 flow(backpressure_heat_1_3)
= 0

c_e_BusBlock_balance(electricity_1_4)_:
+1 flow(backpressure_electricity_1_4)
c_e_BusBlock_balance(heat_1_4)_:
+1 flow(backpressure_heat_1_4)
= 0

c_e_BusBlock_balance(electricity_1_5)_:
+1 flow(backpressure_electricity_1_5)
c_e_BusBlock_balance(heat_1_5)_:
+1 flow(backpressure_heat_1_5)
= 0

c_e_BusBlock_balance(electricity_2_6)_:
+1 flow(backpressure_electricity_2_6)
c_e_BusBlock_balance(heat_2_6)_:
+1 flow(backpressure_heat_2_6)
= 0

c_e_BusBlock_balance(electricity_2_7)_:
+1 flow(backpressure_electricity_2_7)
c_e_BusBlock_balance(heat_2_7)_:
+1 flow(backpressure_heat_2_7)
= 0

c_e_BusBlock_balance(electricity_2_8)_:
+1 flow(backpressure_electricity_2_8)
c_e_BusBlock_balance(heat_2_8)_:
+1 flow(backpressure_heat_2_8)
= 0

c_e_ConverterBlock_relation(backpressure_fuel_electricity_0_0)_:
Expand Down Expand Up @@ -261,9 +261,9 @@ c_e_InvestmentFlowBlock_old_rule_exo(backpressure_electricity_2)_:
= 1000

c_e_InvestmentFlowBlock_old_rule(backpressure_electricity_0)_:
+1 InvestmentFlowBlock_old(backpressure_electricity_0)
-1 InvestmentFlowBlock_old_end(backpressure_electricity_0)
-1 InvestmentFlowBlock_old_exo(backpressure_electricity_0)
+1 InvestmentFlowBlock_old(backpressure_electricity_0)
= 0

c_e_InvestmentFlowBlock_old_rule(backpressure_electricity_1)_:
Expand Down Expand Up @@ -337,15 +337,6 @@ bounds
0 <= flow(fuel_backpressure_2_6) <= +inf
0 <= flow(fuel_backpressure_2_7) <= +inf
0 <= flow(fuel_backpressure_2_8) <= +inf
0 <= flow(backpressure_heat_0_0) <= +inf
0 <= flow(backpressure_heat_0_1) <= +inf
0 <= flow(backpressure_heat_0_2) <= +inf
0 <= flow(backpressure_heat_1_3) <= +inf
0 <= flow(backpressure_heat_1_4) <= +inf
0 <= flow(backpressure_heat_1_5) <= +inf
0 <= flow(backpressure_heat_2_6) <= +inf
0 <= flow(backpressure_heat_2_7) <= +inf
0 <= flow(backpressure_heat_2_8) <= +inf
0 <= flow(backpressure_electricity_0_0) <= +inf
0 <= flow(backpressure_electricity_0_1) <= +inf
0 <= flow(backpressure_electricity_0_2) <= +inf
Expand All @@ -355,16 +346,25 @@ bounds
0 <= flow(backpressure_electricity_2_6) <= +inf
0 <= flow(backpressure_electricity_2_7) <= +inf
0 <= flow(backpressure_electricity_2_8) <= +inf
0 <= flow(backpressure_heat_0_0) <= +inf
0 <= flow(backpressure_heat_0_1) <= +inf
0 <= flow(backpressure_heat_0_2) <= +inf
0 <= flow(backpressure_heat_1_3) <= +inf
0 <= flow(backpressure_heat_1_4) <= +inf
0 <= flow(backpressure_heat_1_5) <= +inf
0 <= flow(backpressure_heat_2_6) <= +inf
0 <= flow(backpressure_heat_2_7) <= +inf
0 <= flow(backpressure_heat_2_8) <= +inf
0 <= InvestmentFlowBlock_total(backpressure_electricity_0) <= +inf
0 <= InvestmentFlowBlock_total(backpressure_electricity_1) <= +inf
0 <= InvestmentFlowBlock_old(backpressure_electricity_1) <= +inf
0 <= InvestmentFlowBlock_total(backpressure_electricity_2) <= +inf
0 <= InvestmentFlowBlock_old(backpressure_electricity_0) <= +inf
0 <= InvestmentFlowBlock_old(backpressure_electricity_1) <= +inf
0 <= InvestmentFlowBlock_old(backpressure_electricity_2) <= +inf
0 <= InvestmentFlowBlock_old_end(backpressure_electricity_0) <= +inf
0 <= InvestmentFlowBlock_old_end(backpressure_electricity_1) <= +inf
0 <= InvestmentFlowBlock_old_end(backpressure_electricity_2) <= +inf
0 <= InvestmentFlowBlock_old_exo(backpressure_electricity_0) <= +inf
0 <= InvestmentFlowBlock_old_exo(backpressure_electricity_1) <= +inf
0 <= InvestmentFlowBlock_old_exo(backpressure_electricity_2) <= +inf
0 <= InvestmentFlowBlock_old(backpressure_electricity_0) <= +inf
end
104 changes: 52 additions & 52 deletions tests/_files/lp_files/multi-period/backpressure_investment_green_field_multi_period.lp
View file
Open in desktop
@@ -1,10 +1,10 @@
\* Source Pyomo model name=Model *\

min
min
objective:
+561.5105784699618 InvestmentFlowBlock_invest(backpressure_bus_el_0)
+386.89361416194254 InvestmentFlowBlock_invest(backpressure_bus_el_1)
+267.76218567632424 InvestmentFlowBlock_invest(backpressure_bus_el_2)
+550.3538603446715 InvestmentFlowBlock_invest(backpressure_bus_el_0)
+226.09002140491177 InvestmentFlowBlock_invest(backpressure_bus_el_1)
+15.604198638169356 InvestmentFlowBlock_invest(backpressure_bus_el_2)
+0.6 flow(bus_fuel_backpressure_0_0)
+0.6 flow(bus_fuel_backpressure_0_1)
+0.6 flow(bus_fuel_backpressure_0_2)
Expand All @@ -17,40 +17,40 @@ objective:

s.t.

c_e_BusBlock_balance(bus_heat_0_0)_:
+1 flow(backpressure_bus_heat_0_0)
c_e_BusBlock_balance(bus_el_0_0)_:
+1 flow(backpressure_bus_el_0_0)
= 0

c_e_BusBlock_balance(bus_heat_0_1)_:
+1 flow(backpressure_bus_heat_0_1)
c_e_BusBlock_balance(bus_el_0_1)_:
+1 flow(backpressure_bus_el_0_1)
= 0

c_e_BusBlock_balance(bus_heat_0_2)_:
+1 flow(backpressure_bus_heat_0_2)
c_e_BusBlock_balance(bus_el_0_2)_:
+1 flow(backpressure_bus_el_0_2)
= 0

c_e_BusBlock_balance(bus_heat_1_3)_:
+1 flow(backpressure_bus_heat_1_3)
c_e_BusBlock_balance(bus_el_1_3)_:
+1 flow(backpressure_bus_el_1_3)
= 0

c_e_BusBlock_balance(bus_heat_1_4)_:
+1 flow(backpressure_bus_heat_1_4)
c_e_BusBlock_balance(bus_el_1_4)_:
+1 flow(backpressure_bus_el_1_4)
= 0

c_e_BusBlock_balance(bus_heat_1_5)_:
+1 flow(backpressure_bus_heat_1_5)
c_e_BusBlock_balance(bus_el_1_5)_:
+1 flow(backpressure_bus_el_1_5)
= 0

c_e_BusBlock_balance(bus_heat_2_6)_:
+1 flow(backpressure_bus_heat_2_6)
c_e_BusBlock_balance(bus_el_2_6)_:
+1 flow(backpressure_bus_el_2_6)
= 0

c_e_BusBlock_balance(bus_heat_2_7)_:
+1 flow(backpressure_bus_heat_2_7)
c_e_BusBlock_balance(bus_el_2_7)_:
+1 flow(backpressure_bus_el_2_7)
= 0

c_e_BusBlock_balance(bus_heat_2_8)_:
+1 flow(backpressure_bus_heat_2_8)
c_e_BusBlock_balance(bus_el_2_8)_:
+1 flow(backpressure_bus_el_2_8)
= 0

c_e_BusBlock_balance(bus_fuel_0_0)_:
Expand Down Expand Up @@ -89,40 +89,40 @@ c_e_BusBlock_balance(bus_fuel_2_8)_:
+1 flow(bus_fuel_backpressure_2_8)
= 0

c_e_BusBlock_balance(bus_el_0_0)_:
+1 flow(backpressure_bus_el_0_0)
c_e_BusBlock_balance(bus_heat_0_0)_:
+1 flow(backpressure_bus_heat_0_0)
= 0

c_e_BusBlock_balance(bus_el_0_1)_:
+1 flow(backpressure_bus_el_0_1)
c_e_BusBlock_balance(bus_heat_0_1)_:
+1 flow(backpressure_bus_heat_0_1)
= 0

c_e_BusBlock_balance(bus_el_0_2)_:
+1 flow(backpressure_bus_el_0_2)
c_e_BusBlock_balance(bus_heat_0_2)_:
+1 flow(backpressure_bus_heat_0_2)
= 0

c_e_BusBlock_balance(bus_el_1_3)_:
+1 flow(backpressure_bus_el_1_3)
c_e_BusBlock_balance(bus_heat_1_3)_:
+1 flow(backpressure_bus_heat_1_3)
= 0

c_e_BusBlock_balance(bus_el_1_4)_:
+1 flow(backpressure_bus_el_1_4)
c_e_BusBlock_balance(bus_heat_1_4)_:
+1 flow(backpressure_bus_heat_1_4)
= 0

c_e_BusBlock_balance(bus_el_1_5)_:
+1 flow(backpressure_bus_el_1_5)
c_e_BusBlock_balance(bus_heat_1_5)_:
+1 flow(backpressure_bus_heat_1_5)
= 0

c_e_BusBlock_balance(bus_el_2_6)_:
+1 flow(backpressure_bus_el_2_6)
c_e_BusBlock_balance(bus_heat_2_6)_:
+1 flow(backpressure_bus_heat_2_6)
= 0

c_e_BusBlock_balance(bus_el_2_7)_:
+1 flow(backpressure_bus_el_2_7)
c_e_BusBlock_balance(bus_heat_2_7)_:
+1 flow(backpressure_bus_heat_2_7)
= 0

c_e_BusBlock_balance(bus_el_2_8)_:
+1 flow(backpressure_bus_el_2_8)
c_e_BusBlock_balance(bus_heat_2_8)_:
+1 flow(backpressure_bus_heat_2_8)
= 0

c_e_ConverterBlock_relation(backpressure_bus_fuel_bus_el_0_0)_:
Expand Down Expand Up @@ -260,9 +260,9 @@ c_e_InvestmentFlowBlock_old_rule_exo(backpressure_bus_el_2)_:
= 0

c_e_InvestmentFlowBlock_old_rule(backpressure_bus_el_0)_:
+1 InvestmentFlowBlock_old(backpressure_bus_el_0)
-1 InvestmentFlowBlock_old_end(backpressure_bus_el_0)
-1 InvestmentFlowBlock_old_exo(backpressure_bus_el_0)
+1 InvestmentFlowBlock_old(backpressure_bus_el_0)
= 0

c_e_InvestmentFlowBlock_old_rule(backpressure_bus_el_1)_:
Expand Down Expand Up @@ -335,15 +335,6 @@ bounds
0 <= flow(bus_fuel_backpressure_2_6) <= +inf
0 <= flow(bus_fuel_backpressure_2_7) <= +inf
0 <= flow(bus_fuel_backpressure_2_8) <= +inf
0 <= flow(backpressure_bus_heat_0_0) <= +inf
0 <= flow(backpressure_bus_heat_0_1) <= +inf
0 <= flow(backpressure_bus_heat_0_2) <= +inf
0 <= flow(backpressure_bus_heat_1_3) <= +inf
0 <= flow(backpressure_bus_heat_1_4) <= +inf
0 <= flow(backpressure_bus_heat_1_5) <= +inf
0 <= flow(backpressure_bus_heat_2_6) <= +inf
0 <= flow(backpressure_bus_heat_2_7) <= +inf
0 <= flow(backpressure_bus_heat_2_8) <= +inf
0 <= flow(backpressure_bus_el_0_0) <= +inf
0 <= flow(backpressure_bus_el_0_1) <= +inf
0 <= flow(backpressure_bus_el_0_2) <= +inf
Expand All @@ -353,16 +344,25 @@ bounds
0 <= flow(backpressure_bus_el_2_6) <= +inf
0 <= flow(backpressure_bus_el_2_7) <= +inf
0 <= flow(backpressure_bus_el_2_8) <= +inf
0 <= flow(backpressure_bus_heat_0_0) <= +inf
0 <= flow(backpressure_bus_heat_0_1) <= +inf
0 <= flow(backpressure_bus_heat_0_2) <= +inf
0 <= flow(backpressure_bus_heat_1_3) <= +inf
0 <= flow(backpressure_bus_heat_1_4) <= +inf
0 <= flow(backpressure_bus_heat_1_5) <= +inf
0 <= flow(backpressure_bus_heat_2_6) <= +inf
0 <= flow(backpressure_bus_heat_2_7) <= +inf
0 <= flow(backpressure_bus_heat_2_8) <= +inf
0 <= InvestmentFlowBlock_total(backpressure_bus_el_0) <= +inf
0 <= InvestmentFlowBlock_total(backpressure_bus_el_1) <= +inf
0 <= InvestmentFlowBlock_old(backpressure_bus_el_1) <= +inf
0 <= InvestmentFlowBlock_total(backpressure_bus_el_2) <= +inf
0 <= InvestmentFlowBlock_old(backpressure_bus_el_0) <= +inf
0 <= InvestmentFlowBlock_old(backpressure_bus_el_1) <= +inf
0 <= InvestmentFlowBlock_old(backpressure_bus_el_2) <= +inf
0 <= InvestmentFlowBlock_old_end(backpressure_bus_el_0) <= +inf
0 <= InvestmentFlowBlock_old_end(backpressure_bus_el_1) <= +inf
0 <= InvestmentFlowBlock_old_end(backpressure_bus_el_2) <= +inf
0 <= InvestmentFlowBlock_old_exo(backpressure_bus_el_0) <= +inf
0 <= InvestmentFlowBlock_old_exo(backpressure_bus_el_1) <= +inf
0 <= InvestmentFlowBlock_old_exo(backpressure_bus_el_2) <= +inf
0 <= InvestmentFlowBlock_old(backpressure_bus_el_0) <= +inf
end