Merge branch 'dev'

# Conflicts:
#	docs/whats_new/v0-0-7.rst
#	src/oemof/thermal/__init__.py

docs/whats_new.rst

@@ -8,6 +8,7 @@ Discover noteable new features and improvements in each release.
     :local:
     :backlinks: top
 
+.. include::  whats_new/v0-0-8.rst
 .. include::  whats_new/v0-0-7.rst
 .. include::  whats_new/v0-0-6.rst
 .. include::  whats_new/v0-0-5.rst

docs/whats_new/v0-0-8.rst

@@ -0,0 +1,13 @@
+v0.0.8 (December 13, 2024)
+==========================
+
+Other changes
+-------------
+
+* Make compatible to Pandas 2
+* Make compatible to PVLib 0.11
+
+Contributors
+------------
+
+* Patrik Schönfeldt

examples/absorption_heatpump_and_chiller/absorption_chiller.py

@@ -14,7 +14,7 @@ def absorption_chiller_example():
     solver_verbose = True
 
     date_time_index = pd.date_range(
-        "1/1/2012", periods=number_of_time_steps, freq="H"
+        "1/1/2012", periods=number_of_time_steps, freq="h"
     )
     energysystem = solph.EnergySystem(timeindex=date_time_index)
 

examples/compression_heatpump_and_chiller/airsource_heatpump_const_max_output.py

@@ -31,7 +31,7 @@ def airource_hp_const_example():
     solver_verbose = False
 
     date_time_index = pd.date_range(
-        "1/1/2012", periods=number_of_time_steps, freq="H"
+        "1/1/2012", periods=number_of_time_steps, freq="h"
     )
 
     energysystem = solph.EnergySystem(timeindex=date_time_index)

examples/compression_heatpump_and_chiller/airsource_heatpump_variable_max_output.py

@@ -33,7 +33,7 @@ def airource_hp_variable_example():
     solver_verbose = False
 
     date_time_index = pd.date_range(
-        "1/1/2012", periods=number_of_time_steps, freq="H"
+        "1/1/2012", periods=number_of_time_steps, freq="h"
     )
 
     energysystem = solph.EnergySystem(timeindex=date_time_index)

examples/compression_heatpump_and_chiller/chiller_cop_as_TimeSeries.py

@@ -42,7 +42,7 @@ def chiller_cop_timeseries_example():
         23,
     ]
 
-    timestamps = pd.date_range("20200101", periods=24, freq="H")
+    timestamps = pd.date_range("20200101", periods=24, freq="h")
 
     # Convert temp_ambient to pandas DataFrame
     df_temp_ambient = pd.DataFrame(temp_ambient, timestamps)

examples/compression_heatpump_and_chiller/groundsource_heatpump.py

@@ -29,7 +29,7 @@ def groundsource_hp_example():
     solver_verbose = False
 
     date_time_index = pd.date_range(
-        "1/1/2012", periods=number_of_time_steps, freq="H"
+        "1/1/2012", periods=number_of_time_steps, freq="h"
     )
 
     energysystem = solph.EnergySystem(timeindex=date_time_index)

examples/concentrating_solar_power/csp_collector_plot_andasol.py

@@ -134,7 +134,9 @@ def csp_andasol_example():
             E_dir_hor=df_temp_amb_series["E_dir_hor"],
         )
 
