PEP 8

src/wrf/api.py

@@ -110,4 +110,3 @@ __all__ += ["CoordPair"]
 __all__ += ["to_xy_coords"]
 __all__ += ["cache_item", "get_cached_item"]
 __all__ += ["__version__"]
-

src/wrf/cache.py

@@ -161,8 +161,3 @@ def _get_cache():
 
     _shrink_cache()
     return getattr(_local_storage, "cache", None)
-    
-    
-    
-        
-    

src/wrf/computation.py

@@ -15,6 +15,7 @@ from .metadecorators import (set_alg_metadata, set_uvmet_alg_metadata,
                              set_smooth_metdata)
 from .interputils import get_xy
 
+
 @set_interp_metadata("xy")
 def xy(field, pivot_point=None, angle=None, start_point=None, end_point=None,
        meta=True):
@@ -601,8 +602,8 @@ def uvmet(u, v, lat, lon, cen_long, cone, meta=True, units="m s-1"):
                   and *v*, but with rightmost dimensions south_north x
                   west_east and the same leftmost dimensions as *u* and *v*
                 - multi-dimensional with one fewer dimensions as *u* and *v*,
-                  with rightmost dimensions south_north x west_east and the same 
+                  with rightmost dimensions south_north x west_east and the
-                  leftmost dimensions as *u* and *v*, minus the 
+                  same leftmost dimensions as *u* and *v*, minus the
                   third-from-the-right dimension of *u* and *v*.
 
             Note:
@@ -622,8 +623,8 @@ def uvmet(u, v, lat, lon, cen_long, cone, meta=True, units="m s-1"):
                   and *v*, but with rightmost dimensions south_north x
                   west_east and the same leftmost dimensions as *u* and *v*
                 - multi-dimensional with one fewer dimensions as *u* and *v*,
-                  with rightmost dimensions south_north x west_east and the same 
+                  with rightmost dimensions south_north x west_east and the
-                  leftmost dimensions as *u* and *v*, minus the 
+                  same leftmost dimensions as *u* and *v*, minus the
                   third-from-the-right dimension of *u* and *v*.
 
 
