Merge pull request #432 from wouterpeere/issue309-variable-mass-flow-rate

Add flow_rates in pressure drop curve function

Author: wouterpeere

CHANGELOG.md

@@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ### Added
 
+- Add flow_rates as explicit argument in PressureDrop curve function.
 - Inlet and outlet water temperature (issue #271).
 - Added 'type' attribute to temperature profile plotting so also the inlet and outlet temperatures can be shown (issue
   #271).

GHEtool/VariableClasses/PipeData/PressureDrop.py

@@ -140,7 +140,8 @@ def calculate_total_pressure_drop(self, **kwargs) -> float:
             self.calculate_pressure_drop_lateral(**kwargs) + \
             self.calculate_pressure_drop_main(**kwargs)
 
-    def create_pressure_drop_curve(self, range: float = 2, datapoints: int = 30, **kwargs):
+    def create_pressure_drop_curve(self, range: float = 2, datapoints: int = 30, flow_rates: np.ndarray = None,
+                                   **kwargs):
         """
         This function calculates the total pressure drop for different flow rates.
 
@@ -150,6 +151,8 @@ def create_pressure_drop_curve(self, range: float = 2, datapoints: int = 30, **k
             Multiplier of the flow rate for the range of the data.
         datapoints : int
             Number of datapoints.
+        flow_rates : np.ndarray
+            Give the flow range directly.
 
         Returns
         -------
@@ -159,9 +162,11 @@ def create_pressure_drop_curve(self, range: float = 2, datapoints: int = 30, **k
         # backup
         flow_backup = copy.copy(self.flow_data)
 
-        flow_rates = np.linspace(0, range * self.flow_data.vfr_borehole(fluid_data=self.fluid_data,
-                                                                        nb_of_boreholes=self.nb_of_boreholes, **kwargs),
-                                 datapoints)
+        if flow_rates is None:
+            flow_rates = np.linspace(0, range * self.flow_data.vfr_borehole(
+                fluid_data=self.fluid_data,
+                nb_of_boreholes=self.nb_of_boreholes,
+                **kwargs), datapoints)
         pressure_drops_pipe = np.zeros(flow_rates.shape)
         pressure_drops_lateral = np.zeros(flow_rates.shape)
         pressure_drops_main = np.zeros(flow_rates.shape)

setup.cfg

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