Merge pull request #360 from wouterpeere/issue358-extension-on-pressure-drop

Small fix in pressure drop

Author: wouterpeere

CHANGELOG.md

@@ -5,6 +5,12 @@ our [project board](https://github.com/users/wouterpeere/projects/2) on GitHub.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [2.3.4] - Unpublished
+
+## Fixed
+
+- Small bug in pressure drop lateral pipe.
+
 ## [2.3.3] - 2025-05-28
 
 ### Added

GHEtool/VariableClasses/PipeData/PressureDrop.py

@@ -87,14 +87,14 @@ def calculate_pressure_drop_lateral(self, **kwargs) -> float:
 
         # Darcy fluid factor
         fd = gt.pipes.fluid_friction_factor_circular_pipe(
-            self.flow_data.mfr(fluid_data=self.fluid_data, **kwargs) * self.series_factor * self.tichelmann_factor,
+            self.flow_data.mfr(fluid_data=self.fluid_data, **kwargs) * self.tichelmann_factor,
             self.r_in_lateral,
             self.fluid_data.mu(**kwargs),
             self.fluid_data.rho(**kwargs),
             1e-6)
         A = pi * self.r_in_lateral ** 2
         V = (self.flow_data.vfr(fluid_data=self.fluid_data,
-                                **kwargs) / 1000) / A * self.series_factor * self.tichelmann_factor
+                                **kwargs) / 1000) / A * self.tichelmann_factor
 
         # distance_later * 2 for back and forth
         return ((fd * self.distance_lateral * 2 / (

GHEtool/test/unit-tests/test_pressure_drop.py

@@ -34,8 +34,6 @@ def test_lateral():
     pressure_drop = PressureDrop(single_u, fluid_data, flow_data, 0, 100, 0.02 - 0.0037 / 2, 15, 0, 0, 0, 0, 8, 1, 1)
     pressure_drop_double = PressureDrop(single_u, fluid_data, ConstantFlowRate(mfr=0.4), 0, 100, 0.02 - 0.0037 / 2, 15,
                                         0, 0, 0, 0, 8, 1, 1)
-    pressure_drop_four = PressureDrop(single_u, fluid_data, ConstantFlowRate(mfr=0.8), 0, 100, 0.02 - 0.0037 / 2, 15, 0,
-                                      0, 0, 0, 8, 1, 1)
 
     pressure_drop_series = PressureDrop(single_u, fluid_data, flow_data,
                                         0, 100, 0.02 - 0.0037 / 2, 15, 0, 0, 0, 0, 8, 2, 1)
@@ -45,12 +43,11 @@ def test_lateral():
                                       0, 100, 0.02 - 0.0037 / 2, 15, 0, 0, 0, 0, 8, 2, 2)
 
     assert np.isclose(pressure_drop.calculate_pressure_drop_lateral(), 0.26307939880441045 * 2)
-    assert np.isclose(pressure_drop_series.calculate_pressure_drop_lateral(),
-                      pressure_drop_double.calculate_pressure_drop_lateral())
+    assert np.isclose(pressure_drop_series.calculate_pressure_drop_lateral(), 0.26307939880441045 * 2)
     assert np.isclose(pressure_drop_tichelmann.calculate_pressure_drop_lateral(),
                       pressure_drop_double.calculate_pressure_drop_lateral())
     assert np.isclose(pressure_drop_both.calculate_pressure_drop_lateral(),
-                      pressure_drop_four.calculate_pressure_drop_lateral())
+                      pressure_drop_double.calculate_pressure_drop_lateral())
 
     pressure_drop.minor_losses_lateral = 2
     assert np.isclose(pressure_drop.calculate_pressure_drop_lateral(), 0.5635804695478487)

setup.cfg

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