@@ -1063,7 +1063,7 @@ def test_dirindex(times):
10631063 np .array ([0. , 79.73860422 , 1042.48031487 , 257.20751138 ]),
10641064 index = times
10651065 )
1066- dni_clearsky = pd .Series (
1066+ dni_clear = pd .Series (
10671067 np .array ([0. , 316.1949056 , 939.95469881 , 646.22886049 ]),
10681068 index = times
10691069 )
@@ -1073,7 +1073,7 @@ def test_dirindex(times):
10731073 )
10741074 pressure = 93193.
10751075 tdew = 10.
1076- out = irradiance .dirindex (ghi , ghi_clearsky , dni_clearsky ,
1076+ out = irradiance .dirindex (ghi , ghi_clearsky , dni_clear ,
10771077 zenith , times , pressure = pressure ,
10781078 temp_dew = tdew )
10791079 dirint_close_values = irradiance .dirint (ghi , zenith , times ,
@@ -1101,25 +1101,25 @@ def test_dirindex_min_cos_zenith_max_zenith():
11011101 times = pd .DatetimeIndex (['2014-06-24T12-0700' , '2014-06-24T18-0700' ])
11021102 ghi = pd .Series ([0 , 1 ], index = times )
11031103 ghi_clearsky = pd .Series ([0 , 1 ], index = times )
1104- dni_clearsky = pd .Series ([0 , 5 ], index = times )
1104+ dni_clear = pd .Series ([0 , 5 ], index = times )
11051105 solar_zenith = pd .Series ([90 , 89.99 ], index = times )
11061106
1107- out = irradiance .dirindex (ghi , ghi_clearsky , dni_clearsky , solar_zenith ,
1107+ out = irradiance .dirindex (ghi , ghi_clearsky , dni_clear , solar_zenith ,
11081108 times )
11091109 expected = pd .Series ([nan , nan ], index = times )
11101110 assert_series_equal (out , expected )
11111111
1112- out = irradiance .dirindex (ghi , ghi_clearsky , dni_clearsky , solar_zenith ,
1112+ out = irradiance .dirindex (ghi , ghi_clearsky , dni_clear , solar_zenith ,
11131113 times , min_cos_zenith = 0 )
11141114 expected = pd .Series ([nan , nan ], index = times )
11151115 assert_series_equal (out , expected )
11161116
1117- out = irradiance .dirindex (ghi , ghi_clearsky , dni_clearsky , solar_zenith ,
1117+ out = irradiance .dirindex (ghi , ghi_clearsky , dni_clear , solar_zenith ,
11181118 times , max_zenith = 90 )
11191119 expected = pd .Series ([nan , nan ], index = times )
11201120 assert_series_equal (out , expected )
11211121
1122- out = irradiance .dirindex (ghi , ghi_clearsky , dni_clearsky , solar_zenith ,
1122+ out = irradiance .dirindex (ghi , ghi_clearsky , dni_clear , solar_zenith ,
11231123 times , min_cos_zenith = 0 , max_zenith = 100 )
11241124 expected = pd .Series ([nan , 5. ], index = times )
11251125 assert_series_equal (out , expected )
@@ -1129,10 +1129,10 @@ def test_dni():
11291129 ghi = pd .Series ([90 , 100 , 100 , 100 , 100 ])
11301130 dhi = pd .Series ([100 , 90 , 50 , 50 , 50 ])
11311131 zenith = pd .Series ([80 , 100 , 85 , 70 , 85 ])
1132- clearsky_dni = pd .Series ([50 , 50 , 200 , 50 , 300 ])
1132+ dni_clear = pd .Series ([50 , 50 , 200 , 50 , 300 ])
11331133
11341134 dni = irradiance .dni (ghi , dhi , zenith ,
1135- clearsky_dni = clearsky_dni , clearsky_tolerance = 2 )
1135+ dni_clear = dni_clear , clearsky_tolerance = 2 )
11361136 assert_series_equal (dni ,
11371137 pd .Series ([float ('nan' ), float ('nan' ), 400 ,
11381138 146.190220008 , 573.685662283 ]))
0 commit comments