PEP 8

test/comp_utest.py

@@ -4,7 +4,8 @@ import unittest as ut
 import numpy.testing as nt
 import numpy as np
 import numpy.ma as ma
-import os, sys
+import os
+import sys
 import subprocess
 
 from netCDF4 import Dataset as nc
@@ -21,7 +22,6 @@ NCGROUP = [NCFILE, NCFILE, NCFILE]
 if sys.version_info > (3,):
     xrange = range
 
-
 ROUTINE_MAP = {"avo": avo,
                "eth": eth,
                "cape_2d": cape_2d,
@@ -42,15 +42,16 @@ ROUTINE_MAP = {"avo" : avo,
                "uvmet": uvmet,
                "cloudfrac": cloudfrac}
 
+
 class ProjectionError(RuntimeError):
     pass
 
+
 def get_args(varname, wrfnc, timeidx, method, squeeze):
     if varname == "avo":
-        ncvars = extract_vars(wrfnc, timeidx, ("U", "V", "MAPFAC_U",
-                                           "MAPFAC_V", "MAPFAC_M",
-                                           "F"),
-                          method, squeeze, cache=None, meta=True)
+        varnames = ("U", "V", "MAPFAC_U", "MAPFAC_V", "MAPFAC_M", "F")
+        ncvars = extract_vars(wrfnc, timeidx, varnames, method, squeeze,
+                              cache=None, meta=True)
 
         attrs = extract_global_attrs(wrfnc, attrs=("DX", "DY"))
         u = ncvars["U"]
@@ -66,10 +67,10 @@ def get_args(varname, wrfnc, timeidx, method, squeeze):
         return (u, v, msfu, msfv, msfm, cor, dx, dy)
 
     if varname == "pvo":
-        ncvars = extract_vars(wrfnc, timeidx, ("U", "V", "T", "P",
-                                           "PB", "MAPFAC_U",
-                                           "MAPFAC_V", "MAPFAC_M",
-                                           "F"),
+        varnames = ("U", "V", "T", "P", "PB", "MAPFAC_U", "MAPFAC_V",
+                    "MAPFAC_M", "F")
+        ncvars = extract_vars(wrfnc, timeidx,
+                              varnames,
                               method, squeeze, cache=None, meta=True)
         attrs = extract_global_attrs(wrfnc, attrs=("DX", "DY"))
 
@@ -269,8 +270,9 @@ def get_args(varname, wrfnc, timeidx, method, squeeze):
         return (u, v, z, ter)
 
     if varname == "updraft_helicity":
-        ncvars = extract_vars(wrfnc, timeidx, ("W", "PH", "PHB", "MAPFAC_M"),
-                          method, squeeze, cache=None, meta=True)
+        varnames = ("W", "PH", "PHB", "MAPFAC_M")
+        ncvars = extract_vars(wrfnc, timeidx, varnames, method, squeeze,
+                              cache=None, meta=True)
 
         wstag = ncvars["W"]
         ph = ncvars["PH"]
@@ -463,15 +465,16 @@ def get_args(varname, wrfnc, timeidx, method, squeeze):
                 lon_attrs = extract_global_attrs(wrfnc, attrs="STAND_LON")
             except AttributeError:
                 try:
-                    cen_lon_attrs = extract_global_attrs(wrfnc, attrs="CEN_LON")
+                    cen_lon_attrs = extract_global_attrs(wrfnc,
+                                                         attrs="CEN_LON")
                 except AttributeError:
-                    raise RuntimeError("longitude attributes not found in NetCDF")
+                    raise RuntimeError("longitude attributes not found in "
+                                       "NetCDF")
                 else:
                     cen_lon = cen_lon_attrs["CEN_LON"]
             else:
                 cen_lon = lon_attrs["STAND_LON"]
 
-            
             varname = "XLAT"
             xlat_var = extract_vars(wrfnc, timeidx, varname,
                                     method, squeeze, cache=None, meta=True)
@@ -488,8 +491,10 @@ def get_args(varname, wrfnc, timeidx, method, squeeze):
                     cone = (log(cos(true_lat1 * radians_per_degree))
                             - log(cos(true_lat2 * radians_per_degree)))
                     cone = (cone /
-                            (log(tan((45.-fabs(true_lat1/2.))*radians_per_degree)) 
-                        - log(tan((45.-fabs(true_lat2/2.))*radians_per_degree)))) 
+                            (log(tan((45.-fabs(true_lat1/2.)) *
+                                     radians_per_degree))
+                                - log(tan((45.-fabs(true_lat2/2.)) *
+                                          radians_per_degree))))
                 else:
                     cone = sin(fabs(true_lat1) * radians_per_degree)
             else:
@@ -499,8 +504,10 @@ def get_args(varname, wrfnc, timeidx, method, squeeze):
 
     if varname == "cloudfrac":
         from wrf.g_geoht import get_height
-        vars = extract_vars(wrfnc, timeidx, ("P", "PB", "QVAPOR", "T"), 
-                          method, squeeze, cache=None, meta=True)
+
+        varnames = ("P", "PB", "QVAPOR", "T")
+        vars = extract_vars(wrfnc, timeidx, varnames, method, squeeze,
+                            cache=None, meta=True)
 
         p = vars["P"]
         pb = vars["PB"]
@@ -522,6 +529,7 @@ def get_args(varname, wrfnc, timeidx, method, squeeze):
 class WRFVarsTest(ut.TestCase):
     longMessage = True
 
+
 def make_func(varname, wrfnc, timeidx, method, squeeze, meta):
     def func(self):
 
@@ -651,6 +659,7 @@ def test_cape2d_1d(wrfnc):
 
     return func
 
+
 if __name__ == "__main__":
     from wrf import (omp_set_num_threads, omp_set_schedule, omp_get_schedule,
                      omp_set_dynamic, omp_get_num_procs, OMP_SCHED_STATIC)
@@ -664,11 +673,6 @@ if __name__ == "__main__":
                 "theta", "tk", "tv", "twb", "updraft_helicity", "ua", "va",
                 "wa", "uvmet10", "uvmet", "z", "cloudfrac"]
 
-    #varnames = ["helicity"]
-    varnames=["avo", "pvo", "eth", "dbz", "helicity", "updraft_helicity",
-              "omg", "pw", "rh", "slp", "td", "tk", "tv", "twb", "uvmet",
-              "cloudfrac", "ctt"]
-    
     omp_set_num_threads(omp_get_num_procs()-1)
     omp_set_schedule(OMP_SCHED_STATIC, 0)
     omp_set_dynamic(False)
@@ -686,10 +690,11 @@ if __name__ == "__main__":
                                              squeeze, meta)
                             ncname = "single" if i == 0 else "multi"
                             timename = "t0" if j == 0 else "all"
-                            squeeze_name = "squeeze" if squeeze else "nosqueeze"
+                            squeeze_name = ("squeeze" if squeeze
+                                            else "nosqueeze")
                             meta_name = "meta" if meta else "nometa"
-                            test_name = "test_{}_{}_{}_{}_{}_{}".format(varname, 
-                                                        ncname, timename, method,
+                            test_name = "test_{}_{}_{}_{}_{}_{}".format(
+                                varname, ncname, timename, method,
                                 squeeze_name, meta_name)
 
                             setattr(WRFVarsTest, test_name, func)
@@ -700,7 +705,4 @@ if __name__ == "__main__":
     func = test_cape2d_1d(wrfnc)
     setattr(WRFVarsTest, "test_cape2d_1d", func)
 
-    
     ut.main()
-    
-