Surface Plant time series integrations fix (Electricity Provided + other profiles final year value correction) #50
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…Wh integration (WIP)
…electricity_pumping_power. FIXME TODO WIP marked for remaining integrations to adjust.
… into SurfacePlant, SurfacePlantAGS, and SurfacePlantIndustrialHeat (other plant types remain WIP/TODO to fix still; unit tests not yet updated)
…low this commit to serve as a checkpoint that ensures unit tests are passing and results are not affected by any structural issues in refactoring.
softwareengineerprogrammer
changed the title
Comment on lines
+12
to
+32
| @staticmethod | ||
| def integrate_time_series_slice( | ||
| series: np.ndarray, | ||
| _i: int, | ||
| time_steps_per_year: int, | ||
| utilization_factor: float | ||
| ) -> np.float64: | ||
| _slice = series[(0 + _i * time_steps_per_year):((_i + 1) * time_steps_per_year) + 1] | ||
|
|
||
| # Note that len(_slice) - 1 may be less than time_steps_per_year for the last slice. | ||
|
|
||
| if len(_slice) == 1: | ||
| return _slice[0] | ||
|
|
||
| dx_steps = len(_slice) - 1 | ||
|
|
||
| return np.trapz( | ||
| _slice, | ||
| dx=1. / dx_steps * 365. * 24. | ||
| ) * 1000. * utilization_factor | ||
|
|
There was a problem hiding this comment.
The crux of this fix is that the previous behavior was doing the equivalent of erroneously setting dx_steps to time_steps_per_year. The last slices of the time series in question always have one less data point than time_steps_per_year, which was causing the trapezoidal rule to behave as if the slice had a 'phantom' entry with value=0 appended to it, thus lowering the estimated integral value of the slice.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closed in favor of #52 due to rebasing