Skip to content

Issue327 version 2 3 1 #329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MassimoCimmino merged 3 commits into from
Aug 4, 2025
Merged

Issue327 version 2 3 1 #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2738cba
Add maintenance/2.3.x to tests
MassimoCimmino Jul 31, 2025
6c8aed7
Increment pygfunction version in CHANGELOG
MassimoCimmino Jul 31, 2025
b8e1dde
Fix warnings in doc
MassimoCimmino Jul 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ on:
branches:
- master
- maintenance/2.2.x
- maintenance/2.3.x
pull_request:
branches:
- master
- maintenance/2.2.x
- maintenance/2.3.x
types: [opened, synchronize, reopened]

jobs:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## Version 2.4 (in development)

## Version 2.3.1 (2025-08-04)

### New features

* [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`.
Expand Down
2 changes: 2 additions & 0 deletions pygfunction/gfunction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,11 +372,13 @@ def from_static_params(cls,
Pipe thermal conductivity (in W/m-K).
fluid_str: str, optional
The mixer for this application should be one of:

- 'Water' - Complete water solution
- 'MEG' - Ethylene glycol mixed with water
- 'MPG' - Propylene glycol mixed with water
- 'MEA' - Ethanol mixed with water
- 'MMA' - Methanol mixed with water

fluid_concentration_pct: float, optional
Mass fraction of the mixing fluid added to water (in %).
Lower bound = 0. Upper bound is dependent on the mixture.
Expand Down
4 changes: 3 additions & 1 deletion pygfunction/networks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,15 @@ def from_static_params(cls,
Fluid mass flow rate into the network of boreholes (in kg/s).
epsilon : float
Pipe roughness (in meters).
fluid_str: str
fluid_str: str
The mixer for this application should be one of:

- 'Water' - Complete water solution
- 'MEG' - Ethylene glycol mixed with water
- 'MPG' - Propylene glycol mixed with water
- 'MEA' - Ethanol mixed with water
- 'MMA' - Methanol mixed with water

fluid_concentration_pct: float
Mass fraction of the mixing fluid added to water (in %).
Lower bound = 0. Upper bound is dependent on the mixture.
Expand Down