Merge pull request #123 from oemof/features/update_to_solph_v0.5.1

Update to solph v0.5.1

setup.py

@@ -67,8 +67,7 @@ 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.1",
-        "oemof.solph @ git+https://github.com/oemof/oemof-solph.git@dev",
+        "oemof.solph==0.5.1rc1",
         "pandas>=0.22",
         "paramiko",
         "toml",

src/oemof/tabular/facades.py

@@ -32,11 +32,11 @@
 from oemof.solph.buses import Bus
 from oemof.solph.buses.experimental import ElectricalBus
 from oemof.solph.components import (
+    Converter,
     ExtractionTurbineCHP,
     GenericStorage,
     Sink,
     Source,
-    Transformer,
 )
 from oemof.solph.components.experimental import Link
 from oemof.solph.flows import Flow
@@ -770,7 +770,7 @@ def build_solph_components(self):
 
 
 @dataclass_facade
-class BackpressureTurbine(Transformer, Facade):
+class BackpressureTurbine(Converter, Facade):
     r""" Combined Heat and Power (backpressure) unit with one input and
     two outputs.
 
@@ -908,7 +908,7 @@ def build_solph_components(self):
 
 
 @dataclass_facade
-class Conversion(Transformer, Facade):
+class Conversion(Converter, Facade):
     r"""Conversion unit with one input and one output.
 
     Parameters
@@ -1033,7 +1033,7 @@ def build_solph_components(self):
 
 
 @dataclass_facade
-class HeatPump(Transformer, Facade):
+class HeatPump(Converter, Facade):
     r"""HeatPump unit with two inputs and one output.
 
     Parameters

src/oemof/tabular/facades/backpressure_turbine.py

@@ -3,14 +3,14 @@
 
 from oemof.solph._plumbing import sequence
 from oemof.solph.buses import Bus
-from oemof.solph.components import Transformer
+from oemof.solph.components import Converter
 from oemof.solph.flows import Flow
 
 from oemof.tabular._facade import Facade, dataclass_facade
 
 
 @dataclass_facade
-class BackpressureTurbine(Transformer, Facade):
+class BackpressureTurbine(Converter, Facade):
     r""" Combined Heat and Power (backpressure) unit with one input and
     two outputs.
 

src/oemof/tabular/facades/conversion.py

@@ -2,14 +2,14 @@
 
 from oemof.solph._plumbing import sequence
 from oemof.solph.buses import Bus
-from oemof.solph.components import Transformer
+from oemof.solph.components import Converter
 from oemof.solph.flows import Flow
 
 from oemof.tabular._facade import Facade, dataclass_facade
 
 
 @dataclass_facade
-class Conversion(Transformer, Facade):
+class Conversion(Converter, Facade):
     r"""Conversion unit with one input and one output.
 
     Parameters

src/oemof/tabular/facades/heatpump.py

@@ -3,14 +3,14 @@
 
 from oemof.solph._plumbing import sequence
 from oemof.solph.buses import Bus
-from oemof.solph.components import Transformer
+from oemof.solph.components import Converter
 from oemof.solph.flows import Flow
 
 from oemof.tabular._facade import Facade, dataclass_facade
 
 
 @dataclass_facade
-class HeatPump(Transformer, Facade):
+class HeatPump(Converter, Facade):
     r"""HeatPump unit with two inputs and one output.
 
     Parameters

tests/_files/lp_files/backpressure_investment_brown_field.lp

@@ -1,6 +1,6 @@
 \* Source Pyomo model name=Model *\
 
-min 
+min
 objective:
 +50 InvestmentFlowBlock_invest(backpressure_electricity_0)
 +0.6 flow(fuel_backpressure_0_0)
@@ -45,32 +45,32 @@ c_e_BusBlock_balance(electricity_0_2)_:
 +1 flow(backpressure_electricity_0_2)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_electricity_0_0)_:
+c_e_ConverterBlock_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_heat_0_0)_:
+c_e_ConverterBlock_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_0_1)_:
+c_e_ConverterBlock_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)_:
+c_e_ConverterBlock_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_electricity_0_2)_:
+c_e_ConverterBlock_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_0_2)_:
+c_e_ConverterBlock_relation(backpressure_fuel_heat_0_2)_:
 +0.35 flow(fuel_backpressure_0_2)
 -1 flow(backpressure_heat_0_2)
 = 0

tests/_files/lp_files/backpressure_investment_green_field.lp

@@ -1,6 +1,6 @@
 \* Source Pyomo model name=Model *\
 
-min 
+min
 objective:
 +50 InvestmentFlowBlock_invest(backpressure_electricity_0)
 +0.6 flow(fuel_backpressure_0_0)
@@ -45,32 +45,32 @@ c_e_BusBlock_balance(electricity_0_2)_:
 +1 flow(backpressure_electricity_0_2)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_electricity_0_0)_:
+c_e_ConverterBlock_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_heat_0_0)_:
+c_e_ConverterBlock_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_0_1)_:
+c_e_ConverterBlock_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)_:
+c_e_ConverterBlock_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_electricity_0_2)_:
+c_e_ConverterBlock_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_0_2)_:
+c_e_ConverterBlock_relation(backpressure_fuel_heat_0_2)_:
 +0.35 flow(fuel_backpressure_0_2)
 -1 flow(backpressure_heat_0_2)
 = 0

