Merge pull request #990 from oemof/fix/eliminate_warnings

Fix/eliminate warnings
oemof · Oct 20, 2023 · 29822da · 29822da
2 parents 119e9cb + 5cb5b72
commit 29822da
Show file tree

Hide file tree

Showing 59 changed files with 436 additions and 346 deletions.
diff --git a/docs/usage.rst b/docs/usage.rst
@@ -643,8 +643,8 @@ The following example pictures a Pumped Hydroelectric Energy Storage (PHES). Bot
 
     solph.components.GenericStorage(
         label='PHES',
-        inputs={b_el: solph.flows.Flow(investment= solph.Investment(ep_costs=500))},
-        outputs={b_el: solph.flows.Flow(investment= solph.Investment(ep_costs=500)},
+        inputs={b_el: solph.flows.Flow(nominal_value=solph.Investment(ep_costs=500))},
+        outputs={b_el: solph.flows.Flow(nominal_value=solph.Investment(ep_costs=500)},
         loss_rate=0.001,
         inflow_conversion_factor=0.98, outflow_conversion_factor=0.8),
         investment = solph.Investment(ep_costs=40))
@@ -912,7 +912,7 @@ turbines.
 
     solph.components.Source(label='new_wind_pp', outputs={electricity: solph.flows.Flow(
         fix=wind_power_time_series,
-	investment=solph.Investment(ep_costs=epc, maximum=50000))})
+	nominal_value=solph.Investment(ep_costs=epc, maximum=50000))})
 
 Let's slightly alter the case and consider for already existing wind power
 capacity of 20,000 kW. We're still expecting the total wind power capacity, thus we
