Merge pull request #297 from wouterpeere/296-bug-in-temperature-calculation-when-using-active-cooling

Solves issue 296

Author: wouterpeere

CHANGELOG.md

@@ -20,7 +20,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Added building laod classes (issue #288).
 - Added __eq__ method for Result and Efficiency classes (issue #288).
 - Added _time_array to building loads (issue #291).
-- Added EERCombined for combined active and passive cooling efficiency (issue #291).
+- Added EERCombined for combined active and passive cooling efficiency (issue #291, #296).
 
 ## Changed
 

GHEtool/Borefield.py

@@ -1725,6 +1725,7 @@ def calculate_difference(results_old: Union[ResultsMonthly, ResultsHourly],
                 results = calculate_temperatures(H, hourly=hourly)
                 i += 1
             self.results = results
+            self.load.set_results(results)
             return
 
         self.results = calculate_temperatures(H, hourly=hourly)

GHEtool/VariableClasses/LoadData/Baseclasses/_HourlyDataBuilding.py

@@ -539,8 +539,7 @@ def max_peak_injection(self) -> float:
         -------
         max peak injection : float
         """
-        if isinstance(self._results, ResultsMonthly) and \
-                (isinstance(self.cop, COP) or isinstance(self.eer, EER) or isinstance(self.cop_dhw, COP)):
+        if isinstance(self._results, ResultsMonthly):
             return np.max(self.monthly_peak_injection_simulation_period)
         return np.max(self.hourly_injection_load_simulation_period)
 
@@ -553,8 +552,7 @@ def max_peak_extraction(self) -> float:
         -------
         max peak extraction : float
         """
-        if isinstance(self._results, ResultsMonthly) and \
-                (isinstance(self.cop, COP) or isinstance(self.eer, EER) or isinstance(self.cop_dhw, COP)):
+        if isinstance(self._results, ResultsMonthly):
             return np.max(self.monthly_peak_extraction_simulation_period)
         return np.max(self.hourly_extraction_load_simulation_period)
 
@@ -568,8 +566,7 @@ def imbalance(self) -> float:
         -------
         imbalance : float
         """
-        if isinstance(self._results, ResultsMonthly) and \
-                (isinstance(self.cop, COP) or isinstance(self.eer, EER) or isinstance(self.cop_dhw, COP)):
+        if isinstance(self._results, ResultsMonthly):
             return super(_HourlyData, self).imbalance
         return np.sum(
             self.hourly_injection_load_simulation_period - self.hourly_extraction_load_simulation_period) / self.simulation_period

GHEtool/test/methods/method_data.py

@@ -560,3 +560,28 @@
 borefield.load = hourly_load_building
 list_of_test_objects.add(SizingObject(borefield, L2_output=310.725, L3_output=310.725, L4_output=308.269, quadrant=4,
                                       name='BS2023 Swimming pool'))
+
+eer_combined = EERCombined(20, 5, 10)
+borefield = Borefield()
+borefield.create_rectangular_borefield(3, 6, 6, 6, 146, 4)
+borefield.set_min_avg_fluid_temperature(3)
+borefield.set_max_avg_fluid_temperature(16)
+borefield.load.peak_duration = 6
+load = HourlyBuildingLoad(efficiency_heating=4, efficiency_cooling=eer_combined)
+# column order is inverted
+load.load_hourly_profile(FOLDER.joinpath("test\methods\hourly_data\hourly_profile.csv"), col_heating=1, col_cooling=0)
+load.simulation_period = 40
+borefield.load = load
+
+borefield.set_ground_parameters(GroundTemperatureGradient(1.9, 10, gradient=2))
+borefield.set_fluid_parameters(FluidData(0.1, 0.475, 1033, 3930, 0.001))
+borefield.set_pipe_parameters(SingleUTube(1.5, 0.016, 0.02, 0.42, 0.04))
+list_of_test_objects.add(OptimiseLoadProfileObject(borefield, load, 146, 45.978137699335, 11.029080983424729,
+                                                   52.82586122830533, 28.00877268650213, 605.9817888622596,
+                                                   512.6954920945816,
+                                                   name='Optimise load profile (eer combined) (power)', power=True,
+                                                   hourly=False))
+list_of_test_objects.add(OptimiseLoadProfileObject(borefield, load, 146, 38.26289557407782, 4.071214268589431,
+                                                   75.9124206410309, 85.82220547000414, 630.8575050773479, 535.936136,
+                                                   name='Optimise load profile (eer combined) (energy)', power=False,
+                                                   hourly=False))

GHEtool/test/test_examples.py

@@ -55,15 +55,15 @@ def test_sizing_with_building_load(monkeypatch):
         size_with_variable_ground_temperature, \
         size_with_part_load_data
     assert np.allclose(size_with_scop(), (96.5589765783911, 4.072466974615784))
-    assert np.allclose(size_with_variable_ground_temperature(), (95.64066844079264, 4.17665670561309))
-    assert np.allclose(size_with_part_load_data(), (98.1273127062551, 4.685121612513776))
+    assert np.allclose(size_with_variable_ground_temperature(), (95.64070065017864, 4.134068939666393))
+    assert np.allclose(size_with_part_load_data(), (98.12761463932304, 4.625123282444558))
 
 
 def test_sizing_with_building_load_hourly(monkeypatch):
     monkeypatch.setattr(plt, 'show', lambda: None)
     from GHEtool.Examples.sizing_with_building_load_hourly import L3_sizing, L4_sizing
-    assert np.allclose(L3_sizing(), (127.05154931011464, 6.131588043404349))
-    assert np.allclose(L4_sizing(), (153.26361812264668, 6.237959315069309))
+    assert np.allclose(L3_sizing(), (127.05154931011464, 6.278577763617031))
+    assert np.allclose(L4_sizing(), (153.26361812264668, 6.38069989008617))
 
 
 def test_combined_active_and_passive_cooling(monkeypatch):

GHEtool/test/unit-tests/test_main_class.py

@@ -7,7 +7,7 @@
 import pytest
 
 from GHEtool import GroundConstantTemperature, GroundFluxTemperature, FluidData, DoubleUTube, Borefield, \
-    CalculationSetup, FOLDER, MultipleUTube
+    CalculationSetup, FOLDER, MultipleUTube, EERCombined
 from GHEtool.logger import ghe_logger
 from GHEtool.Validation.cases import load_case
 from GHEtool.VariableClasses.LoadData import MonthlyGeothermalLoadAbsolute, HourlyGeothermalLoad, HourlyBuildingLoad, \
@@ -521,6 +521,26 @@ def test_size_L4():
     assert borefield.calculate_quadrant() == 4
 
 
+def test_calculate_temperatures_eer_combined():
+    eer_combined = EERCombined(20, 5, 17)
+    borefield = Borefield()
+    borefield.set_ground_parameters(ground_data_constant)
+    load = HourlyBuildingLoad(efficiency_cooling=eer_combined)
+
+    borefield.borefield = copy.deepcopy(borefield_gt)
+    load.load_hourly_profile(FOLDER.joinpath("Examples/hourly_profile.csv"))
+    borefield.load = load
+    borefield.calculate_temperatures(hourly=True)
+
+    active_cooling_array = borefield.load.eer.get_time_series_active_cooling(borefield.results.peak_injection,
+                                                                             borefield.load.month_indices)
+    assert np.allclose(borefield.load.hourly_cooling_load_simulation_period * active_cooling_array *
+                       (1 + 1 / 5) + borefield.load.hourly_cooling_load_simulation_period * np.invert(
+        active_cooling_array) *
+                       (1 + 1 / 20),
+                       borefield.load.hourly_injection_load_simulation_period)
+
+
 def test_investment_cost():
     borefield = Borefield()
     borefield.borefield = copy.deepcopy(borefield_gt)
@@ -1086,3 +1106,24 @@ def test_deep_sizing(case, result):
 def test_depreciation_warning():
     with pytest.raises(DeprecationWarning):
         Borefield(baseload_heating=[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12])
+
+
+def test_optimise_load_borefield():
+    load = HourlyBuildingLoad()
+    load.load_hourly_profile(FOLDER.joinpath("Examples/hourly_profile.csv"))
+    load.simulation_period = 10
+    borefield = Borefield(load=load)
+    borefield.set_min_avg_fluid_temperature(2)
+    borefield.set_max_avg_fluid_temperature(17)
+    borefield.borefield = gt.boreholes.rectangle_field(20, 4, 6, 6, 150, 1, 0.07)
+    borefield.Rb = 0.1699
+    ground_data = GroundFluxTemperature(2, 9.6, flux=0.07)
+    borefield.ground_data = ground_data
+    borefield_load, external_load = borefield.optimise_load_profile_energy(load)
+    assert np.isclose(borefield_load.imbalance, -228386.82055766508)
+    borefield.load = borefield_load
+    borefield.calculate_temperatures(hourly=False)
+    assert np.isclose(np.max(borefield.results.peak_injection), 17.044473901670603)
+    assert np.isclose(np.min(borefield.results.peak_extraction), 1.9471241454443655)
+    assert np.isclose(borefield.load.max_peak_cooling, 329.9393053)
+    assert np.isclose(np.sum(borefield.load.hourly_heating_load), 593385.1066074175)

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = GHEtool
-version = 2.3.0.dev5
+version = 2.3.0.dev6
 author = Wouter Peere
 author_email = wouter@ghetool.eu
 description = Python package for borefield sizing