Fix small mistakes in 403

Author: wouterpeere

GHEtool/Borefield.py

@@ -16,7 +16,7 @@
 from scipy.signal import convolve
 
 from GHEtool.VariableClasses import FluidData, Borehole, GroundConstantTemperature, ResultsMonthly, ResultsHourly, \
-    TemperatureDependentFluidData
+    TemperatureDependentFluidData, SCOP, SEER
 from GHEtool.VariableClasses import CustomGFunction, load_custom_gfunction, GFunction, CalculationSetup, Cluster, \
     EERCombined
 from GHEtool.VariableClasses.LoadData import *
@@ -1769,7 +1769,11 @@ def calculate_temperatures(H, hourly=hourly, results_temperature=ResultsMonthly(
             results = None
 
             def get_rb(temperature, limit=None):
-                if self.USE_SPEED_UP_IN_SIZING and sizing:
+                variable_efficiency = isinstance(self.load, _LoadDataBuilding) and not (
+                        isinstance(self.load.cop, SCOP) and isinstance(self.load.cop_dhw, SCOP) and isinstance(
+                    self.load.eer, SEER))
+                if self.USE_SPEED_UP_IN_SIZING and sizing and not variable_efficiency:
+                    # use only extreme temperatures when sizing
                     if limit is not None:
                         if len(temperature) == 0:
                             return self.borehole.get_Rb(H, self.D, self.r_b, self.ground_data.k_s(depth, self.D), depth,

GHEtool/Validation/enhanced_sizing_method.py

@@ -210,8 +210,7 @@ def test_case_auditorium():
     hourly_load = HourlyGeothermalLoad()
     hourly_load.simulation_period = 20
     hourly_load.load_hourly_profile(FOLDER.joinpath("test\methods\hourly_data\\auditorium.csv"), header=True,
-                                    separator=";",
-                                    col_injection=0, col_extraction=1)
+                                    separator=";", col_injection=0, col_extraction=1)
     borefield.load = hourly_load
     borefield.create_rectangular_borefield(5, 4, 6, 6, 110, 4, 0.075)
 
@@ -247,8 +246,7 @@ def test_case_swimming_pool():
     hourly_load.simulation_period = 20
 
     hourly_load.load_hourly_profile(FOLDER.joinpath("test\methods\hourly_data\\swimming_pool.csv"), header=True,
-                                    separator=";",
-                                    col_injection=0, col_extraction=1)
+                                    separator=";", col_injection=0, col_extraction=1)
     borefield.load = hourly_load
     borefield.create_rectangular_borefield(15, 20, 6, 6, 110, 4, 0.075)
     start = time.time()
@@ -267,3 +265,38 @@ def test_case_swimming_pool():
     assert np.isclose(borefield.results.min_temperature, 3.0001877071926537)
     assert np.isclose(borefield.results.max_temperature, 12.919492619924261)
     print(f'Simulation time without speed up {time.time() - start}s')
+
+
+def test_case_auditorium_active_passive():
+    borefield = Borefield()
+    borefield.create_rectangular_borefield(10, 10, 6, 6, 110, 4, 0.075)
+    borefield.ground_data = GroundFluxTemperature(3, 10)
+    borefield.fluid_data = TemperatureDependentFluidData('MPG', 25, mass_percentage=False)
+    borefield.flow_data = ConstantFlowRate(vfr=0.3)
+    borefield.pipe_data = DoubleUTube(1, 0.015, 0.02, 0.4, 0.05)
+    borefield.calculation_setup(use_constant_Rb=False)
+    borefield.set_max_avg_fluid_temperature(25)
+    borefield.set_min_avg_fluid_temperature(3)
+    hourly_load = HourlyBuildingLoad()
+    hourly_load.simulation_period = 20
+    hourly_load.load_hourly_profile(FOLDER.joinpath("test\methods\hourly_data\\auditorium.csv"), header=True,
+                                    separator=";", col_cooling=0, col_heating=1)
+    hourly_load.eer = EERCombined(20, 5, 17)
+    borefield.load = hourly_load
+    borefield.create_rectangular_borefield(5, 4, 6, 6, 110, 4, 0.075)
+    start = time.time()
+
+    borefield.size_L4()
+    assert np.isclose(borefield.H, 51.676740693499106)
+    assert np.isclose(borefield.results.min_temperature, 3.0002733156958086)
+    assert np.isclose(borefield.results.max_temperature, 23.824518064283197)
+    print(f'Simulation time with speed up {time.time() - start}s')
+
+    borefield.USE_SPEED_UP_IN_SIZING = False
+    start = time.time()
+
+    borefield.size_L4()
+    assert np.isclose(borefield.H, 51.676740693499106)
+    assert np.isclose(borefield.results.min_temperature, 3.0002733156958086)
+    assert np.isclose(borefield.results.max_temperature, 23.824518064283197)
+    print(f'Simulation time without speed up {time.time() - start}s')

GHEtool/test/general_tests/test.gvalues

@@ -69,11 +69,12 @@ def test_validation_ANN():
 def test_faster_sizing():
     from GHEtool.Validation.enhanced_sizing_method import test_monthly_quadrant_1, \
         test_monthly_quadrant_1_more_data_points, test_monthly_quadrant_2, test_monthly_quadrant_4, test_case_office, \
-        test_case_auditorium, test_case_swimming_pool
+        test_case_auditorium, test_case_swimming_pool, test_case_auditorium_active_passive
     test_monthly_quadrant_1()
     test_monthly_quadrant_2()
     test_monthly_quadrant_4()
     test_monthly_quadrant_1_more_data_points()
     test_case_auditorium()
     test_case_office()
     test_case_swimming_pool()
+    test_case_auditorium_active_passive()

GHEtool/test/test_validation.py

@@ -0,0 +1,7 @@
+***********************************************************
+Enhanced sizing method
+***********************************************************
+
+.. literalinclude:: ../../../../GHEtool/Validation/enhanced_sizing_method.py
+   :language: python
+   :linenos:

docs/sources/code/Validation/enhanced_sizing_method.rst

@@ -56,4 +56,12 @@ The validation of the artificial neural network, used in GHEtool, can be found h
 :maxdepth: 1
 
 Validation/artificial_neural_network.rst
+```
+
+The validation for the enhanced and faster sizing method, can be found here.
+
+```{toctree}
+:maxdepth: 1
+
+Validation/enhanced_sizing_method.rst
 ```