Skip to content

Commit 726cf07

Browse files
KonstantinTrwholmgren
authored andcommitted
removes unused pressure arg from Irradiance.liujordan function (#389)
* fix for issue #343 Now, passed 'offset' parameter are used instead of it's default value. * test for issue #343 * solar_position_method passed to basic_chain wasn't used causing execution of solarposition.get_solarposition with default 'nrel_numpy' value in all cases. * Update modelchain.py doc string fixes for modelchain.basic_chain function * Update v0.5.1.rst * Update v0.5.1.rst * Update v0.5.1.rst * Update v0.5.1.rst * Update v0.5.1.rst * fix for issue #386 * what's new for issue #386 * test update for issue #386 * Update conftest.py * Update test_irradiance.py * Update v0.5.2.rst * Update v0.5.2.rst
1 parent 1182c8e commit 726cf07

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

docs/sphinx/source/whatsnew/v0.5.2.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ v0.5.2 (__, 2017)
55

66
API Changes
77
~~~~~~~~~~~
8-
*
8+
* removed unused 'pressure' arg from irradiance.liujordan function (:issue:`386`)
99

1010
Enhancements
1111
~~~~~~~~~~~~

pvlib/irradiance.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1489,8 +1489,7 @@ def erbs(ghi, zenith, doy):
14891489
return data
14901490

14911491

1492-
def liujordan(zenith, transmittance, airmass, pressure=101325.,
1493-
dni_extra=1367.0):
1492+
def liujordan(zenith, transmittance, airmass, dni_extra=1367.0):
14941493
'''
14951494
Determine DNI, DHI, GHI from extraterrestrial flux, transmittance,
14961495
and optical air mass number.
@@ -1531,10 +1530,10 @@ def liujordan(zenith, transmittance, airmass, pressure=101325.,
15311530
radiation". Solar Energy 4:1-19
15321531
'''
15331532

1534-
tao = transmittance
1533+
tau = transmittance
15351534

1536-
dni = dni_extra*tao**airmass
1537-
dhi = 0.3 * (1.0 - tao**airmass) * dni_extra * np.cos(np.radians(zenith))
1535+
dni = dni_extra*tau**airmass
1536+
dhi = 0.3 * (1.0 - tau**airmass) * dni_extra * np.cos(np.radians(zenith))
15381537
ghi = dhi + dni * np.cos(np.radians(zenith))
15391538

15401539
irrads = OrderedDict()

pvlib/test/test_irradiance.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,8 +201,7 @@ def test_liujordan():
201201
columns=['ghi', 'dni', 'dhi'],
202202
index=[0])
203203
out = irradiance.liujordan(
204-
pd.Series([10]), pd.Series([0.5]), pd.Series([1.1]),
205-
pressure=93000., dni_extra=1400)
204+
pd.Series([10]), pd.Series([0.5]), pd.Series([1.1]), dni_extra=1400)
206205
assert_frame_equal(out, expected)
207206

208207

0 commit comments

Comments
 (0)