-        df_result = df_result.append(data_precalc_temp_amb, ignore_index=True)
+        df_result = pd.concat(
+            [df_result, data_precalc_temp_amb], ignore_index=True
+        )
 
     _, ax = plt.subplots()
     ax.plot(

examples/stratified_thermal_storage/investment_fixed_ratio_facade.py

@@ -39,7 +39,7 @@ def fixed_ratio_invest_facade_example():
     # Set up an energy system model
     solver = "cbc"
     periods = 100
-    datetimeindex = pd.date_range("1/1/2019", periods=periods, freq="H")
+    datetimeindex = pd.date_range("1/1/2019", periods=periods, freq="h")
     demand_timeseries = np.zeros(periods)
     demand_timeseries[-5:] = 1
     heat_feedin_timeseries = np.zeros(periods)

examples/stratified_thermal_storage/investment_fixed_ratio_generic_storage.py

@@ -74,7 +74,7 @@ def print_parameters():
     # Set up an energy system model
     solver = "cbc"
     periods = 100
-    datetimeindex = pd.date_range("1/1/2019", periods=periods, freq="H")
+    datetimeindex = pd.date_range("1/1/2019", periods=periods, freq="h")
     demand_timeseries = np.zeros(periods)
     demand_timeseries[-5:] = 1
     heat_feedin_timeseries = np.zeros(periods)

examples/stratified_thermal_storage/investment_independent_facade.py

@@ -42,7 +42,7 @@ def invest_independent_facade_example():
     # Set up an energy system model
     solver = "cbc"
     periods = 100
-    datetimeindex = pd.date_range("1/1/2019", periods=periods, freq="H")
+    datetimeindex = pd.date_range("1/1/2019", periods=periods, freq="h")
     demand_timeseries = np.zeros(periods)
     demand_timeseries[-5:] = 1
     heat_feedin_timeseries = np.zeros(periods)

examples/stratified_thermal_storage/investment_independent_generic_storage.py

@@ -75,7 +75,7 @@ def print_parameters():
     # Set up an energy system model
     solver = "cbc"
     periods = 100
-    datetimeindex = pd.date_range("1/1/2019", periods=periods, freq="H")
+    datetimeindex = pd.date_range("1/1/2019", periods=periods, freq="h")
     demand_timeseries = np.zeros(periods)
     demand_timeseries[-5:] = 1
     heat_feedin_timeseries = np.zeros(periods)

examples/stratified_thermal_storage/model_validation.py

@@ -46,7 +46,7 @@ def run_storage_model(initial_storage_level, temp_h, temp_c):
 
         # Set up an energy system model
         periods = 10
-        datetimeindex = pd.date_range("1/1/2019", periods=periods, freq="H")
+        datetimeindex = pd.date_range("1/1/2019", periods=periods, freq="h")
         demand_timeseries = np.zeros(periods)
         heat_feedin_timeseries = np.zeros(periods)
 

examples/stratified_thermal_storage/operation_facade.py

@@ -58,7 +58,7 @@ def print_parameters():
 
     # Set up an energy system model
     periods = 100
-    datetimeindex = pd.date_range("1/1/2019", periods=periods, freq="H")
+    datetimeindex = pd.date_range("1/1/2019", periods=periods, freq="h")
     demand_timeseries = np.zeros(periods)
     demand_timeseries[-5:] = 1
     heat_feedin_timeseries = np.zeros(periods)

examples/stratified_thermal_storage/operation_generic_storage.py

@@ -87,7 +87,7 @@ def print_parameters():
     # Set up an energy system model
     solver = "cbc"
     periods = 100
-    datetimeindex = pd.date_range("1/1/2019", periods=periods, freq="H")
+    datetimeindex = pd.date_range("1/1/2019", periods=periods, freq="h")
     demand_timeseries = np.zeros(periods)
     demand_timeseries[-5:] = 1
     heat_feedin_timeseries = np.zeros(periods)

examples/stratified_thermal_storage/plots.py

@@ -85,7 +85,7 @@ def print_results():
     # Set up an energy system model
     solver = "cbc"
     periods = 800
-    datetimeindex = pd.date_range("1/1/2019", periods=periods, freq="H")
+    datetimeindex = pd.date_range("1/1/2019", periods=periods, freq="h")
 
     energysystem = EnergySystem(timeindex=datetimeindex)
 

pyproject.toml

@@ -41,7 +41,7 @@ requires-python = ">=3.9"
 dependencies = [
     'oemof.solph <= 0.5.5',
     'matplotlib',
-    'pvlib <= 0.9.0',
+    'pvlib',
     'numpy >= 1.16.5',
     'pandas >= 0.18.0'
 ]

src/oemof/thermal/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.0.7"
+__version__ = "0.0.8"
 __project__ = "oemof.thermal"
 
 from . import absorption_heatpumps_and_chillers

src/oemof/thermal/concentrating_solar_power.py

@@ -282,9 +282,15 @@ def calc_irradiance(
 
     """
     if irradiance_method == "horizontal":
-        poa_horizontal_ratio = pvlib.irradiance.poa_horizontal_ratio(
+        cos_poa_zen = pvlib.irradiance.aoi_projection(
             surface_tilt, surface_azimuth, apparent_zenith, azimuth
         )
+
+        cos_solar_zenith = pvlib.tools.cosd(apparent_zenith)
+
+        # ratio of tilted and horizontal beam irradiance
+        poa_horizontal_ratio = cos_poa_zen / cos_solar_zenith
+
         poa_horizontal_ratio[poa_horizontal_ratio < 0] = 0
         irradiance_on_collector = irradiance * poa_horizontal_ratio
 

tests/test_constraints.py

@@ -83,7 +83,7 @@ def setup_class(cls):
             r"^objective.*(?=s\.t\.)", re.DOTALL | re.MULTILINE
         )
 
-        cls.date_time_index = pd.date_range("1/1/2012", periods=3, freq="H")
+        cls.date_time_index = pd.date_range("1/1/2012", periods=3, freq="h")
 
         cls.tmpdir = helpers.extend_basic_path("tmp")
         logging.info(cls.tmpdir)