Fix tests

GHEtool/Validation/sizing_method_comparison_L2_L3_L4.py

@@ -29,7 +29,6 @@ def compare():
 
     # load the hourly profile
     load = HourlyGeothermalLoad()
-    print(FOLDER)
     load.load_hourly_profile(FOLDER.joinpath("Examples/hourly_profile.csv"), header=True, separator=";")
     borefield.load = load
     borefield.simulation_period = 100

GHEtool/VariableClasses/LoadData/_LoadData.py

@@ -116,9 +116,9 @@ def UPM(self) -> np.ndarray:
         """
         if self.all_months_equal:
             # every month has equal length
-            return np.full(12, _LoadData.AVG_UPM, dtype=np.int32)
+            return np.full(12, _LoadData.AVG_UPM, dtype=np.int64)
         else:
-            return np.array([744, 672, 744, 720, 744, 720, 744, 744, 720, 744, 720, 744], dtype=np.int32)
+            return np.array([744, 672, 744, 720, 744, 720, 744, 744, 720, 744, 720, 744], dtype=np.int64)
 
     @abc.abstractmethod
     def _check_input(self, input: Union[np.ndarray, list, tuple]) -> bool:

GHEtool/main_class.py

@@ -32,7 +32,6 @@ class Borefield(BaseClass):
 
     UPM: float = 730.0  # number of hours per month
     THRESHOLD_BOREHOLE_DEPTH: float = 0.05  # threshold for iteration
-    MAX_SIMULATION_PERIOD: int = 100  # maximal value for simulation
 
     # define default values
     DEFAULT_INVESTMENT: list = [35, 0]  # 35 EUR/m
@@ -467,21 +466,6 @@ def set_investment_cost(self, investment_cost: list = None) -> None:
             investment_cost = Borefield.DEFAULT_INVESTMENT
         self.cost_investment: list = investment_cost
 
-    def set_length_peak(self, length: float = DEFAULT_LENGTH_PEAK) -> None:
-        """
-        This function sets the length of the peak.
-
-        Parameters
-        ----------
-        length : float
-            Length of the peak [hours]
-
-        Returns
-        -------
-        None
-        """
-        self._borefield_load.peak_duration = length
-
     def set_load(self, load: _LoadData) -> None:
         """
         This function sets the _load attribute.

GHEtool/test/general_tests/test_GHEtool_two.py

@@ -126,7 +126,7 @@ def test_different_results_with_other_peak_lengths():
     borefield.set_max_avg_fluid_temperature(16)  # maximum temperature
     borefield.set_min_avg_fluid_temperature(0)  # minimum temperature
 
-    borefield.set_length_peak(2)
+    borefield.load.peak_duration = 2
     init_length_L2 = borefield.size_L2()
     borefield.load.peak_duration = 8
     new_length_L2 = borefield.size_L2()

GHEtool/test/unit-tests/test_main_class.py

@@ -174,17 +174,6 @@ def test_load_custom_gfunction():
     assert borefield.custom_gfunction == dataset
 
 
-def test_set_length_peak():
-    borefield = Borefield()
-    borefield.load.peak_heating_duration = 8
-    borefield.load.peak_cooling_duration = 10
-    assert borefield.load.peak_cooling_duration == 10 * 3600
-    assert borefield.load.peak_heating_duration == 8 * 3600
-    borefield.set_length_peak(12)
-    assert borefield.load.peak_cooling_duration == 12 * 3600
-    assert borefield.load.peak_heating_duration == 12 * 3600
-
-
 def test_simulation_period():
     borefield = Borefield()
     assert borefield.simulation_period == 20