Skip to content

add Boyle/Coello (Humboldt State Univ) soiling model #850

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
merged 23 commits into from
Jan 17, 2020
Merged

add Boyle/Coello (Humboldt State Univ) soiling model #850

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
64d3169
initial_commit_Boyle_Coello_soiling_model
nappaillav Jan 9, 2020
501d48c
stickler-ci_correction
nappaillav Jan 10, 2020
c63ca7c
E128_Error
nappaillav Jan 10, 2020
0677b6c
E128_Error
nappaillav Jan 10, 2020
586b6b9
E128_Error
nappaillav Jan 10, 2020
114148d
format_corrections
nappaillav Jan 11, 2020
23e9042
updated soiling_hsu
nappaillav Jan 15, 2020
619b1a4
updated soiling_hsu
nappaillav Jan 15, 2020
cd8f7d6
added unit test
nappaillav Jan 15, 2020
49d29ef
added unit test
nappaillav Jan 16, 2020
b75a690
added unit test
nappaillav Jan 16, 2020
5752479
added unit test
nappaillav Jan 16, 2020
c0a245b
added unit test
nappaillav Jan 16, 2020
ed375f3
corrections_to_test_losses
nappaillav Jan 16, 2020
0e5a529
corrections_to_test_losses
nappaillav Jan 16, 2020
b3e2e61
cleaning Test function
nappaillav Jan 16, 2020
45c7920
cleaning Test function
nappaillav Jan 16, 2020
e83f568
cleaning Test function
nappaillav Jan 17, 2020
2efe2d1
update api.rst, whatsnew
cwhanse Jan 17, 2020
23cf4ad
Merge branch 'master' into soiling_model
cwhanse Jan 17, 2020
920d77b
merge_correction
nappaillav Jan 17, 2020
e331f19
merge_corrections
nappaillav Jan 17, 2020
cfa5a0f
updated_init
nappaillav Jan 17, 2020
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
19 changes: 10 additions & 9 deletions pvlib/losses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,30 @@
import pandas as pd
from pvlib.tools import cosd


def erf(x):
"""
Calculates the ERF function
Calculates the ERF function

Parameters
----------
x : numeric
Input value/array
Input value/array

Returns
-------
erf : numeric
The values of the error function at the given points x.
The values of the error function at the given points x.

"""


# constants
a1 = 0.254829592
a1 = 0.254829592
a2 = -0.284496736
a3 = 1.421413741
a3 = 1.421413741
a4 = -1.453152027
a5 = 1.061405429
p = 0.3275911
a5 = 1.061405429
p = 0.3275911

# Save the sign of x
sign = 1
Expand All @@ -45,6 +45,7 @@ def erf(x):

return sign*y


def soiling_hsu(rainfall, cleaning_threshold, tilt, pm2_5, pm10,
depo_veloc={'2_5': 0.004, '10': 0.0009},
rain_accum_period=pd.Timedelta('1h')):
Expand Down Expand Up @@ -114,6 +115,6 @@ def soiling_hsu(rainfall, cleaning_threshold, tilt, pm2_5, pm10,
mass_removed[cleaning_times] = mass_no_cleaning[cleaning_times]
accum_mass = mass_no_cleaning - mass_removed.ffill()

soiling_ratio = 1 - 0.3437 * math.erf(0.17 * accum_mass**0.8473)
soiling_ratio = 1 - 0.3437 * erf(0.17 * accum_mass**0.8473)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh bother. It appears I've sent you off on a fruitless chase, please accept my apologies. I have numpy.erf in my local namespace but its not part of numpy: discussion here. I need to figure out how numpy.erf was added and undo it.

Rather than add an erf function to pvlib, we should use scipy.special.erf as you originally coded.

To fix the test errors, add the following lines to test_losses.py:

at the head:
from pvlib.test.conftest import requires_scipy

on the line preceding def test_soiling_hsu():
@requires_scipy

Example here.

Again, I'm very sorry that I failed to confirm numpy.erf in the numpy documentation.

Copy link
Contributor Author

@nappaillav nappaillav Jan 16, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not a problem, It was always a great learning experience for me.


return soiling_ratio