Merge pull request #107 from oemof/features/make-solph-0.5.1-work

Make solph 0.5.1 work

setup.py

@@ -67,7 +67,8 @@ def read(*names, **kwargs):
     install_requires=[
         "datapackage==1.5.1",
         "tableschema==1.7.4",  # newer versions (v1.8.0 and up) fail!
-        "oemof.solph==0.5.0",
+        # "oemof.solph==0.5.1",
+        "oemof.solph @ git+https://github.com/oemof/oemof-solph.git@v0.5.1.dev2",
         "pandas>=0.22",
         "paramiko",
         "toml",

src/oemof/tabular/_facade.py

@@ -27,8 +27,7 @@
 from oemof.network.energy_system import EnergySystem
 from oemof.network.network import Node
 from oemof.solph import Investment
-from oemof.solph.components import GenericStorage
-from oemof.solph.components.experimental import Link
+from oemof.solph.components import GenericStorage, Link
 from oemof.tools.debugging import SuspiciousUsageWarning
 
 # Switch off SuspiciousUsageWarning

src/oemof/tabular/facades/link.py

@@ -1,6 +1,6 @@
 from oemof.solph._plumbing import sequence
 from oemof.solph.buses import Bus
-from oemof.solph.components.experimental import Link
+from oemof.solph.components import Link
 from oemof.solph.flows import Flow
 
 from oemof.tabular._facade import Facade, dataclass_facade

tests/_files/lp_files/backpressure_investment_brown_field.lp

@@ -1,104 +1,110 @@
 \* Source Pyomo model name=Model *\
 
-min
+min 
 objective:
-+50 InvestmentFlowBlock_invest(backpressure_electricity)
-+0.6 flow(fuel_backpressure_0)
-+0.6 flow(fuel_backpressure_1)
-+0.6 flow(fuel_backpressure_2)
++50 InvestmentFlowBlock_invest(backpressure_electricity_0)
++0.6 flow(fuel_backpressure_0_0)
++0.6 flow(fuel_backpressure_0_1)
++0.6 flow(fuel_backpressure_0_2)
 
 s.t.
 
-c_e_BusBlock_balance(electricity_0)_:
-+1 flow(backpressure_electricity_0)
+c_e_BusBlock_balance(heat_0_0)_:
++1 flow(backpressure_heat_0_0)
 = 0
 
-c_e_BusBlock_balance(electricity_1)_:
-+1 flow(backpressure_electricity_1)
+c_e_BusBlock_balance(heat_0_1)_:
++1 flow(backpressure_heat_0_1)
 = 0
 
-c_e_BusBlock_balance(electricity_2)_:
-+1 flow(backpressure_electricity_2)
+c_e_BusBlock_balance(heat_0_2)_:
++1 flow(backpressure_heat_0_2)
 = 0
 
-c_e_BusBlock_balance(fuel_0)_:
-+1 flow(fuel_backpressure_0)
+c_e_BusBlock_balance(fuel_0_0)_:
++1 flow(fuel_backpressure_0_0)
 = 0
 
-c_e_BusBlock_balance(fuel_1)_:
-+1 flow(fuel_backpressure_1)
+c_e_BusBlock_balance(fuel_0_1)_:
++1 flow(fuel_backpressure_0_1)
 = 0
 
-c_e_BusBlock_balance(fuel_2)_:
-+1 flow(fuel_backpressure_2)
+c_e_BusBlock_balance(fuel_0_2)_:
++1 flow(fuel_backpressure_0_2)
 = 0
 
-c_e_BusBlock_balance(heat_0)_:
-+1 flow(backpressure_heat_0)
+c_e_BusBlock_balance(electricity_0_0)_:
++1 flow(backpressure_electricity_0_0)
 = 0
 
-c_e_BusBlock_balance(heat_1)_:
-+1 flow(backpressure_heat_1)
+c_e_BusBlock_balance(electricity_0_1)_:
++1 flow(backpressure_electricity_0_1)
 = 0
 
-c_e_BusBlock_balance(heat_2)_:
-+1 flow(backpressure_heat_2)
+c_e_BusBlock_balance(electricity_0_2)_:
++1 flow(backpressure_electricity_0_2)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_electricity_0)_:
--1 flow(backpressure_electricity_0)
-+0.4 flow(fuel_backpressure_0)
+c_e_TransformerBlock_relation(backpressure_fuel_electricity_0_0)_:
++0.4 flow(fuel_backpressure_0_0)
+-1 flow(backpressure_electricity_0_0)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_electricity_1)_:
--1 flow(backpressure_electricity_1)
-+0.4 flow(fuel_backpressure_1)
+c_e_TransformerBlock_relation(backpressure_fuel_heat_0_0)_:
++0.35 flow(fuel_backpressure_0_0)
+-1 flow(backpressure_heat_0_0)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_electricity_2)_:
--1 flow(backpressure_electricity_2)
-+0.4 flow(fuel_backpressure_2)
+c_e_TransformerBlock_relation(backpressure_fuel_electricity_0_1)_:
++0.4 flow(fuel_backpressure_0_1)
+-1 flow(backpressure_electricity_0_1)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_heat_0)_:
--1 flow(backpressure_heat_0)
-+0.35 flow(fuel_backpressure_0)
+c_e_TransformerBlock_relation(backpressure_fuel_heat_0_1)_:
++0.35 flow(fuel_backpressure_0_1)
+-1 flow(backpressure_heat_0_1)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_heat_1)_:
--1 flow(backpressure_heat_1)
-+0.35 flow(fuel_backpressure_1)
+c_e_TransformerBlock_relation(backpressure_fuel_electricity_0_2)_:
++0.4 flow(fuel_backpressure_0_2)
+-1 flow(backpressure_electricity_0_2)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_heat_2)_:
--1 flow(backpressure_heat_2)
-+0.35 flow(fuel_backpressure_2)
+c_e_TransformerBlock_relation(backpressure_fuel_heat_0_2)_:
++0.35 flow(fuel_backpressure_0_2)
+-1 flow(backpressure_heat_0_2)
 = 0
 
