Skip to content

Commit 443d866

Browse files
Merge pull request #329 from MassimoCimmino/issue327_version-2-3-1
Issue327 version 2 3 1
2 parents 0ca4ef8 + b8e1dde commit 443d866

File tree

4 files changed

+9
-1
lines changed

4 files changed

+9
-1
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ on:
55
branches:
66
- master
77
- maintenance/2.2.x
8+
- maintenance/2.3.x
89
pull_request:
910
branches:
1011
- master
1112
- maintenance/2.2.x
13+
- maintenance/2.3.x
1214
types: [opened, synchronize, reopened]
1315

1416
jobs:

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
## Version 2.4 (in development)
44

5+
## Version 2.3.1 (2025-08-04)
6+
57
### New features
68

79
* [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`.

pygfunction/gfunction.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,11 +372,13 @@ def from_static_params(cls,
372372
Pipe thermal conductivity (in W/m-K).
373373
fluid_str: str, optional
374374
The mixer for this application should be one of:
375+
375376
- 'Water' - Complete water solution
376377
- 'MEG' - Ethylene glycol mixed with water
377378
- 'MPG' - Propylene glycol mixed with water
378379
- 'MEA' - Ethanol mixed with water
379380
- 'MMA' - Methanol mixed with water
381+
380382
fluid_concentration_pct: float, optional
381383
Mass fraction of the mixing fluid added to water (in %).
382384
Lower bound = 0. Upper bound is dependent on the mixture.

pygfunction/networks.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,13 +147,15 @@ def from_static_params(cls,
147147
Fluid mass flow rate into the network of boreholes (in kg/s).
148148
epsilon : float
149149
Pipe roughness (in meters).
150-
fluid_str: str
150+
fluid_str: str
151151
The mixer for this application should be one of:
152+
152153
- 'Water' - Complete water solution
153154
- 'MEG' - Ethylene glycol mixed with water
154155
- 'MPG' - Propylene glycol mixed with water
155156
- 'MEA' - Ethanol mixed with water
156157
- 'MMA' - Methanol mixed with water
158+
157159
fluid_concentration_pct: float
158160
Mass fraction of the mixing fluid added to water (in %).
159161
Lower bound = 0. Upper bound is dependent on the mixture.

0 commit comments

Comments
 (0)