more cleanup from ineichen refactor

Author: wholmgren

pvlib/modelchain.py

@@ -141,12 +141,13 @@ def basic_chain(times, latitude, longitude,
                                solar_position['azimuth'])
 
     if irradiance is None:
+        linke_turbidity = clearsky.lookup_linke_turbidity(
+            solar_position.index, latitude, longitude)
         irradiance = clearsky.ineichen(
-            solar_position.index,
-            latitude,
-            longitude,
-            zenith_data=solar_position['apparent_zenith'],
-            airmass_data=airmass,
+            solar_position['apparent_zenith'],
+            airmass,
+            linke_turbidity,
+            dni_extra=dni_extra,
             altitude=altitude)
 
     total_irrad = pvlib.irradiance.total_irrad(

pvlib/test/test_irradiance.py

@@ -24,9 +24,7 @@
 ephem_data = solarposition.get_solarposition(
     times, tus.latitude, tus.longitude, method='nrel_numpy')
 
-irrad_data = clearsky.ineichen(times, tus.latitude, tus.longitude,
-                               altitude=tus.altitude, linke_turbidity=3,
-                               solarposition_method='nrel_numpy')
+irrad_data = tus.get_clearsky(times, model='ineichen', linke_turbidity=3)
 
 dni_et = irradiance.extraradiation(times.dayofyear)
 
@@ -177,8 +175,8 @@ def test_globalinplane():
 
 
 def test_disc_keys():
-    clearsky_data = clearsky.ineichen(times, tus.latitude, tus.longitude,
-                                      linke_turbidity=3)
+    clearsky_data = tus.get_clearsky(times, model='ineichen',
+                                     linke_turbidity=3)
     disc_data = irradiance.disc(clearsky_data['ghi'], ephem_data['zenith'],
                                 ephem_data.index)
     assert 'dni' in disc_data.columns
@@ -197,8 +195,8 @@ def test_disc_value():
 
 
 def test_dirint():
-    clearsky_data = clearsky.ineichen(times, tus.latitude, tus.longitude,
-                                      linke_turbidity=3)
+    clearsky_data = tus.get_clearsky(times, model='ineichen',
+                                     linke_turbidity=3)
     pressure = 93193.
     dirint_data = irradiance.dirint(clearsky_data['ghi'], ephem_data['zenith'],
                                     ephem_data.index, pressure=pressure)

pvlib/test/test_pvsystem.py

@@ -29,12 +29,12 @@
                                              latitude=latitude,
                                              longitude=longitude,
                                              method='nrel_numpy')
-irrad_data = clearsky.ineichen(times, latitude=latitude, longitude=longitude,
-                               linke_turbidity=3,
-                               solarposition_method='nrel_numpy')
+am = atmosphere.relativeairmass(ephem_data.apparent_zenith)
+irrad_data = clearsky.ineichen(ephem_data['apparent_zenith'], am,
+                               linke_turbidity=3)
 aoi = irradiance.aoi(0, 0, ephem_data['apparent_zenith'],
                      ephem_data['azimuth'])
-am = atmosphere.relativeairmass(ephem_data.apparent_zenith)
+
 
 meta = {'latitude': 37.8,
         'longitude': -122.3,