-c_u_InvestmentFlowBlock_max(backpressure_electricity_0)_:
--1 InvestmentFlowBlock_invest(backpressure_electricity)
-+1 flow(backpressure_electricity_0)
-<= 1000
+c_e_InvestmentFlowBlock_total_rule(backpressure_electricity_0)_:
+-1 InvestmentFlowBlock_invest(backpressure_electricity_0)
++1 InvestmentFlowBlock_total(backpressure_electricity_0)
+= 1000
 
-c_u_InvestmentFlowBlock_max(backpressure_electricity_1)_:
--1 InvestmentFlowBlock_invest(backpressure_electricity)
-+1 flow(backpressure_electricity_1)
-<= 1000
+c_u_InvestmentFlowBlock_max(backpressure_electricity_0_0)_:
++1 flow(backpressure_electricity_0_0)
+-1 InvestmentFlowBlock_total(backpressure_electricity_0)
+<= 0
 
-c_u_InvestmentFlowBlock_max(backpressure_electricity_2)_:
--1 InvestmentFlowBlock_invest(backpressure_electricity)
-+1 flow(backpressure_electricity_2)
-<= 1000
+c_u_InvestmentFlowBlock_max(backpressure_electricity_0_1)_:
++1 flow(backpressure_electricity_0_1)
+-1 InvestmentFlowBlock_total(backpressure_electricity_0)
+<= 0
+
+c_u_InvestmentFlowBlock_max(backpressure_electricity_0_2)_:
++1 flow(backpressure_electricity_0_2)
+-1 InvestmentFlowBlock_total(backpressure_electricity_0)
+<= 0
 
 bounds
