Fix legacy FlowSystemLong

Author: FBumann

tests/conftest.py

@@ -511,51 +511,42 @@ def flow_system_long():
     p_el = data['Strompr.€/MWh'].values
     gas_price = data['Gaspr.€/MWh'].values
 
-    flow_system = fx.FlowSystem(pd.DatetimeIndex(data.index))
-
-    # Create special time series data for this system
     thermal_load_ts, electrical_load_ts = (
-        fx.TimeSeriesData(thermal_load, coords={'time': flow_system.timesteps}),
-        fx.TimeSeriesData(electrical_load, aggregation_weight=0.7, coords={'time': flow_system.timesteps}),
+        fx.TimeSeriesData(thermal_load),
+        fx.TimeSeriesData(electrical_load, aggregation_weight=0.7),
     )
     p_feed_in, p_sell = (
-        fx.TimeSeriesData(-(p_el - 0.5), aggregation_group='p_el', coords={'time': flow_system.timesteps}),
-        fx.TimeSeriesData(p_el + 0.5, aggregation_group='p_el', coords={'time': flow_system.timesteps}),
+        fx.TimeSeriesData(-(p_el - 0.5), aggregation_group='p_el'),
+        fx.TimeSeriesData(p_el + 0.5, aggregation_group='p_el'),
     )
 
-    # Add buses and effects using library
-    flow_system.add_elements(*Buses.defaults(), Buses.coal())
-
-    flow_system.add_elements(Effects.costs(), Effects.co2(), Effects.primary_energy())
-
-    gas = Sources.gas_with_costs()
-    gas.source.effects_per_flow_hour = {'costs': gas_price, 'CO2': 0.3}
-
-    # Add loads and sources - mix of library and special elements
+    flow_system = fx.FlowSystem(pd.DatetimeIndex(data.index))
     flow_system.add_elements(
-        # Special thermal load with time series
+        *Buses.defaults(),
+        Buses.coal(),
+        Effects.costs(),
+        Effects.co2(),
+        Effects.primary_energy(),
         fx.Sink(
             'Wärmelast', sink=fx.Flow('Q_th_Last', bus='Fernwärme', size=1, fixed_relative_profile=thermal_load_ts)
         ),
-        # Special electrical load with time series
         fx.Sink('Stromlast', sink=fx.Flow('P_el_Last', bus='Strom', size=1, fixed_relative_profile=electrical_load_ts)),
-        # Special coal tariff
         fx.Source(
             'Kohletarif',
             source=fx.Flow('Q_Kohle', bus='Kohle', size=1000, effects_per_flow_hour={'costs': 4.6, 'CO2': 0.3}),
         ),
-        # Special electricity feed-in with time series
+        fx.Source(
+            'Gastarif',
+            source=fx.Flow('Q_Gas', bus='Gas', size=1000, effects_per_flow_hour={'costs': gas_price, 'CO2': 0.3}),
+        ),
         fx.Sink('Einspeisung', sink=fx.Flow('P_el', bus='Strom', size=1000, effects_per_flow_hour=p_feed_in)),
-        # Special electricity purchase tariff
         fx.Source(
             'Stromtarif',
             source=fx.Flow('P_el', bus='Strom', size=1000, effects_per_flow_hour={'costs': p_sell, 'CO2': 0.3}),
         ),
     )
 
-    # Add converters and storage - special components for this system
     flow_system.add_elements(
-        # Special boiler for long system
         fx.linear_converters.Boiler(
             'Kessel',
             eta=0.85,
@@ -569,7 +560,6 @@ def flow_system_long():
                 on_off_parameters=fx.OnOffParameters(effects_per_switch_on=1000),
             ),
         ),
-        # Special coal-fired CHP
         fx.linear_converters.CHP(
             'BHKW2',
             eta_th=0.58,
@@ -579,7 +569,6 @@ def flow_system_long():
             Q_th=fx.Flow('Q_th', bus='Fernwärme'),
             Q_fu=fx.Flow('Q_fu', bus='Kohle', size=288, relative_minimum=87 / 288),
         ),
-        # Special storage with specific parameters
         fx.Storage(
             'Speicher',
             charging=fx.Flow('Q_th_load', size=137, bus='Fernwärme'),