tests/_files/lp_files/conversion.lp

@@ -1,6 +1,6 @@
 \* Source Pyomo model name=Model *\
 
-min 
+min
 objective:
 +0 ONE_VAR_CONSTANT
 
@@ -30,17 +30,17 @@ c_e_BusBlock_balance(biomass_0_2)_:
 +1 flow(biomass_biomass_plant_0_2)
 = 0
 
-c_e_TransformerBlock_relation(biomass_plant_biomass_heat_0_0)_:
+c_e_ConverterBlock_relation(biomass_plant_biomass_heat_0_0)_:
 -1 flow(biomass_plant_heat_0_0)
 +0.4 flow(biomass_biomass_plant_0_0)
 = 0
 
-c_e_TransformerBlock_relation(biomass_plant_biomass_heat_0_1)_:
+c_e_ConverterBlock_relation(biomass_plant_biomass_heat_0_1)_:
 -1 flow(biomass_plant_heat_0_1)
 +0.4 flow(biomass_biomass_plant_0_1)
 = 0
 
-c_e_TransformerBlock_relation(biomass_plant_biomass_heat_0_2)_:
+c_e_ConverterBlock_relation(biomass_plant_biomass_heat_0_2)_:
 -1 flow(biomass_plant_heat_0_2)
 +0.4 flow(biomass_biomass_plant_0_2)
 = 0

tests/_files/lp_files/multi-period/backpressure_investment_brown_field_multi_period.lp

@@ -1,6 +1,6 @@
 \* Source Pyomo model name=Model *\
 
-min 
+min
 objective:
 +393187.4631175658 ONE_VAR_CONSTANT
 +561.5105784699618 InvestmentFlowBlock_invest(backpressure_electricity_0)
@@ -126,92 +126,92 @@ c_e_BusBlock_balance(electricity_2_8)_:
 +1 flow(backpressure_electricity_2_8)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_electricity_0_0)_:
+c_e_ConverterBlock_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_heat_0_0)_:
+c_e_ConverterBlock_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_0_1)_:
+c_e_ConverterBlock_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)_:
+c_e_ConverterBlock_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_electricity_0_2)_:
+c_e_ConverterBlock_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_0_2)_:
+c_e_ConverterBlock_relation(backpressure_fuel_heat_0_2)_:
 +0.35 flow(fuel_backpressure_0_2)
 -1 flow(backpressure_heat_0_2)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_electricity_1_3)_:
+c_e_ConverterBlock_relation(backpressure_fuel_electricity_1_3)_:
 +0.4 flow(fuel_backpressure_1_3)
 -1 flow(backpressure_electricity_1_3)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_heat_1_3)_:
+c_e_ConverterBlock_relation(backpressure_fuel_heat_1_3)_:
 +0.35 flow(fuel_backpressure_1_3)
 -1 flow(backpressure_heat_1_3)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_electricity_1_4)_:
+c_e_ConverterBlock_relation(backpressure_fuel_electricity_1_4)_:
 +0.4 flow(fuel_backpressure_1_4)
 -1 flow(backpressure_electricity_1_4)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_heat_1_4)_:
+c_e_ConverterBlock_relation(backpressure_fuel_heat_1_4)_:
 +0.35 flow(fuel_backpressure_1_4)
 -1 flow(backpressure_heat_1_4)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_electricity_1_5)_:
+c_e_ConverterBlock_relation(backpressure_fuel_electricity_1_5)_:
 +0.4 flow(fuel_backpressure_1_5)
 -1 flow(backpressure_electricity_1_5)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_heat_1_5)_:
+c_e_ConverterBlock_relation(backpressure_fuel_heat_1_5)_:
 +0.35 flow(fuel_backpressure_1_5)
 -1 flow(backpressure_heat_1_5)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_electricity_2_6)_:
+c_e_ConverterBlock_relation(backpressure_fuel_electricity_2_6)_:
 +0.4 flow(fuel_backpressure_2_6)
 -1 flow(backpressure_electricity_2_6)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_heat_2_6)_:
+c_e_ConverterBlock_relation(backpressure_fuel_heat_2_6)_:
 +0.35 flow(fuel_backpressure_2_6)
 -1 flow(backpressure_heat_2_6)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_electricity_2_7)_:
+c_e_ConverterBlock_relation(backpressure_fuel_electricity_2_7)_:
 +0.4 flow(fuel_backpressure_2_7)
 -1 flow(backpressure_electricity_2_7)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_heat_2_7)_:
+c_e_ConverterBlock_relation(backpressure_fuel_heat_2_7)_:
 +0.35 flow(fuel_backpressure_2_7)
 -1 flow(backpressure_heat_2_7)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_electricity_2_8)_:
+c_e_ConverterBlock_relation(backpressure_fuel_electricity_2_8)_:
 +0.4 flow(fuel_backpressure_2_8)
 -1 flow(backpressure_electricity_2_8)
 = 0
 
-c_e_TransformerBlock_relation(backpressure_fuel_heat_2_8)_:
+c_e_ConverterBlock_relation(backpressure_fuel_heat_2_8)_:
 +0.35 flow(fuel_backpressure_2_8)
 -1 flow(backpressure_heat_2_8)
 = 0