-   0 <= flow(backpressure_electricity_0) <= +inf
-   0 <= flow(backpressure_electricity_1) <= +inf
-   0 <= flow(backpressure_electricity_2) <= +inf
-   0 <= flow(backpressure_heat_0) <= +inf
-   0 <= flow(backpressure_heat_1) <= +inf
-   0 <= flow(backpressure_heat_2) <= +inf
-   0 <= flow(fuel_backpressure_0) <= +inf
-   0 <= flow(fuel_backpressure_1) <= +inf
-   0 <= flow(fuel_backpressure_2) <= +inf
-   0 <= InvestmentFlowBlock_invest(backpressure_electricity) <= +inf
+   0 <= InvestmentFlowBlock_invest(backpressure_electricity_0) <= +inf
+   0 <= InvestmentFlowBlock_total(backpressure_electricity_0) <= +inf
+   0 <= flow(fuel_backpressure_0_0) <= +inf
+   0 <= flow(fuel_backpressure_0_1) <= +inf
+   0 <= flow(fuel_backpressure_0_2) <= +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_electricity_0_0) <= +inf
+   0 <= flow(backpressure_electricity_0_1) <= +inf
+   0 <= flow(backpressure_electricity_0_2) <= +inf
 end

tests/_files/lp_files/backpressure_investment_green_field.lp

@@ -1,104 +1,110 @@
 \* Source Pyomo model name=Model *\
 
-min
+min 
 objective:
-+50 InvestmentFlowBlock_invest(backpressure_electricity)
-+0.6 flow(fuel_backpressure_0)
-+0.6 flow(fuel_backpressure_1)
-+0.6 flow(fuel_backpressure_2)
++50 InvestmentFlowBlock_invest(backpressure_electricity_0)
++0.6 flow(fuel_backpressure_0_0)
++0.6 flow(fuel_backpressure_0_1)
++0.6 flow(fuel_backpressure_0_2)
 
 s.t.
 
-c_e_BusBlock_balance(electricity_0)_:
-+1 flow(backpressure_electricity_0)
+c_e_BusBlock_balance(heat_0_0)_:
++1 flow(backpressure_heat_0_0)
 = 0
 
-c_e_BusBlock_balance(electricity_1)_:
-+1 flow(backpressure_electricity_1)
+c_e_BusBlock_balance(heat_0_1)_:
++1 flow(backpressure_heat_0_1)
 = 0
 
-c_e_BusBlock_balance(electricity_2)_:
-+1 flow(backpressure_electricity_2)
+c_e_BusBlock_balance(heat_0_2)_:
++1 flow(backpressure_heat_0_2)
 = 0
 
-c_e_BusBlock_balance(fuel_0)_:
-+1 flow(fuel_backpressure_0)
+c_e_BusBlock_balance(fuel_0_0)_:
++1 flow(fuel_backpressure_0_0)
 = 0
 
-c_e_BusBlock_balance(fuel_1)_:
-+1 flow(fuel_backpressure_1)
+c_e_BusBlock_balance(fuel_0_1)_:
++1 flow(fuel_backpressure_0_1)
 = 0
 
-c_e_BusBlock_balance(fuel_2)_:
-+1 flow(fuel_backpressure_2)
+c_e_BusBlock_balance(fuel_0_2)_:
++1 flow(fuel_backpressure_0_2)
 = 0
 
-c_e_BusBlock_balance(heat_0)_:
-+1 flow(backpressure_heat_0)
+c_e_BusBlock_balance(electricity_0_0)_:
++1 flow(backpressure_electricity_0_0)
 = 0
 
-c_e_BusBlock_balance(heat_1)_:
-+1 flow(backpressure_heat_1)
+c_e_BusBlock_balance(electricity_0_1)_:
++1 flow(backpressure_electricity_0_1)
 = 0
 
