Skip to content

Commit f872e76

Browse files
authored
Merge pull request #5 from NREL/disc_sza_fix
fix sza_lim
2 parents efd0c23 + 7b7a05e commit f872e76

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

.github/workflows/pull_request_tests.yml

-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ jobs:
1414
python-version: 3.8
1515
- os: ubuntu-latest
1616
python-version: 3.7
17-
- os: ubuntu-latest
18-
python-version: 3.6
1917

2018
steps:
2119
- uses: actions/checkout@v2

farms/disc.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
"""
1414
import numpy as np
1515

16-
from farms import SOLAR_CONSTANT, SZA_LIM
16+
from farms import SOLAR_CONSTANT
1717

1818

19-
def disc(ghi, sza, doy, pressure=101325, sza_lim=SZA_LIM):
19+
def disc(ghi, sza, doy, pressure=101325, sza_lim=87):
2020
"""Estimate DNI from GHI using the DISC model.
2121
2222
*Warning: should only be used for cloudy FARMS data.
@@ -37,7 +37,8 @@ def disc(ghi, sza, doy, pressure=101325, sza_lim=SZA_LIM):
3737
Pressure in Pascals.
3838
sza_lim : float | int
3939
Upper limit for solar zenith angle in degrees. SZA values greater than
40-
this will be truncated at this value.
40+
this will be truncated at this value. 87 deg chosen to simulate the
41+
FORTRAN code in use by SRRL (from Perez).
4142
4243
Returns
4344
-------

farms/version.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
FARMS version number
33
"""
44

5-
__version__ = "1.0.1"
5+
__version__ = "1.0.2"

0 commit comments

Comments
 (0)