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

- Fix problem with series factor and total pressure drop

Author: wouterpeere

GHEtool/VariableClasses/PipeData/PressureDrop.py

@@ -133,7 +133,7 @@ def calculate_total_pressure_drop(self, **kwargs) -> float:
         -------
         Pressure drop in kPa
         """
-        return self.calculate_pressure_drop_borehole(**kwargs) + \
+        return self.calculate_pressure_drop_borehole(**kwargs) * self.series_factor + \
             self.calculate_pressure_drop_lateral(**kwargs) + \
             self.calculate_pressure_drop_main(**kwargs)
 

GHEtool/test/unit-tests/test_pressure_drop.py

@@ -103,6 +103,11 @@ def test_total_pressure_drop():
     assert np.isclose(pressure_drop.calculate_total_pressure_drop(),
                       pressure_drop.calculate_pressure_drop_borehole() + pressure_drop.calculate_pressure_drop_lateral()
                       + pressure_drop.calculate_pressure_drop_main())
+    pressure_drop = PressureDrop(single_u, fluid_data, flow_data, 0, 100, 0.02 - 0.0037 / 2, 15, 1, 0.02 - 0.0037 / 2,
+                                 15, 2, 8, 2, 1)
+    assert np.isclose(pressure_drop.calculate_total_pressure_drop(),
+                      pressure_drop.calculate_pressure_drop_borehole() * 2 + pressure_drop.calculate_pressure_drop_lateral()
+                      + pressure_drop.calculate_pressure_drop_main())
 
 
 def test_range_pressure_drop():

setup.cfg

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