Skip to content

Commit 2631443

Browse files
Final review of PR326
1 parent 2e96dc2 commit 2631443

File tree

4 files changed

+14
-10
lines changed

4 files changed

+14
-10
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
### New features
66

77
* [Pull Request 325](https://github.com/MassimoCimmino/pygfunction/pull/325) - Borefields and boreholes can now be concatenated using the `+` operator, e.g. using `new_field = field_1 + field_2`.
8-
* [Pull Request 326](https://github.com/MassimoCimmino/pygfunction/pull/326) - Introduced `gFunction.from_static_params` and `Network.from_static_params` methods. These methods facilitate the creation of `Network` objects and the evaluation g-functions by automatically evaluating the required thermal resistances for the creation of `Pipe` objects.
8+
* [Pull Request 326](https://github.com/MassimoCimmino/pygfunction/pull/326) - Introduced `gFunction.from_static_params` and `Network.from_static_params` methods. These methods facilitate the creation of `Network` objects and the evaluation of g-functions by automatically evaluating the required thermal resistances for the creation of `Pipe` objects.
99

1010
### Other changes
1111

pygfunction/gfunction.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ def from_static_params(cls,
341341
Method for the evaluation of the g-function. Should be one of 'similarities', 'detailed', or 'equivalent'.
342342
Default is 'equivalent'. See 'gFunction' __init__ for more details.
343343
m_flow_network : float, optional
344-
Fluid mass flow rate into the network of boreholes.
344+
Fluid mass flow rate into the network of boreholes (in kg/s).
345345
Default is None.
346346
options : dict, optional
347347
A dictionary of solver options. See 'gFunction' __init__ for more details.

pygfunction/networks.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ def from_static_params(cls,
144144
k_p : float, tuple, or (2,) array
145145
Pipe thermal conductivity (in W/m-K).
146146
m_flow_network : float
147-
Fluid mass flow rate into the network of boreholes.
147+
Fluid mass flow rate into the network of boreholes (in kg/s).
148148
epsilon : float
149149
Pipe roughness (in meters).
150150
fluid_str: str
@@ -164,7 +164,8 @@ def from_static_params(cls,
164164
True to treat a negative mass flow rate as the reversal of flow
165165
direction within the borehole. If False, the direction of flow is not
166166
reversed when the mass flow rate is negative, and the absolute value is
167-
used for calculations. Equals to True.
167+
used for calculations.
168+
Default is True.
168169
bore_connectivity : list, optional
169170
Index of fluid inlet into each borehole. -1 corresponds to a borehole
170171
connected to the bore field inlet. If this parameter is not provided,
@@ -174,6 +175,7 @@ def from_static_params(cls,
174175
Number of multipoles per pipe to evaluate the thermal resistances.
175176
J=1 or J=2 usually gives sufficient accuracy. J=0 corresponds to the
176177
line source approximation.
178+
Default is 2.
177179
178180
Returns
179181
-------

pygfunction/pipes.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3632,7 +3632,7 @@ def fluid_to_pipe_thermal_resistance(
36323632
Should be one of 'PipeType.COAXIAL_ANNULAR_IN', 'PipeType.COAXIAL_ANNULAR_OUT',
36333633
'PipeType.DOUBLE_UTUBE_PARALLEL', 'PipeType.DOUBLE_UTUBE_SERIES', or 'PipeType.SINGLE_UTUBE'.
36343634
m_flow_borehole : float
3635-
Fluid mass flow rate the borehole.
3635+
Fluid mass flow rate the borehole (in kg/s).
36363636
r_in : float
36373637
Inner radius (in meters) of the U-Tube pipes.
36383638
r_out : float
@@ -3642,11 +3642,12 @@ def fluid_to_pipe_thermal_resistance(
36423642
epsilon : float
36433643
Pipe roughness (in meters).
36443644
fluid : Fluid
3645-
'Fluid' class object. used for evaluating fluid properties
3645+
'Fluid' class object. Used for evaluating fluid properties
36463646
36473647
Returns
36483648
-------
3649-
fluid to pipe thermal resistance (in m-K/W)
3649+
float
3650+
fluid to pipe thermal resistance (in m-K/W)
36503651
36513652
"""
36523653

@@ -3754,7 +3755,7 @@ def fluid_to_fluid_thermal_resistance(pipe_type: PipeType, m_flow_borehole: floa
37543755
Should be one of 'PipeType.COAXIAL_ANNULAR_IN', 'PipeType.COAXIAL_ANNULAR_OUT',
37553756
'PipeType.DOUBLE_UTUBE_PARALLEL', 'PipeType.DOUBLE_UTUBE_SERIES', or 'PipeType.SINGLE_UTUBE'.
37563757
m_flow_borehole : float
3757-
Fluid mass flow rate the borehole.
3758+
Fluid mass flow rate the borehole (in kg/s).
37583759
r_in : float
37593760
Inner radius (in meters) of the U-Tube pipes.
37603761
r_out : float
@@ -3764,11 +3765,12 @@ def fluid_to_fluid_thermal_resistance(pipe_type: PipeType, m_flow_borehole: floa
37643765
epsilon : float
37653766
Pipe roughness (in meters).
37663767
fluid : Fluid
3767-
'Fluid' class object. used for evaluating fluid properties
3768+
'Fluid' class object. Used for evaluating fluid properties
37683769
37693770
Returns
37703771
-------
3771-
fluid to fluid thermal resistance (in m-K/W)
3772+
float
3773+
fluid to fluid thermal resistance (in m-K/W)
37723774
37733775
"""
37743776

0 commit comments

Comments
 (0)