@@ -922,7 +922,7 @@ allow for 30,000 kW of new installations and formulate as follows.
 
     solph.components.Source(label='new_wind_pp', outputs={electricity: solph.flows.Flow(
         fix=wind_power_time_series,
-	    investment=solph.Investment(ep_costs=epc,
+	    nominal_value=solph.Investment(ep_costs=epc,
 	                                maximum=30000,
 	                                existing=20000))})
 
@@ -957,7 +957,7 @@ example of a converter:
         label='converter_nonconvex',
         inputs={bus_0: solph.flows.Flow()},
         outputs={bus_1: solph.flows.Flow(
-            investment=solph.Investment(
+            nominal_value=solph.Investment(
                 ep_costs=4,
                 maximum=100,
                 minimum=20,
@@ -1143,7 +1143,7 @@ Here is an example
         inputs={hydrogen_bus: solph.flows.Flow()},
         outputs={
             electricity_bus: solph.flows.Flow(
-                investment=solph.Investment(
+                nominal_value=solph.Investment(
                     maximum=1000,
                     ep_costs=1e6,
                     lifetime=30,
@@ -1177,7 +1177,7 @@ This would mean that for investments in the particular period, these values woul
         inputs={hydrogen_bus: solph.flows.Flow()},
         outputs={
             electricity_bus: solph.flows.Flow(
-                investment=solph.Investment(
+                nominal_value=solph.Investment(
                     maximum=1000,
                     ep_costs=[1e6, 1.1e6],
                     lifetime=30,
@@ -1472,12 +1472,11 @@ This nonlinearity is linearised in the
         inputs={b_diesel: solph.flows.Flow()},
         outputs={
             b_el: solph.flows.Flow(
-                nominal_value=None,
                 variable_costs=0.04,
                 min=0.2,
                 max=1,
                 nonconvex=solph.NonConvex(),
-                investment=solph.Investment(
+                nominal_value=solph.Investment(
                     ep_costs=90,
                     maximum=150, # required for the linearization
                 ),

diff --git a/examples/electrical/lopf.py b/examples/electrical/lopf.py
@@ -151,7 +151,7 @@ def main():
             input=b_el0,
             output=b_el1,
             reactance=0.0001,
-            investment=Investment(ep_costs=10),
+            nominal_value=Investment(ep_costs=10),
             min=-1,
             max=1,
         )

diff --git a/examples/electrical/transshipment.py b/examples/electrical/transshipment.py
@@ -144,8 +144,8 @@ def main():
             label="line_0",
             inputs={b_0: Flow(), b_1: Flow()},
             outputs={
-                b_1: Flow(investment=Investment()),
-                b_0: Flow(investment=Investment()),
+                b_1: Flow(nominal_value=Investment()),
+                b_0: Flow(nominal_value=Investment()),
             },
             conversion_factors={(b_0, b_1): 0.95, (b_1, b_0): 0.9},
         )

diff --git a/examples/generic_invest_limit/example_generic_invest.py b/examples/generic_invest_limit/example_generic_invest.py
@@ -42,7 +42,7 @@
 
     .. literalinclude:: /../examples/generic_invest_limit/example_generic_invest.py
         :language: python
-        :lines: 62-219
+        :lines: 62-
 
 Installation requirements
 -------------------------
@@ -141,8 +141,7 @@ def main():
             inputs={bus_a_0: solph.Flow()},
             outputs={
                 bus_a_1: solph.Flow(
-                    nominal_value=None,
-                    investment=solph.Investment(
+                    nominal_value=solph.Investment(
                         ep_costs=epc_invest,
                         custom_attributes={"space": 2},
                     ),
@@ -159,8 +158,7 @@ def main():
             inputs={bus_b_0: solph.Flow()},
             outputs={
                 bus_b_1: solph.Flow(
-                    nominal_value=None,
-                    investment=solph.Investment(
+                    nominal_value=solph.Investment(
                         ep_costs=epc_invest,
                         custom_attributes={"space": 1},
                     ),

diff --git a/examples/invest_nonconvex_flow_examples/diesel_genset_nonconvex_investment.py b/examples/invest_nonconvex_flow_examples/diesel_genset_nonconvex_investment.py
@@ -132,8 +132,7 @@ def main():
         outputs={
             b_el_dc: solph.flows.Flow(
                 fix=solar_potential / peak_solar_potential,
-                nominal_value=None,
-                investment=solph.Investment(
+                nominal_value=solph.Investment(
                     ep_costs=epc_pv * n_days / n_days_in_year
                 ),
                 variable_costs=0,
@@ -157,11 +156,10 @@ def main():
         inputs={b_diesel: solph.flows.Flow()},
         outputs={
             b_el_ac: solph.flows.Flow(
-                nominal_value=None,
                 variable_costs=variable_cost_diesel_genset,
                 min=min_load,
                 max=max_load,
-                investment=solph.Investment(
+                nominal_value=solph.Investment(
                     ep_costs=epc_diesel_genset * n_days / n_days_in_year,
                     maximum=2 * peak_demand,
                 ),
@@ -177,8 +175,7 @@ def main():
         label="rectifier",
         inputs={
             b_el_ac: solph.flows.Flow(
-                nominal_value=None,
-                investment=solph.Investment(
+                nominal_value=solph.Investment(
                     ep_costs=epc_rectifier * n_days / n_days_in_year
                 ),
                 variable_costs=0,
@@ -196,8 +193,7 @@ def main():
         label="inverter",
         inputs={
             b_el_dc: solph.flows.Flow(
-                nominal_value=None,
-                investment=solph.Investment(
+                nominal_value=solph.Investment(
                     ep_costs=epc_inverter * n_days / n_days_in_year
                 ),
                 variable_costs=0,
@@ -213,13 +209,14 @@ def main():
     epc_battery = 101.00  # currency/kWh/year
     battery = solph.components.GenericStorage(
         label="battery",
-        nominal_storage_capacity=None,
-        investment=solph.Investment(
+        nominal_storage_capacity=solph.Investment(
             ep_costs=epc_battery * n_days / n_days_in_year
         ),
         inputs={b_el_dc: solph.flows.Flow(variable_costs=0)},
         outputs={
-            b_el_dc: solph.flows.Flow(investment=solph.Investment(ep_costs=0))
+            b_el_dc: solph.flows.Flow(
+                nominal_value=solph.Investment(ep_costs=0)
+            )
         },
         initial_storage_level=0.0,
         min_storage_level=0.0,

diff --git a/examples/invest_nonconvex_flow_examples/house_with_nonconvex_investment.py b/examples/invest_nonconvex_flow_examples/house_with_nonconvex_investment.py
@@ -91,7 +91,7 @@ def heat_demand(d):
                     minimum_uptime=5,
                     initial_status=1,
                 ),
-                investment=solph.Investment(
+                nominal_value=solph.Investment(
                     ep_costs=epc,
                     minimum=1.0,
                     maximum=10.0,

diff --git a/examples/invest_nonconvex_flow_examples/house_without_nonconvex_investment.py b/examples/invest_nonconvex_flow_examples/house_without_nonconvex_investment.py
@@ -117,7 +117,7 @@ def solar_thermal(d):
         outputs={
             b_heat: solph.flows.Flow(
                 fix=[solar_thermal(day) for day in range(0, periods)],
-                investment=solph.Investment(
+                nominal_value=solph.Investment(
                     ep_costs=epc, minimum=1.0, maximum=5.0
                 ),
             )

diff --git a/examples/investment_with_minimal_invest/minimal_invest.py b/examples/investment_with_minimal_invest/minimal_invest.py
@@ -86,8 +86,7 @@ def main():
         inputs={bus_0: solph.Flow()},
         outputs={
             bus_1: solph.Flow(
-                nominal_value=None,
-                investment=solph.Investment(
+                nominal_value=solph.Investment(
                     ep_costs=c_var,
                     maximum=p_install_max,
                     minimum=p_install_min,

diff --git a/examples/offset_converter_example/offset_diesel_genset_nonconvex_investment.py b/examples/offset_converter_example/offset_diesel_genset_nonconvex_investment.py
@@ -127,8 +127,7 @@ def offset_converter_example():
         outputs={
             b_el_dc: solph.flows.Flow(
                 fix=solar_potential / peak_solar_potential,
-                nominal_value=None,
-                investment=solph.Investment(
+                nominal_value=solph.Investment(
                     ep_costs=epc_pv * n_days / n_days_in_year
                 ),
                 variable_costs=0,
@@ -168,11 +167,10 @@ def offset_converter_example():
         inputs={b_diesel: solph.flows.Flow()},
         outputs={
             b_el_ac: solph.flows.Flow(
-                nominal_value=None,
                 variable_costs=variable_cost_diesel_genset,
                 min=min_load,
                 max=max_load,
-                investment=solph.Investment(
+                nominal_value=solph.Investment(
                     ep_costs=epc_diesel_genset * n_days / n_days_in_year,
                     maximum=2 * peak_demand,
                 ),
@@ -188,8 +186,7 @@ def offset_converter_example():
         label="rectifier",
         inputs={
             b_el_ac: solph.flows.Flow(
-                nominal_value=None,
-                investment=solph.Investment(
+                nominal_value=solph.Investment(
                     ep_costs=epc_rectifier * n_days / n_days_in_year
                 ),
                 variable_costs=0,
@@ -207,8 +204,7 @@ def offset_converter_example():
         label="inverter",
         inputs={
             b_el_dc: solph.flows.Flow(
-                nominal_value=None,
-                investment=solph.Investment(
+                nominal_value=solph.Investment(
                     ep_costs=epc_inverter * n_days / n_days_in_year
                 ),
                 variable_costs=0,
@@ -224,13 +220,14 @@ def offset_converter_example():
     epc_battery = 101.00  # currency/kWh/year
     battery = solph.components.GenericStorage(
         label="battery",
-        nominal_storage_capacity=None,
-        investment=solph.Investment(
+        nominal_storage_capacity=solph.Investment(
             ep_costs=epc_battery * n_days / n_days_in_year
         ),
         inputs={b_el_dc: solph.flows.Flow(variable_costs=0)},
         outputs={
-            b_el_dc: solph.flows.Flow(investment=solph.Investment(ep_costs=0))
+            b_el_dc: solph.flows.Flow(
+                nominal_value=solph.Investment(ep_costs=0)
+            )
         },
         initial_storage_level=0.0,
         min_storage_level=0.0,

diff --git a/examples/storage_investment/v1_invest_optimize_all_technologies.py b/examples/storage_investment/v1_invest_optimize_all_technologies.py
@@ -151,7 +151,7 @@ def main():
         outputs={
             bel: solph.Flow(
                 fix=data["wind"],
-                investment=solph.Investment(ep_costs=epc_wind),
+                nominal_value=solph.Investment(ep_costs=epc_wind),
             )
         },
     )
@@ -161,7 +161,7 @@ def main():
         label="pv",
         outputs={
             bel: solph.Flow(
-                fix=data["pv"], investment=solph.Investment(ep_costs=epc_pv)
+                fix=data["pv"], nominal_value=solph.Investment(ep_costs=epc_pv)
             )
         },
     )
@@ -191,7 +191,7 @@ def main():
         invest_relation_output_capacity=1 / 6,
         inflow_conversion_factor=1,
         outflow_conversion_factor=0.8,
-        investment=solph.Investment(ep_costs=epc_storage),
+        nominal_value=solph.Investment(ep_costs=epc_storage),
     )
 
     energysystem.add(excess, gas_resource, wind, pv, demand, pp_gas, storage)

diff --git a/examples/storage_investment/v2_invest_optimize_only_gas_and_storage.py b/examples/storage_investment/v2_invest_optimize_only_gas_and_storage.py
@@ -184,7 +184,7 @@ def main():
         invest_relation_output_capacity=1 / 6,
         inflow_conversion_factor=1,
         outflow_conversion_factor=0.8,
-        investment=solph.Investment(ep_costs=epc_storage),
+        nominal_value=solph.Investment(ep_costs=epc_storage),
     )
 
     energysystem.add(excess, gas_resource, wind, pv, demand, pp_gas, storage)

diff --git a/examples/storage_investment/v3_invest_optimize_only_storage_with_fossil_share.py b/examples/storage_investment/v3_invest_optimize_only_storage_with_fossil_share.py
@@ -194,7 +194,7 @@ def main():
         invest_relation_output_capacity=1 / 6,
         inflow_conversion_factor=1,
         outflow_conversion_factor=0.8,
-        investment=solph.Investment(ep_costs=epc_storage),
+        nominal_value=solph.Investment(ep_costs=epc_storage),
     )
 
     energysystem.add(excess, gas_resource, wind, pv, demand, pp_gas, storage)

diff --git a/examples/storage_investment/v4_invest_optimize_all_technologies_with_fossil_share.py b/examples/storage_investment/v4_invest_optimize_all_technologies_with_fossil_share.py
@@ -162,7 +162,7 @@ def main():
         outputs={
             bel: solph.Flow(
                 fix=data["wind"],
-                investment=solph.Investment(ep_costs=epc_wind),
+                nominal_value=solph.Investment(ep_costs=epc_wind),
             )
         },
     )
@@ -172,7 +172,7 @@ def main():
         label="pv",
         outputs={
             bel: solph.Flow(
-                fix=data["pv"], investment=solph.Investment(ep_costs=epc_pv)
+                fix=data["pv"], nominal_value=solph.Investment(ep_costs=epc_pv)
             )
         },
     )

diff --git a/src/oemof/solph/_energy_system.py b/src/oemof/solph/_energy_system.py
@@ -138,10 +138,9 @@ def __init__(
             else:
                 msg = (
                     "Ensure that your timeindex and timeincrement are "
-                    "consistent.\nIf you are not considering non-equidistant "
-                    "timeindices, consider only specifying a timeindex."
+                    "consistent."
                 )
-                warnings.warn(msg, debugging.SuspiciousUsageWarning)
+                warnings.warn(msg, debugging.ExperimentalFeatureWarning)
 
         elif timeindex is not None and timeincrement is None:
             df = pd.DataFrame(timeindex)
@@ -156,7 +155,7 @@ def __init__(
         if timeincrement is not None and (pd.Series(timeincrement) <= 0).any():
             msg = (
                 "The time increment is inconsistent. Negative values and zero "
-                "is not allowed.\nThis is caused by a inconsistent "
+                "are not allowed.\nThis is caused by a inconsistent "
                 "timeincrement parameter or an incorrect timeindex."
             )
             raise TypeError(msg)
@@ -176,7 +175,7 @@ def __init__(
                 "now. If you find anything suspicious or any bugs, "
                 "please report them."
             )
-            warnings.warn(msg, debugging.SuspiciousUsageWarning)
+            warnings.warn(msg, debugging.ExperimentalFeatureWarning)
             self._extract_periods_years()
             self._extract_periods_matrix()
             self._extract_end_year_of_optimization()

diff --git a/src/oemof/solph/buses/_bus.py b/src/oemof/solph/buses/_bus.py
@@ -15,13 +15,13 @@
 
 """
 
-from oemof.network import network as on
+from oemof.network import Node
 from pyomo.core import BuildAction
 from pyomo.core import Constraint
 from pyomo.core.base.block import ScalarBlock
 
 
-class Bus(on.Bus):
+class Bus(Node):
     """A balance object. Every component has to be connected to buses.
 
     The sum of all inputs of a Bus object must equal the sum of all outputs

diff --git a/src/oemof/solph/components/_converter.py b/src/oemof/solph/components/_converter.py
@@ -23,7 +23,7 @@
 
 from warnings import warn
 
-from oemof.network import network as on
+from oemof.network import Node
 from pyomo.core import BuildAction
 from pyomo.core import Constraint
 from pyomo.core.base.block import ScalarBlock
@@ -32,7 +32,7 @@
 from oemof.solph._plumbing import sequence
 
 
-class Converter(on.Transformer):
+class Converter(Node):
     """A linear ConverterBlock object with n inputs and n outputs.
 
     Node object that relates any number of inflow and outflows with