raise valueerror

Author: wholmgren

pvlib/atmosphere.py

@@ -6,9 +6,6 @@
 
 from __future__ import division
 
-import logging
-pvl_logger = logging.getLogger('pvlib')
-
 import numpy as np
 
 APPARENT_ZENITH_MODELS = ('simple', 'kasten1966', 'kastenyoung1989',
@@ -238,10 +235,7 @@ def relativeairmass(zenith, model='kastenyoung1989'):
         AM = ( 1.0 / (np.cos(zenith_rad) +
             0.00176759*(z)*((94.37515 - z) ** - 1.21563)) )
     else:
-        pvl_logger.warning("%s is not a valid model type for relative airmass. The 'kastenyoung1989' model was used.",
-                           model)
-        AM = ( 1.0 / (np.cos(zenith_rad) +
-            0.50572*(((6.07995 + (90 - z)) ** - 1.6364))) )
+        raise ValueError('%s is not a valid model for relativeairmass', model)
 
     try:
         AM[z > 90] = np.nan

pvlib/test/test_atmosphere.py

@@ -38,7 +38,7 @@ def test_alt2press():
 # two functions combined will generate unique unit tests for each model
 def test_airmasses():
     models = ['simple', 'kasten1966', 'youngirvine1967', 'kastenyoung1989',
-              'gueymard1993', 'young1994', 'pickering2002', 'invalid']
+              'gueymard1993', 'young1994', 'pickering2002']
     for model in models:
         yield run_airmass, model, ephem_data['zenith']
 
@@ -47,6 +47,11 @@ def run_airmass(model, zenith):
     atmosphere.relativeairmass(zenith, model)
 
 
+@raises(ValueError)
+def test_airmass_invalid():
+    atmosphere.relativeairmass(ephem_data['zenith'], 'invalid')
+
+
 def test_absoluteairmass():
     relative_am = atmosphere.relativeairmass(ephem_data['zenith'], 'simple')
     atmosphere.absoluteairmass(relative_am)