-c_e_BusBlock_balance(heat_2)_:
-+1 flow(backpressure_heat_2)
+c_e_BusBlock_balance(electricity_0_2)_:
++1 flow(backpressure_electricity_0_2)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_electricity_0)_:
--1 flow(backpressure_electricity_0)
-+0.4 flow(fuel_backpressure_0)
+c_e_TransformerBlock_relation(backpressure_fuel_electricity_0_0)_:
++0.4 flow(fuel_backpressure_0_0)
+-1 flow(backpressure_electricity_0_0)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_electricity_1)_:
--1 flow(backpressure_electricity_1)
-+0.4 flow(fuel_backpressure_1)
+c_e_TransformerBlock_relation(backpressure_fuel_heat_0_0)_:
++0.35 flow(fuel_backpressure_0_0)
+-1 flow(backpressure_heat_0_0)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_electricity_2)_:
--1 flow(backpressure_electricity_2)
-+0.4 flow(fuel_backpressure_2)
+c_e_TransformerBlock_relation(backpressure_fuel_electricity_0_1)_:
++0.4 flow(fuel_backpressure_0_1)
+-1 flow(backpressure_electricity_0_1)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_heat_0)_:
--1 flow(backpressure_heat_0)
-+0.35 flow(fuel_backpressure_0)
+c_e_TransformerBlock_relation(backpressure_fuel_heat_0_1)_:
++0.35 flow(fuel_backpressure_0_1)
+-1 flow(backpressure_heat_0_1)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_heat_1)_:
--1 flow(backpressure_heat_1)
-+0.35 flow(fuel_backpressure_1)
+c_e_TransformerBlock_relation(backpressure_fuel_electricity_0_2)_:
++0.4 flow(fuel_backpressure_0_2)
+-1 flow(backpressure_electricity_0_2)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_heat_2)_:
--1 flow(backpressure_heat_2)
-+0.35 flow(fuel_backpressure_2)
+c_e_TransformerBlock_relation(backpressure_fuel_heat_0_2)_:
++0.35 flow(fuel_backpressure_0_2)
+-1 flow(backpressure_heat_0_2)
 = 0
 
-c_u_InvestmentFlowBlock_max(backpressure_electricity_0)_:
--1 InvestmentFlowBlock_invest(backpressure_electricity)
-+1 flow(backpressure_electricity_0)
+c_e_InvestmentFlowBlock_total_rule(backpressure_electricity_0)_:
+-1 InvestmentFlowBlock_invest(backpressure_electricity_0)
++1 InvestmentFlowBlock_total(backpressure_electricity_0)
+= 0
+
+c_u_InvestmentFlowBlock_max(backpressure_electricity_0_0)_:
++1 flow(backpressure_electricity_0_0)
+-1 InvestmentFlowBlock_total(backpressure_electricity_0)
 <= 0
 
-c_u_InvestmentFlowBlock_max(backpressure_electricity_1)_:
--1 InvestmentFlowBlock_invest(backpressure_electricity)
-+1 flow(backpressure_electricity_1)
+c_u_InvestmentFlowBlock_max(backpressure_electricity_0_1)_:
++1 flow(backpressure_electricity_0_1)
+-1 InvestmentFlowBlock_total(backpressure_electricity_0)
 <= 0
 
-c_u_InvestmentFlowBlock_max(backpressure_electricity_2)_:
--1 InvestmentFlowBlock_invest(backpressure_electricity)
-+1 flow(backpressure_electricity_2)
+c_u_InvestmentFlowBlock_max(backpressure_electricity_0_2)_:
++1 flow(backpressure_electricity_0_2)
+-1 InvestmentFlowBlock_total(backpressure_electricity_0)
 <= 0
 
 bounds
-   0 <= flow(backpressure_electricity_0) <= +inf
-   0 <= flow(backpressure_electricity_1) <= +inf
-   0 <= flow(backpressure_electricity_2) <= +inf
-   0 <= flow(backpressure_heat_0) <= +inf
-   0 <= flow(backpressure_heat_1) <= +inf
-   0 <= flow(backpressure_heat_2) <= +inf
-   0 <= flow(fuel_backpressure_0) <= +inf
-   0 <= flow(fuel_backpressure_1) <= +inf
-   0 <= flow(fuel_backpressure_2) <= +inf
-   0 <= InvestmentFlowBlock_invest(backpressure_electricity) <= +inf
+   0 <= InvestmentFlowBlock_invest(backpressure_electricity_0) <= +inf
+   0 <= InvestmentFlowBlock_total(backpressure_electricity_0) <= +inf
+   0 <= flow(fuel_backpressure_0_0) <= +inf
+   0 <= flow(fuel_backpressure_0_1) <= +inf
+   0 <= flow(fuel_backpressure_0_2) <= +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_electricity_0_0) <= +inf
+   0 <= flow(backpressure_electricity_0_1) <= +inf
+   0 <= flow(backpressure_electricity_0_2) <= +inf
 end