@@ -1201,7 +1202,6 @@ def ctt(pres_hpa, tkel, qv, qcld, height, terrain, qice=None,
     return ma.masked_values(ctt, missing)
 
 
-
 @set_alg_metadata(3, "pres", units="dBZ",
                   description="radar reflectivity")
 def dbz(pres, tkel, qv, qr, qs=None, qg=None, use_varint=False,
@@ -1955,6 +1955,3 @@ def pw(pres, tkel, qv, height, meta=True):
     tv = _tv(tkel, qv)
 
     return _pw(pres, tv, qv, height)
-
-    
-    

src/wrf/config.py

@@ -9,6 +9,7 @@ from ._wrffortran import (fomp_enabled, fomp_set_num_threads,
 
 _local_config = local()
 
+
 def _init_local():
     global _local_config
 
@@ -191,7 +192,8 @@ def set_cache_size(size):
 
 @init_local()
 def get_cache_size():
-    """Return the maximum number of items that the threadlocal cache can retain.
+    """Return the maximum number of items that the threadlocal cache can
+    retain.
 
     Returns:
 

src/wrf/constants.py

@@ -10,9 +10,11 @@ from ._wrffortran import wrf_constants, omp_constants
 #: Indicates that all times should be used in a diagnostic routine.
 ALL_TIMES = None
 
+
 class Constants(object):
     pass
 
+
 for key, val in viewitems(wrf_constants.__dict__):
     setattr(Constants, key.upper(), np.asscalar(val))
 
@@ -44,10 +46,11 @@ class ProjectionTypes(object):
     MERCATOR = 3
     LAT_LON = 6
 
+
 # Create the default fill mapping based on type.
 _DEFAULT_FILL_MAP = {None: Constants.DEFAULT_FILL,
                      np.dtype(np.bool_): False,
-                     np.dtype(np.intc) : Constants.DEFAULT_FILL_INT32, # Usually true
+                     np.dtype(np.intc): Constants.DEFAULT_FILL_INT32,
                      np.dtype(np.int8): Constants.DEFAULT_FILL_INT8,
                      np.dtype(np.uint8): 255,
                      np.dtype(np.int16): Constants.DEFAULT_FILL_INT16,
@@ -76,9 +79,3 @@ else:
 def default_fill(dtype=None):
     dt = np.dtype(dtype) if dtype is not None else None
     return _DEFAULT_FILL_MAP.get(dt, Constants.DEFAULT_FILL)
-    
-    
-    
-    
-    
-    

src/wrf/coordpair.py

@@ -35,13 +35,13 @@ def _binary_operator(operator):
 
         """
         if isinstance(other, CoordPair):
-            args = [
+            args = [None if getattr(self, attr) is None or
-            None if getattr(self, attr) is None or getattr(other, attr) is None 
+                    getattr(other, attr) is None else
-            else getattr(getattr(self, attr), operator)(getattr(other, attr))      
+                    getattr(getattr(self, attr), operator)(getattr(other,
+                                                                   attr))
                     for attr in ("x", "y", "lat", "lon")]
         else:
-            args = [
+            args = [None if getattr(self, attr) is None
-            None if getattr(self, attr) is None 
                     else getattr(getattr(self, attr), operator)(other)
                     for attr in ("x", "y", "lat", "lon")]
 
@@ -151,7 +151,6 @@ class CoordPair(object):
         self.lat = lat
         self.lon = lon
 
-        
     def __repr__(self):
         args = []
         if self.x is not None:
@@ -166,11 +165,9 @@ class CoordPair(object):
 
         return "{}({})".format(self.__class__.__name__, argstr)
 
-    
     def __str__(self):
         return self.__repr__()
 
-    
     def xy_str(self, fmt="{:.4f}, {:.4f}"):
         """Return a :obj:`str` for the (x,y) coordinate pair.
 
@@ -188,7 +185,6 @@ class CoordPair(object):
 
         return fmt.format(self.x, self.y)
 
-    
     def latlon_str(self, fmt="{:.4f}, {:.4f}"):
         """Return a :obj:`str` for the (latitude, longitude) coordinate pair.
 
@@ -206,7 +202,6 @@ class CoordPair(object):
 
         return fmt.format(self.lat, self.lon)
 
-       
     def __round__(self, ndigits=None):
         """Return a new :class:`CoordPair` object with all coordinate values
         rounded to the nearest integer.
@@ -226,23 +221,20 @@ class CoordPair(object):
 
         return CoordPair(*args)
 
-    
     def __pow__(self, other, modulo=None):
         if isinstance(other, CoordPair):
-            args = [
+            args = [None if getattr(self, attr) is None or
-            None if getattr(self, attr) is None or getattr(other, attr) is None 
+                    getattr(other, attr) is None
-            else getattr(getattr(self, attr), "__pow__")(getattr(other, attr),
+                    else getattr(getattr(self, attr), "__pow__")(
-                                                        modulo)      
+                        getattr(other, attr), modulo)
                     for attr in ("x", "y", "lat", "lon")]
         else:
-            args = [
+            args = [None if getattr(self, attr) is None
-            None if getattr(self, attr) is None 
                     else getattr(getattr(self, attr), "__pow__")(other, modulo)
                     for attr in ("x", "y", "lat", "lon")]
 
         return CoordPair(*args)
 
-    
     def __rpow__(self, other):
         return self.__pow__(other)
 
@@ -260,6 +252,3 @@ for operator in ("__neg__", "__pos__", "__abs__", "__invert__"):
 
 for operator in ("__lt__", "__le__", "__eq__", "__ne__", "__gt__", "__ge__"):
     setattr(CoordPair, operator, _cmp_operator(operator))
-    
-    
-    

src/wrf/decorators.py

@@ -15,6 +15,7 @@ from .constants import default_fill
 if xarray_enabled():
     from xarray import DataArray
 
+
 def convert_units(unit_type, alg_unit):
     """A decorator that converts the units from the wrapped function's output.
 
@@ -47,17 +48,6 @@ def convert_units(unit_type, alg_unit):
     return func_wrapper
 
 
-#def _calc_out_dims(outvar, left_dims):
-#    """
-#    
-#    """
-#    #left_dims = [x for x in left_dims]
-#    #right_dims = [x for x in outvar.shape]
-#    #return left_dims + right_dims 
-#
-#    return left_dims + outvar.shape
-        
-
 def left_iteration(ref_var_expected_dims,
                    ref_var_right_ndims,
                    insert_dims=None,
@@ -171,7 +161,6 @@ def left_iteration(ref_var_expected_dims,
             # the right (e.g. [1,1,:])
             left_and_slice_idxs = left_idxs + (slice(None), )
 
-            
             # Slice the args if applicable
             new_args = [arg[left_and_slice_idxs]
                         if i not in _ignore_args else arg
@@ -222,14 +211,11 @@ def left_iteration(ref_var_expected_dims,
                     outview.__array_interface__["data"][0]):
                 raise RuntimeError("output array was copied")
 
-        
         if len(outd) == 1:
             output = next(iter(viewvalues(outd)))
         else:
             output = tuple(arr for arr in viewvalues(outd))
 
-        
-        
         if cast_output:
             if isinstance(output, np.ndarray):
                 output = output.astype(ref_var_dtype)
@@ -262,8 +248,8 @@ def cast_type(ref_idx=0, arg_idxs=None, karg_names=None,
             positional arguments to be used as the reference variable for
             determining the :class:`numpy.dtype` to return.  Default is 0.
 
-        arg_idxs (sequence of :obj:`int`, optional): A sequence of indexes in the 
+        arg_idxs (sequence of :obj:`int`, optional): A sequence of indexes in
-            wrapped function's positional arguments that indicate which 
+            the wrapped function's positional arguments that indicate which
             arguments to cast.  Must be specified if *karg_names* is None.
             Default is None.
 
@@ -272,8 +258,8 @@ def cast_type(ref_idx=0, arg_idxs=None, karg_names=None,
             arguments to cast.  Must be specified if *arg_idxs* is None.
             Default is None.
 
-        alg_dtype (:class:`numpy.dtype` or :obj:`str`): The numpy data type used 
+        alg_dtype (:class:`numpy.dtype` or :obj:`str`): The numpy data type
-            in the wrapped function.
+            used in the wrapped function.
 
         outviews (:obj:`str` or a sequence): A single key or sequence of keys
             that indicate the wrapped function's keyword argument to use
@@ -300,7 +286,6 @@ def cast_type(ref_idx=0, arg_idxs=None, karg_names=None,
             if _outview is not None:
                 has_outview = True
 
-        
         orig_type = args[ref_idx].dtype
 
         new_args = [arg.astype(alg_dtype)
@@ -498,7 +483,8 @@ def check_args(refvaridx, refvarndim, rightdims, stagger=None,
             # Check that the number of dims is correct
             if (var.ndim - extra_dims != right_var_ndims):
                 raise ValueError("invalid number of dimensions for argument "
-                                 "{} (got {}, expected {}).".format(i, 
+                                 "{} (got {}, expected {}).".format(
+                                     i,
                                      var.ndim,
                                      right_var_ndims + extra_dims))
 
@@ -517,19 +503,11 @@ def check_args(refvaridx, refvarndim, rightdims, stagger=None,
                     ref_right_sizes[-right_var_ndims:]):
 
                 raise ValueError("invalid shape for argument "
-                                 "{} (got {}, expected {})".format(i, 
+                                 "{} (got {}, expected {})".format(
+                                     i,
                                      var.shape[-right_var_ndims:],
                                      ref_right_sizes[-right_var_ndims:]))
 
         return wrapped(*args, **kwargs)
 
     return func_wrapper
-
-
-    
-
-
-    
-    
-
-

src/wrf/destag.py

@@ -60,5 +60,3 @@ def destagger(var, stagger_dim, meta=False):
     result = .5*(var[tuple(dim_ranges_1)] + var[tuple(dim_ranges_2)])
 
     return result
-
-    

src/wrf/extension.py

@@ -5,20 +5,21 @@ import numpy as np
 from .constants import Constants, default_fill
 
 from wrf._wrffortran import (dcomputetk, dinterp3dz, dinterp2dxy, dinterp1d,
-                          dcomputeseaprs, dfilter2d, dcomputerh, dcomputeuvmet,
+                             dcomputeseaprs, dfilter2d, dcomputerh,
-                          dcomputetd, dcapecalc2d, dcapecalc3d, dcloudfrac2, 
+                             dcomputeuvmet, dcomputetd, dcapecalc2d,
-                          wrfcttcalc, calcdbz, dcalrelhl, dcalcuh, dcomputepv, 
+                             dcapecalc3d, dcloudfrac2, wrfcttcalc, calcdbz,
-                          dcomputeabsvort, dlltoij, dijtoll, deqthecalc,
+                             dcalrelhl, dcalcuh, dcomputepv, dcomputeabsvort,
-                          omgcalc, virtual_temp, wetbulbcalc, dcomputepw,
+                             dlltoij, dijtoll, deqthecalc, omgcalc,
+                             virtual_temp, wetbulbcalc, dcomputepw,
                              wrf_monotonic, wrf_vintrp, dcomputewspd,
                              dcomputewdir, dinterp3dz_2dlev,
                              fomp_set_num_threads, fomp_get_num_threads,
                              fomp_get_max_threads, fomp_get_thread_num,
                              fomp_get_num_procs, fomp_in_parallel,
-                          fomp_set_dynamic, fomp_get_dynamic, fomp_set_nested,
+                             fomp_set_dynamic, fomp_get_dynamic,
-                          fomp_get_nested, fomp_set_schedule, 
+                             fomp_set_nested, fomp_get_nested,
-                          fomp_get_schedule, fomp_get_thread_limit, 
+                             fomp_set_schedule, fomp_get_schedule,
-                          fomp_set_max_active_levels, 
+                             fomp_get_thread_limit, fomp_set_max_active_levels,
                              fomp_get_max_active_levels, fomp_get_level,
                              fomp_get_ancestor_thread_num, fomp_get_team_size,
                              fomp_get_active_level, fomp_in_final,
@@ -37,6 +38,7 @@ from .specialdec import (uvmet_left_iter, cape_left_iter,
                          cloudfrac_left_iter, check_cape_args,
                          interplevel_left_iter, check_interplevel_args)
 
+
 class DiagnosticError(Exception):
     """Raised when an error occurs in a diagnostic routine."""
     def __init__(self, message=None):
@@ -66,6 +68,7 @@ class DiagnosticError(Exception):
         """
         raise self.__class__(message)
 
+
 # The routines below are thin wrappers around the Fortran functions.  These
 # are not meant to be called by end users.  Use the public API instead for
 # that purpose.
@@ -73,7 +76,6 @@ class DiagnosticError(Exception):
 # IMPORTANT!  Unless otherwise noted, all variables used in the routines
 # below assume that Fortran-ordered views are being used.  This allows
 # f2py to pass the array pointers directly to the Fortran routine.
-
 @check_interplevel_args(is2dlev=False)
 @interplevel_left_iter(is2dlev=False)
 @cast_type(arg_idxs=(0, 1, 2))
@@ -348,9 +350,8 @@ def _avo(u, v, msfu, msfv, msfm, cor, dx, dy, outview=None):
     return result
 
 
-@check_args(0, 3, (3,3,3,3,2,2,2,2), stagger=(-1,-2,None,None,-1,-2,None, 
+@check_args(0, 3, (3, 3, 3, 3, 2, 2, 2, 2),
-                                              None),
+            stagger=(-1, -2, None, None, -1, -2, None, None), refstagdim=-1)
-            refstagdim=-1)
 @left_iteration(3, 3, ref_var_idx=2, ignore_args=(8, 9))
 @cast_type(arg_idxs=(0, 1, 2, 3, 4, 5, 6, 7))
 @extract_and_transpose()
@@ -403,8 +404,10 @@ def _eth(qv, tk, p, outview=None):
 @cast_type(arg_idxs=(0, 1, 2, 3))
 @extract_and_transpose()
 def _uvmet(u, v, lat, lon, cen_long, cone, isstag=0, has_missing=False,
-           umissing=default_fill(np.float64), vmissing=default_fill(np.float64), 
+           umissing=default_fill(np.float64),
-           uvmetmissing=default_fill(np.float64), outview=None):
+           vmissing=default_fill(np.float64),
+           uvmetmissing=default_fill(np.float64),
+           outview=None):
     """Wrapper for dcomputeuvmet.
 
     Located in wrf_user.f90.
@@ -674,12 +677,14 @@ def _cape(p_hpa, tk, qv, ht, ter, sfp, missing, i3dflag, ter_follow,
 
     return result
 
+
 @check_args(0, 3, (3, 3))
 @cloudfrac_left_iter()
 @cast_type(arg_idxs=(0, 1), outviews=("lowview", "midview", "highview"))
 @extract_and_transpose(outviews=("lowview", "midview", "highview"))
 def _cloudfrac(vert, rh, vert_inc_w_height, low_thresh, mid_thresh,
-               high_thresh, missing, lowview=None, midview=None, highview=None):
+               high_thresh, missing, lowview=None, midview=None,
+               highview=None):
     """Wrapper for dcloudfrac2.
 
     Located in wrf_cloud_fracf.f90.
@@ -933,6 +938,7 @@ def _vintrp(field, pres, tk, qvp, ght, terrain, sfp, smsfp,
 
     return result
 
+
 @check_args(0, 2, (2, 2))
 @left_iteration(2, 2, ref_var_idx=0)
 @cast_type(arg_idxs=(0, 1))
@@ -1651,6 +1657,3 @@ def omp_get_wtick():
 
     """
     return fomp_get_wtick()
-
-    
-

src/wrf/g_cape.py

@@ -9,6 +9,7 @@ from .constants import default_fill, Constants, ConversionFactors
 from .util import extract_vars
 from .metadecorators import set_cape_metadata
 
+
 @set_cape_metadata(is2d=True)
 def get_2dcape(wrfin, timeidx=0, method="cat", squeeze=True, cache=None,
                meta=True, _key=None, missing=default_fill(np.float64)):
@@ -221,7 +222,6 @@ def get_3dcape(wrfin, timeidx=0, method="cat",
     cape_cin = _cape(p_hpa, tk, qv, z, ter, psfc_hpa, missing, i3dflag,
                      ter_follow)
 
-    
     return ma.masked_values(cape_cin, missing)
 
 
@@ -629,6 +629,3 @@ def get_3dcin_only(wrfin, timeidx=0, method="cat",
         result.attrs["units"] = "J kg-1"
 
     return result
-    
-    
-    

src/wrf/g_cloudfrac.py

@@ -164,8 +164,9 @@ def get_cloudfrac(wrfin, timeidx=0, method="cat", squeeze=True,
 
 def get_low_cloudfrac(wrfin, timeidx=0, method="cat", squeeze=True,
                       cache=None, meta=True, _key=None,
-                 vert_type="height_agl", low_thresh=None, mid_thresh=None, 
+                      vert_type="height_agl", low_thresh=None,
-                 high_thresh=None, missing=default_fill(np.float64)):
+                      mid_thresh=None, high_thresh=None,
+                      missing=default_fill(np.float64)):
     """Return the cloud fraction for the low level clouds.
 
     If the vertical coordinate type is 'height_agl' or 'height_msl', the
@@ -264,9 +265,8 @@ def get_low_cloudfrac(wrfin, timeidx=0, method="cat", squeeze=True,
 
     """
     result = get_cloudfrac(wrfin, timeidx, method, squeeze,
-                         cache, meta, _key,
+                           cache, meta, _key, vert_type, low_thresh,
-                         vert_type, low_thresh, mid_thresh, 
+                           mid_thresh, high_thresh, missing)[0, :]
-                         high_thresh, missing)[0,:]
 
     if meta:
         result.attrs["description"] = "low clouds"
@@ -276,8 +276,9 @@ def get_low_cloudfrac(wrfin, timeidx=0, method="cat", squeeze=True,
 
 def get_mid_cloudfrac(wrfin, timeidx=0, method="cat", squeeze=True,
                       cache=None, meta=True, _key=None,
-                 vert_type="height_agl", low_thresh=None, mid_thresh=None, 
+                      vert_type="height_agl", low_thresh=None,
-                 high_thresh=None, missing=default_fill(np.float64)):
+                      mid_thresh=None, high_thresh=None,
+                      missing=default_fill(np.float64)):
     """Return the cloud fraction for the mid level clouds.
 
     If the vertical coordinate type is 'height_agl' or 'height_msl', the
@@ -388,8 +389,9 @@ def get_mid_cloudfrac(wrfin, timeidx=0, method="cat", squeeze=True,
 
 def get_high_cloudfrac(wrfin, timeidx=0, method="cat", squeeze=True,
                        cache=None, meta=True, _key=None,
-                 vert_type="height_agl", low_thresh=None, mid_thresh=None, 
+                       vert_type="height_agl", low_thresh=None,
-                 high_thresh=None, missing=default_fill(np.float64)):
+                       mid_thresh=None, high_thresh=None,
+                       missing=default_fill(np.float64)):
     """Return the cloud fraction for the high level clouds.
 
     If the vertical coordinate type is 'height_agl' or 'height_msl', the

src/wrf/g_ctt.py

@@ -3,7 +3,6 @@ from __future__ import (absolute_import, division, print_function)
 import numpy as np
 import numpy.ma as ma
 
-#from .extension import computectt, computetk
 from .extension import _ctt, _tk
 from .constants import Constants, ConversionFactors, default_fill
 from .destag import destagger

src/wrf/g_dbz.py

@@ -2,7 +2,6 @@ from __future__ import (absolute_import, division, print_function)
 
 import numpy as np
 
-#from .extension import computedbz,computetk
 from .extension import _dbz, _tk
 from .constants import Constants
 from .util import extract_vars, to_np
@@ -196,4 +195,3 @@ def get_max_dbz(wrfin, timeidx=0, method="cat",
     return np.amax(to_np(get_dbz(wrfin, timeidx, method, squeeze, cache, meta,
                                  _key, use_varint, use_liqskin)),
                    axis=-3)
-

src/wrf/g_dewpoint.py

@@ -1,6 +1,5 @@
 from __future__ import (absolute_import, division, print_function)
 
-#from .extension import computetd
 from .extension import _td
 from .decorators import convert_units
 from .metadecorators import copy_and_set_metadata
@@ -86,6 +85,7 @@ def get_dp(wrfin, timeidx=0, method="cat", squeeze=True,
     td = _td(full_p, qvapor)
     return td
 
+
 @copy_and_set_metadata(copy_varname="Q2", name="td2",
                        description="2m dew point temperature")
 @convert_units("temp", "c")
@@ -161,4 +161,3 @@ def get_dp_2m(wrfin, timeidx=0, method="cat", squeeze=True,
     td = _td(psfc, q2)
 
     return td
-

src/wrf/g_geoht.py

@@ -8,6 +8,7 @@ from .decorators import convert_units
 from .metadecorators import set_height_metadata
 from .util import extract_vars, either
 
+
 def _get_geoht(wrfin, timeidx, method="cat", squeeze=True,
                cache=None, meta=True, _key=None,
                height=True, msl=True, stag=False):
@@ -321,8 +322,7 @@ def get_stag_geopt(wrfin, timeidx=0, method="cat", squeeze=True, cache=None,
 @set_height_metadata(geopt=False, stag=True)
 @convert_units("height", "m")
 def get_stag_height(wrfin, timeidx=0, method="cat", squeeze=True,
-               cache=None, meta=True, _key=None,
+                    cache=None, meta=True, _key=None, msl=True, units="m"):
-               msl=True, units="m"):
     """Return the geopotential height for the vertically staggered grid.
 
     If *msl* is True, then geopotential height is returned as Mean Sea Level
@@ -391,4 +391,3 @@ def get_stag_height(wrfin, timeidx=0, method="cat", squeeze=True,
 
     return _get_geoht(wrfin, timeidx, method, squeeze, cache, meta, _key,
                       True, msl, stag=True)
-    

src/wrf/g_helicity.py

@@ -9,6 +9,7 @@ from .util import extract_vars, extract_global_attrs, either
 from .metadecorators import copy_and_set_metadata
 from .g_latlon import get_lat
 
+
 @copy_and_set_metadata(copy_varname="HGT", name="srh",
                        description="storm relative helicity",
                        units="m2 s-2")
@@ -207,7 +208,3 @@ def get_uh(wrfin, timeidx=0, method="cat", squeeze=True,
 
     return uh
     
-    
-    
-    
-    

src/wrf/g_latlon.py

@@ -301,12 +301,10 @@ def _llxy_mapping(wrfin, x_or_lat, y_or_lon, func, timeidx, stagger,
         # make it so that key_0 is leftmost
         outdims = key_coordnames + list(first_array.dims[existing_cnt:])
 
-        
         # Create the new 'key_n', value pairs
         for coordname, coordval in zip(key_coordnames, coord_vals):
             outcoords[coordname] = coordval
 
-        
         outattrs = OrderedDict(first_array.attrs)
 
         outarr = DataArray(outdata, name=outname, coords=outcoords,
@@ -605,10 +603,11 @@ def ll_to_xy_proj(latitude, longitude, meta=True, squeeze=True, as_int=True,
     """
     loc = locals()
     _projparams = {name: loc[name] for name in ("map_proj", "truelat1",
-                                            "truelat2", "stand_lon", "ref_lat",
+                                                "truelat2", "stand_lon",
-                                            "ref_lon", "pole_lat", "pole_lon",
+                                                "ref_lat", "ref_lon",
-                                            "known_x", "known_y", "dx", "dy",
+                                                "pole_lat", "pole_lon",
-                                            "latinc", "loninc")}
+                                                "known_x", "known_y", "dx",
+                                                "dy", "latinc", "loninc")}
 
     projparams = _set_defaults(_projparams)
 
@@ -773,19 +772,12 @@ def xy_to_ll_proj(x, y, meta=True, squeeze=True, map_proj=None, truelat1=None,
     """
     loc = locals()
     _projparams = {name: loc[name] for name in ("map_proj", "truelat1",
-                                            "truelat2", "stand_lon", "ref_lat",
+                                                "truelat2", "stand_lon",
-                                            "ref_lon", "pole_lat", "pole_lon",
+                                                "ref_lat", "ref_lon",
-                                            "known_x", "known_y", "dx", "dy",
+                                                "pole_lat", "pole_lon",
-                                            "latinc", "loninc")}
+                                                "known_x", "known_y", "dx",
+                                                "dy", "latinc", "loninc")}
 
     projparams = _set_defaults(_projparams)
     return _xy_to_ll(x, y, None, 0, None, "cat", squeeze, None, None,
                      **projparams)
-
-    
-    
-    
-    
-    
-    
-    

src/wrf/g_omega.py

@@ -81,4 +81,3 @@ def get_omega(wrfin, timeidx=0, method="cat", squeeze=True, cache=None,
     omega = _omega(qv, tk, wa, full_p)
 
     return omega
-    

src/wrf/g_precip.py

@@ -2,7 +2,6 @@ from __future__ import (absolute_import, division, print_function)
 
 from .util import extract_vars
 
-__all__ = ["get_accum_precip", "get_precip_diff"]
 
 def get_accum_precip(wrfin, timeidx=0):
     ncvars = extract_vars(wrfin, timeidx, varnames=("RAINC", "RAINNC"))
@@ -13,6 +12,7 @@ def get_accum_precip(wrfin, timeidx=0):
 
     return rainsum
 
+
 def get_precip_diff(wrfin1, wrfin2, timeidx=0):
     vars1 = extract_vars(wrfin1, timeidx, varnames=("RAINC", "RAINNC"))
     vars2 = extract_vars(wrfin2, timeidx, varnames=("RAINC", "RAINNC"))

src/wrf/g_pressure.py

@@ -85,6 +85,7 @@ def get_pressure(wrfin, timeidx=0, method="cat", squeeze=True,
 
     return pres
 
+
 def get_pressure_hpa(wrfin, timeidx=0, method="cat", squeeze=True,
                      cache=None, meta=True, _key=None):
     """Return the pressure in [hPa].
@@ -142,7 +143,3 @@ def get_pressure_hpa(wrfin, timeidx=0, method="cat", squeeze=True,
     """
     return get_pressure(wrfin, timeidx, method, squeeze, cache, meta, _key,
                         units="hPa")
-
-
-    
-    

src/wrf/g_pw.py

@@ -1,6 +1,5 @@
 from __future__ import (absolute_import, division, print_function)
 
-#from .extension import computepw,computetv,computetk
 from .extension import _pw, _tv, _tk
 from .constants import Constants
 from .util import extract_vars
@@ -85,7 +84,3 @@ def get_pw(wrfin, timeidx=0, method="cat", squeeze=True, cache=None,
     tv = _tv(tk, qv)
 
     return _pw(full_p, tv, qv, ht)
-    
-    
-    
-    

src/wrf/g_rh.py

@@ -1,7 +1,6 @@
 from __future__ import (absolute_import, division, print_function)
 
 from .constants import Constants
-#from .extension import computerh, computetk
 from .extension import _rh, _tk
 from .util import extract_vars
 from .metadecorators import copy_and_set_metadata
@@ -153,4 +152,3 @@ def get_rh_2m(wrfin, timeidx=0, method="cat", squeeze=True, cache=None,
     rh = _rh(q2, psfc, t2)
 
     return rh
-

src/wrf/g_slp.py

@@ -1,6 +1,5 @@
 from __future__ import (absolute_import, division, print_function)
 
-#from .extension import computeslp, computetk
 from .extension import _slp, _tk
 from .constants import Constants
 from .destag import destagger
@@ -100,4 +99,3 @@ def get_slp(wrfin, timeidx=0, method="cat", squeeze=True,
     slp = _slp(destag_ph, tk, full_p, qvapor)
 
     return slp
-

src/wrf/g_temp.py

@@ -511,6 +511,3 @@ def get_tc(wrfin, timeidx=0, method="cat", squeeze=True, cache=None,
     """
     return get_temp(wrfin, timeidx, method, squeeze, cache, meta, _key,
                     units="degC")
-    
-    
-

src/wrf/g_terrain.py

@@ -73,6 +73,3 @@ def get_terrain(wrfin, timeidx=0, method="cat", squeeze=True,
     return extract_vars(wrfin, timeidx, varname,
                         method, squeeze, cache, meta=False,
                         _key=_key)[varname]
-
-    
-        

src/wrf/g_times.py

@@ -118,4 +118,3 @@ def get_xtimes(wrfin, timeidx=0, method="cat", squeeze=True, cache=None,
     """
     return extract_times(wrfin, timeidx, method, squeeze, cache,
                          meta=meta, do_xtime=True)
-

src/wrf/g_uvmet.py

@@ -4,7 +4,6 @@ from math import fabs, log, tan, sin, cos
 
 import numpy as np
 
-#from .extension import computeuvmet
 from .extension import _uvmet
 from .destag import destagger
 from .constants import Constants
@@ -165,7 +164,6 @@ def _get_uvmet(wrfin, timeidx=0, method="cat", squeeze=True,
         else:
             cen_lon = lon_attrs["STAND_LON"]
 
-        
         varname = either("XLAT_M", "XLAT")(wrfin)
         xlat_var = extract_vars(wrfin, timeidx, varname,
                                 method, squeeze, cache, meta=False,
@@ -181,11 +179,12 @@ def _get_uvmet(wrfin, timeidx=0, method="cat", squeeze=True,
         if map_proj == 1:
             if((fabs(true_lat1 - true_lat2) > 0.1) and
                     (fabs(true_lat2 - 90.) > 0.1)):
-                cone = (log(cos(true_lat1*radians_per_degree)) 
+                cone = (log(cos(true_lat1*radians_per_degree)) -
-                    - log(cos(true_lat2*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_lat2/2.)) *
+                                   radians_per_degree))))
             else:
                 cone = sin(fabs(true_lat1)*radians_per_degree)
         else:
@@ -517,7 +516,8 @@ def get_uvmet10_wspd_wdir(wrfin, timeidx=0, method="cat", squeeze=True,
     uvmet10 = _get_uvmet(wrfin, timeidx, method, squeeze, cache, meta, _key,
                          True, units="m s-1")
 
-    return _calc_wspd_wdir(uvmet10[0,...,:,:], uvmet10[1,...,:,:], True, units)
+    return _calc_wspd_wdir(uvmet10[0, ..., :, :], uvmet10[1, ..., :, :],
+                           True, units)
 
 
 def get_uvmet_wspd(wrfin, timeidx=0, method="cat", squeeze=True,
@@ -801,6 +801,3 @@ def get_uvmet10_wdir(wrfin, timeidx=0, method="cat", squeeze=True,
         result.attrs["description"] = "10m earth rotated wdir"
 
     return result
-        
-            
-            

src/wrf/g_vorticity.py

@@ -164,4 +164,3 @@ def get_pvo(wrfin, timeidx=0, method="cat", squeeze=True, cache=None,
     full_p = p + pb
 
     return _pvo(u, v, full_t, full_p, msfu, msfv, msfm, cor, dx, dy)
-    

src/wrf/g_wind.py

@@ -93,12 +93,10 @@ def _calc_wspd_wdir(u, v, two_d, units):
     result = np.zeros(outdims, wspd.dtype)
 
     idxs0 = ((0, Ellipsis, slice(None), slice(None), slice(None))
-            if not two_d else 
+             if not two_d else (0, Ellipsis, slice(None), slice(None)))
-            (0, Ellipsis, slice(None), slice(None)))
 
     idxs1 = ((1, Ellipsis, slice(None), slice(None), slice(None))
-            if not two_d else 
+             if not two_d else (1, Ellipsis, slice(None), slice(None)))
-            (1, Ellipsis, slice(None), slice(None)))
 
     result[idxs0] = wspd[:]
     result[idxs1] = wdir[:]
@@ -784,4 +782,3 @@ def get_destag_wdir10(wrfin, timeidx=0, method="cat",
         result.attrs["description"] = "10m wdir in projection space"
 
     return result
-