Add two extra tests

wouterpeere · Feb 14, 2025 · 417dd65 · 417dd65
1 parent 6301132
commit 417dd65
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/GHEtool/Examples/optimise_load_profile_extra.py b/GHEtool/Examples/optimise_load_profile_extra.py
@@ -19,14 +19,7 @@ def optimise():
     load = HourlyBuildingLoad(efficiency_heating=4.5, efficiency_cooling=20)
     load.load_hourly_profile(FOLDER.joinpath("test\methods\hourly_data\\auditorium.csv"), header=True, separator=";",
                              col_cooling=0, col_heating=1)
-    import matplotlib.pyplot as plt
-
-    # plt.figure()
-    # plt.plot(load.hourly_cooling_load_simulation_period)
-    # plt.plot(load.hourly_heating_load_simulation_period)
-    # plt.show()
-    # borefield.calculate_temperatures()
-    # borefield.print_temperature_profile(plot_hourly=False)
+
     # optimise the load for a 10x10 field (see data above) and a fixed length of 150m.
     # first for an optimisation based on the power
     borefield.optimise_load_profile_energy(building_load=load)

diff --git a/GHEtool/test/methods/method_data.py b/GHEtool/test/methods/method_data.py
@@ -626,9 +626,19 @@
                                                    643.137, 195.331, 0, 340.705,
                                                    name='Optimise load profile 1, reversed (power, dhw load)',
                                                    power=True,
-                                                   hourly=False, dhw_preferential=True))
+                                                   hourly=False, dhw_preferential=False))
 list_of_test_objects.add(OptimiseLoadProfileObject(borefield, hourly_load, 150, 99.971, 66.424,
                                                    639.283, 195.053, 0, 340.983,
                                                    name='Optimise load profile 1, reversed (power, hourly, dhw load)',
                                                    power=True,
+                                                   hourly=True, dhw_preferential=False))
+list_of_test_objects.add(OptimiseLoadProfileObject(borefield, hourly_load, 150, 99.976, 66.492,
+                                                   643.137, 195.331, 0, 340.705,
+                                                   name='Optimise load profile 1, reversed (power, dhw load, preferential)',
+                                                   power=True,
+                                                   hourly=False, dhw_preferential=True))
+list_of_test_objects.add(OptimiseLoadProfileObject(borefield, hourly_load, 150, 99.971, 66.424,
+                                                   639.283, 195.053, 0, 340.983,
+                                                   name='Optimise load profile 1, reversed (power, hourly, dhw load, preferential)',
+                                                   power=True,
                                                    hourly=True, dhw_preferential=True))