Skip to content

Fix array assignment to scalar in load aggregation #316

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 1 commit into from
Apr 22, 2025
Merged

Fix array assignment to scalar in load aggregation #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
* [Issue 282](https://github.com/MassimoCimmino/pygfunction/issues/282) - Enabled the use of negative mass flow rates in `Pipe` and `Network` classes to model reversed flow direction.
* [Pull Request 308](https://github.com/MassimoCimmino/pygfunction/pull/308) - Introduced a new `borefield` module. The new `Borefield` class replaces lists of `Borehole` objects as the preferred way to configure bore fields. The `Borefield.evaluate_g_function` method evaluates g-functions using the 'UHTR' and 'UBWT' boundary conditions. Deprecated bore field creation functions in the `boreholes` module (e.g. `boreholes.rectangle_field()`). These functions are replaced by methods of the new `Borefield` class. They will be removed in `v3.0.0`.

### Bug fixes

* [Issue 305](https://github.com/MassimoCimmino/pygfunction/issues/305) - Fixed `ClaessonJaved` to return a float when the *g*-function is a vector (i.e. when there is only one heat source). This is required for compatibility with `numpy` version `2.x`.

### Other changes

* [Issue 312](https://github.com/MassimoCimmino/pygfunction/issues/312) - The installation of `matplotlib` is now optional. Using `pip install pygfunction` will not install `matplotlib` and `pip install pygfunction[plot]` should be used instead.
Expand Down
6 changes: 6 additions & 0 deletions pygfunction/load_aggregation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,10 @@ def initialize(self, g_d):
If nSources=1, g_d can be 1 dimensional.

"""
if g_d.ndim == 1:
self._scalar_output = True
else:
self._scalar_output = False
if self.nSources==1:
g_d = g_d.reshape(1, 1, -1)
# Build matrix of thermal response factor increments
Expand Down Expand Up @@ -187,6 +191,8 @@ def temporal_superposition(self):
# deltaT += (self.dg[:,:,i]).dot(self.q_b[:,i])

deltaT = np.einsum('ijk,jk', self.dg, self.q_b)
if self._scalar_output:
deltaT = deltaT.item()
return deltaT

def _build_cells(self, dt, tmax, nSources, cells_per_level):
Expand Down