-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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.
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
Correct usage of xtol
in ghi_from_poa_driesse_2023
#1971
Merged
kandersolar
merged 10 commits into
pvlib:main
from
echedey-ls:typofix-ghi_from_poa_driesse_2023-xtol
Feb 12, 2024
Merged
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
049a02d
Fix typo
echedey-ls 0128477
Add test
echedey-ls c8e4e18
why is always the linter
echedey-ls 5688c25
Update test_irradiance.py
echedey-ls 1f1cab7
Update v0.10.4.rst
echedey-ls 0433b9c
Am I faster that the linter?
echedey-ls cc32be7
Again the linter
echedey-ls 176ce65
Clear up comments
echedey-ls 2335eb2
Update irradiance.py
echedey-ls 0fd74da
Update test_irradiance.py
echedey-ls File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1557,8 +1557,8 @@ def ghi_from_poa_driesse_2023(surface_tilt, surface_azimuth, | |
albedo : numeric, default 0.25 | ||
Ground surface albedo. [unitless] | ||
xtol : numeric, default 0.01 | ||
Convergence criterion. The estimated GHI will be within xtol of the | ||
true value. [W/m^2] | ||
Convergence criterion. The estimated GHI will be within xtol of the | ||
true value. Must be positive. [W/m^2] | ||
full_output : boolean, default False | ||
If full_output is False, only ghi is returned, otherwise the return | ||
value is (ghi, converged, niter). (see Returns section for details). | ||
|
@@ -1593,13 +1593,16 @@ def ghi_from_poa_driesse_2023(surface_tilt, surface_azimuth, | |
''' | ||
# Contributed by Anton Driesse (@adriesse), PV Performance Labs. Nov., 2023 | ||
|
||
if xtol <= 0: | ||
raise ValueError(f"xtol too small ({xtol:g} <= 0)") | ||
|
||
ghi_from_poa_array = np.vectorize(_ghi_from_poa) | ||
|
||
ghi, conv, niter = ghi_from_poa_array(surface_tilt, surface_azimuth, | ||
solar_zenith, solar_azimuth, | ||
poa_global, | ||
dni_extra, airmass, albedo, | ||
xtol=0.01) | ||
xtol=xtol) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good catch! |
||
|
||
if isinstance(poa_global, pd.Series): | ||
ghi = pd.Series(ghi, poa_global.index) | ||
|
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Interestingly, the bisect docstring says nonnegative, which is inconsistent with its code.