From 6afd7f77ab5f8307c1da8ff47eb67b22f6c9de7f Mon Sep 17 00:00:00 2001 From: wouterpeere Date: Fri, 9 Feb 2024 11:38:10 +0100 Subject: [PATCH] Fix problem Python 3.8-3.9 --- .../LoadData/GeothermalLoad/HourlyGeothermalLoad.py | 4 ++-- .../GeothermalLoad/HourlyGeothermalLoadMultiYear.py | 2 +- .../GeothermalLoad/MonthlyGeothermalLoadAbsolute.py | 8 ++++---- .../GeothermalLoad/MonthlyGeothermalLoadMultiYear.py | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/GHEtool/VariableClasses/LoadData/GeothermalLoad/HourlyGeothermalLoad.py b/GHEtool/VariableClasses/LoadData/GeothermalLoad/HourlyGeothermalLoad.py index 754dfc95..27113d07 100644 --- a/GHEtool/VariableClasses/LoadData/GeothermalLoad/HourlyGeothermalLoad.py +++ b/GHEtool/VariableClasses/LoadData/GeothermalLoad/HourlyGeothermalLoad.py @@ -27,8 +27,8 @@ class HourlyGeothermalLoad(_LoadData): END = pd.to_datetime("2019-12-31 23:59:00") HOURS_SERIES = pd.Series(pd.date_range(START, END, freq="1h")) - def __init__(self, heating_load: ArrayLike | None = None, - cooling_load: ArrayLike | None = None, + def __init__(self, heating_load: ArrayLike = None, + cooling_load: ArrayLike = None, simulation_period: int = 20, dhw: float = 0.): """ diff --git a/GHEtool/VariableClasses/LoadData/GeothermalLoad/HourlyGeothermalLoadMultiYear.py b/GHEtool/VariableClasses/LoadData/GeothermalLoad/HourlyGeothermalLoadMultiYear.py index 97d2dac5..b1f4f1bc 100644 --- a/GHEtool/VariableClasses/LoadData/GeothermalLoad/HourlyGeothermalLoadMultiYear.py +++ b/GHEtool/VariableClasses/LoadData/GeothermalLoad/HourlyGeothermalLoadMultiYear.py @@ -18,7 +18,7 @@ class HourlyGeothermalLoadMultiYear(HourlyGeothermalLoad): This means that the inputs are both in kWh/month and kW/month. """ - def __init__(self, heating_load: ArrayLike | None = None, cooling_load: ArrayLike | None = None): + def __init__(self, heating_load: ArrayLike = None, cooling_load: ArrayLike = None): """ Parameters diff --git a/GHEtool/VariableClasses/LoadData/GeothermalLoad/MonthlyGeothermalLoadAbsolute.py b/GHEtool/VariableClasses/LoadData/GeothermalLoad/MonthlyGeothermalLoadAbsolute.py index f50a6a07..6912662f 100644 --- a/GHEtool/VariableClasses/LoadData/GeothermalLoad/MonthlyGeothermalLoadAbsolute.py +++ b/GHEtool/VariableClasses/LoadData/GeothermalLoad/MonthlyGeothermalLoadAbsolute.py @@ -20,10 +20,10 @@ class MonthlyGeothermalLoadAbsolute(_LoadData): def __init__( self, - baseload_heating: ArrayLike | None = None, - baseload_cooling: ArrayLike | None = None, - peak_heating: ArrayLike | None = None, - peak_cooling: ArrayLike | None = None, + baseload_heating: ArrayLike = None, + baseload_cooling: ArrayLike = None, + peak_heating: ArrayLike = None, + peak_cooling: ArrayLike = None, simulation_period: int = 20, dhw: float = 0.0, ): diff --git a/GHEtool/VariableClasses/LoadData/GeothermalLoad/MonthlyGeothermalLoadMultiYear.py b/GHEtool/VariableClasses/LoadData/GeothermalLoad/MonthlyGeothermalLoadMultiYear.py index f1cb6802..c3f94b65 100644 --- a/GHEtool/VariableClasses/LoadData/GeothermalLoad/MonthlyGeothermalLoadMultiYear.py +++ b/GHEtool/VariableClasses/LoadData/GeothermalLoad/MonthlyGeothermalLoadMultiYear.py @@ -16,10 +16,10 @@ class MonthlyGeothermalLoadMultiYear(MonthlyGeothermalLoadAbsolute): def __init__( self, - baseload_heating: ArrayLike | None = None, - baseload_cooling: ArrayLike | None = None, - peak_heating: ArrayLike | None = None, - peak_cooling: ArrayLike | None = None, + baseload_heating: ArrayLike = None, + baseload_cooling: ArrayLike = None, + peak_heating: ArrayLike = None, + peak_cooling: ArrayLike = None, ): """