Changed vars variable name to avoid warnings with the builtin vars method

wrf_open/var/src/python/wrf/var/cape.py

@@ -9,17 +9,17 @@ __all__ = ["get_2dcape", "get_3dcape"]
 
 def get_2dcape(wrfnc, missing=-999999.0, timeidx=0):
     """Return the 2d fields of cape, cin, lcl, and lfc"""
-    vars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "QVAPOR", "PH",
+    ncvars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "QVAPOR", "PH",
                                               "PHB", "HGT", "PSFC"))
     
-    t = vars["T"]
-    p = vars["P"]
-    pb = vars["PB"]
-    qv = vars["QVAPOR"]
-    ph = vars["PH"]
-    phb = vars["PHB"]
-    ter = vars["HGT"]
-    psfc = vars["PSFC"]
+    t = ncvars["T"]
+    p = ncvars["P"]
+    pb = ncvars["PB"]
+    qv = ncvars["QVAPOR"]
+    ph = ncvars["PH"]
+    phb = ncvars["PHB"]
+    ter = ncvars["HGT"]
+    psfc = ncvars["PSFC"]
     
     full_t = t + Constants.T_BASE
     full_p = p + pb
@@ -31,9 +31,7 @@ def get_2dcape(wrfnc, missing=-999999.0, timeidx=0):
     
     # Convert pressure to hPa
     p_hpa = ConversionFactors.PA_TO_HPA * full_p
-    psfc_hpa = ConversionFactors.PA_TO_HPA * psfc # This may be the bug in NCL, as they pass this in 
-                          # has Pa, but other pressure is hPa.  Converting to 
-                          # hPa here.
+    psfc_hpa = ConversionFactors.PA_TO_HPA * psfc 
     
     i3dflag = 0
     ter_follow = 1
@@ -54,16 +52,16 @@ def get_2dcape(wrfnc, missing=-999999.0, timeidx=0):
 def get_3dcape(wrfnc, missing=-999999.0, timeidx=0):
     """Return the 3d fields of cape and cin"""
     
-    vars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "QVAPOR", "PH",
+    ncvars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "QVAPOR", "PH",
                                               "PHB", "HGT", "PSFC"))
-    t = vars["T"]
-    p = vars["P"]
-    pb = vars["PB"]
-    qv = vars["QVAPOR"]
-    ph = vars["PH"]
-    phb = vars["PHB"]
-    ter = vars["HGT"]
-    psfc = vars["PSFC"]
+    t = ncvars["T"]
+    p = ncvars["P"]
+    pb = ncvars["PB"]
+    qv = ncvars["QVAPOR"]
+    ph = ncvars["PH"]
+    phb = ncvars["PHB"]
+    ter = ncvars["HGT"]
+    psfc = ncvars["PSFC"]
     
     full_t = t + Constants.T_BASE
     full_p = p + pb
@@ -75,9 +73,7 @@ def get_3dcape(wrfnc, missing=-999999.0, timeidx=0):
     
     # Convert pressure to hPa
     p_hpa = ConversionFactors.PA_TO_HPA * full_p
-    psfc_hpa = ConversionFactors.PA_TO_HPA * psfc # This may be the bug in NCL, as they pass this in 
-                          # has Pa, but other pressure is hPa.  Converting to 
-                          # hPa here.
+    psfc_hpa = ConversionFactors.PA_TO_HPA * psfc 
     
     i3dflag = 1
     ter_follow = 1

wrf_open/var/src/python/wrf/var/ctt.py

@@ -14,15 +14,15 @@ def get_ctt(wrfnc, units="c", timeidx=0):
     """Return the cloud top temperature.
     
     """
-    vars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "PH" ,"PHB",
+    ncvars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "PH" ,"PHB",
                                               "HGT", "QVAPOR"))
-    t = vars["T"]
-    p = vars["P"]
-    pb = vars["PB"]
-    ph = vars["PH"]
-    phb = vars["PHB"]
-    ter = vars["HGT"]
-    qv = vars["QVAPOR"] * 1000.0 # g/kg
+    t = ncvars["T"]
+    p = ncvars["P"]
+    pb = ncvars["PB"]
+    ph = ncvars["PH"]
+    phb = ncvars["PHB"]
+    ter = ncvars["HGT"]
+    qv = ncvars["QVAPOR"] * 1000.0 # g/kg
     
     haveqci = 1
     try:

wrf_open/var/src/python/wrf/var/dbz.py

@@ -17,13 +17,13 @@ def get_dbz(wrfnc, do_varint=False, do_liqskin=False, timeidx=0):
     as liquid)
     
     """
-    vars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "QVAPOR", 
+    ncvars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "QVAPOR", 
                                               "QRAIN"))
-    t = vars["T"]
-    p = vars["P"]
-    pb = vars["PB"]
-    qv = vars["QVAPOR"]
-    qr = vars["QRAIN"]
+    t = ncvars["T"]
+    p = ncvars["P"]
+    pb = ncvars["PB"]
+    qv = ncvars["QVAPOR"]
+    qr = ncvars["QRAIN"]
     
     try:
         snowvars = extract_vars(wrfnc, timeidx, vars="QSNOW")

wrf_open/var/src/python/wrf/var/dewpoint.py

@@ -7,11 +7,11 @@ __all__ = ["get_dp", "get_dp_2m"]
 @convert_units("temp", "c")
 def get_dp(wrfnc, units="c", timeidx=0):
     
-    vars = extract_vars(wrfnc, timeidx, vars=("P", "PB", "QVAPOR"))
+    ncvars = extract_vars(wrfnc, timeidx, vars=("P", "PB", "QVAPOR"))
     
-    p = vars["P"]
-    pb = vars["PB"]
-    qvapor = vars["QVAPOR"]
+    p = ncvars["P"]
+    pb = ncvars["PB"]
+    qvapor = ncvars["QVAPOR"]
     
     # Algorithm requires hPa
     full_p = .01*(p + pb)
@@ -22,11 +22,11 @@ def get_dp(wrfnc, units="c", timeidx=0):
     
 @convert_units("temp", "c")
 def get_dp_2m(wrfnc, units="c", timeidx=0):
-    vars = extract_vars(wrfnc, timeidx, vars=("PSFC", "Q2"))
+    ncvars = extract_vars(wrfnc, timeidx, vars=("PSFC", "Q2"))
 
     # Algorithm requires hPa
-    psfc = .01*(vars["PSFC"])
-    q2 = vars["Q2"]
+    psfc = .01*(ncvars["PSFC"])
+    q2 = ncvars["Q2"]
     q2[q2 < 0] = 0
     
     td = computetd(psfc, q2)

wrf_open/var/src/python/wrf/var/helicity.py

@@ -9,11 +9,11 @@ __all__ = ["get_srh", "get_uh"]
 def get_srh(wrfnc, top=3000.0, timeidx=0):
     # Top can either be 3000 or 1000 (for 0-1 srh or 0-3 srh)
     
-    vars = extract_vars(wrfnc, timeidx, vars=("HGT", "PH", "PHB"))
+    ncvars = extract_vars(wrfnc, timeidx, vars=("HGT", "PH", "PHB"))
     
-    ter = vars["HGT"]
-    ph = vars["PH"]
-    phb = vars["PHB"]
+    ter = ncvars["HGT"]
+    ph = ncvars["PH"]
+    phb = ncvars["PHB"]
     
     try:
         u_vars = extract_vars(wrfnc, timeidx, vars="U")
@@ -55,12 +55,12 @@ def get_srh(wrfnc, top=3000.0, timeidx=0):
 
 def get_uh(wrfnc, bottom=2000.0, top=5000.0, timeidx=0):
     
-    vars = extract_vars(wrfnc, timeidx, vars=("W", "PH", "PHB", "MAPFAC_M"))
+    ncvars = extract_vars(wrfnc, timeidx, vars=("W", "PH", "PHB", "MAPFAC_M"))
     
-    wstag = vars["W"]
-    ph = vars["PH"]
-    phb = vars["PHB"]
-    mapfct = vars["MAPFAC_M"]
+    wstag = ncvars["W"]
+    ph = ncvars["PH"]
+    phb = ncvars["PHB"]
+    mapfct = ncvars["MAPFAC_M"]
     
     attrs  = extract_global_attrs(wrfnc, attrs=("DX", "DY"))
     dx = attrs["DX"]

wrf_open/var/src/python/wrf/var/omega.py

@@ -7,12 +7,12 @@ from wrf.var.util import extract_vars
 __all__ = ["get_omega"]
 
 def get_omega(wrfnc, timeidx=0):
-    vars = extract_vars(wrfnc, timeidx, vars=("T", "P", "W", "PB", "QVAPOR"))
-    t = vars["T"]
-    p = vars["P"]
-    w = vars["W"]
-    pb = vars["PB"]
-    qv = vars["QVAPOR"]
+    ncvars = extract_vars(wrfnc, timeidx, vars=("T", "P", "W", "PB", "QVAPOR"))
+    t = ncvars["T"]
+    p = ncvars["P"]
+    w = ncvars["W"]
+    pb = ncvars["PB"]
+    qv = ncvars["QVAPOR"]
     
     wa = destagger(w, 0)
     full_t = t + Constants.T_BASE

wrf_open/var/src/python/wrf/var/precip.py

@@ -5,9 +5,9 @@ from wrf.var.util import extract_vars
 __all__ = ["get_accum_precip", "get_precip_diff"]
 
 def get_accum_precip(wrfnc, timeidx=0):
-    vars = extract_vars(wrfnc, timeidx, vars=("RAINC", "RAINNC"))
-    rainc = vars["RAINC"]
-    rainnc = vars["RAINNC"]
+    ncvars = extract_vars(wrfnc, timeidx, vars=("RAINC", "RAINNC"))
+    rainc = ncvars["RAINC"]
+    rainnc = ncvars["RAINNC"]
     
     rainsum = rainc + rainnc
     

wrf_open/var/src/python/wrf/var/pw.py

@@ -6,15 +6,15 @@ from wrf.var.util import extract_vars
 __all__ = ["get_pw"]
 
 def get_pw(wrfnc, timeidx=0):
-    vars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "PH", "PHB", 
+    ncvars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "PH", "PHB", 
                                               "QVAPOR"))
     
-    t = vars["T"]
-    p = vars["P"]
-    pb = vars["PB"]
-    ph = vars["PH"]
-    phb = vars["PHB"]
-    qv = vars["QVAPOR"]
+    t = ncvars["T"]
+    p = ncvars["P"]
+    pb = ncvars["PB"]
+    ph = ncvars["PH"]
+    phb = ncvars["PHB"]
+    qv = ncvars["QVAPOR"]
     
     # Change this to use real virtual temperature!
     full_p   =  p + pb

wrf_open/var/src/python/wrf/var/rh.py

@@ -6,11 +6,11 @@ from wrf.var.util import extract_vars
 __all__ = ["get_rh", "get_rh_2m"]
 
 def get_rh(wrfnc, timeidx=0):
-    vars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "QVAPOR"))
-    t = vars["T"]
-    p = vars["P"]
-    pb = vars["PB"]
-    qvapor = vars["QVAPOR"]
+    ncvars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "QVAPOR"))
+    t = ncvars["T"]
+    p = ncvars["P"]
+    pb = ncvars["PB"]
+    qvapor = ncvars["QVAPOR"]
     
     full_t = t + Constants.T_BASE
     full_p = p + pb
@@ -21,10 +21,10 @@ def get_rh(wrfnc, timeidx=0):
     return rh
 
 def get_rh_2m(wrfnc, timeidx=0):
-    vars = extract_vars(wrfnc, timeidx, vars=("T2", "PSFC", "Q2"))
-    t2 = vars["T2"]
-    psfc = vars["PSFC"]
-    q2 = vars["Q2"]
+    ncvars = extract_vars(wrfnc, timeidx, vars=("T2", "PSFC", "Q2"))
+    t2 = ncvars["T2"]
+    psfc = ncvars["PSFC"]
+    q2 = ncvars["Q2"]
     
     q2[q2 < 0] = 0
     rh = computerh(q2, psfc, t2)

wrf_open/var/src/python/wrf/var/slp.py

@@ -8,15 +8,15 @@ __all__ = ["get_slp"]
 
 @convert_units("pressure", "hpa")
 def get_slp(wrfnc, units="hpa", timeidx=0):
-    vars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "QVAPOR",
+    ncvars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "QVAPOR",
                                               "PH", "PHB"))
 
-    t = vars["T"]
-    p = vars["P"]
-    pb = vars["PB"]
-    qvapor = vars["QVAPOR"]
-    ph = vars["PH"]
-    phb = vars["PHB"]
+    t = ncvars["T"]
+    p = ncvars["P"]
+    pb = ncvars["PB"]
+    qvapor = ncvars["QVAPOR"]
+    ph = ncvars["PH"]
+    phb = ncvars["PHB"]
     
     full_t = t + Constants.T_BASE
     full_p = p + pb

wrf_open/var/src/python/wrf/var/temp.py

@@ -8,8 +8,8 @@ __all__ = ["get_theta", "get_temp", "get_eth", "get_tv", "get_tw"]
 
 @convert_units("temp", "k")
 def get_theta(wrfnc, units="k", timeidx=0):
-    vars = extract_vars(wrfnc, timeidx, vars="T")
-    t = vars["T"]
+    ncvars = extract_vars(wrfnc, timeidx, vars="T")
+    t = ncvars["T"]
     full_t = t + Constants.T_BASE
 
     return full_t
@@ -18,10 +18,10 @@ def get_theta(wrfnc, units="k", timeidx=0):
 def get_temp(wrfnc, units="k", timeidx=0):
     """Return the temperature in Kelvin or Celsius"""
     
-    vars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB"))
-    t = vars["T"]
-    p = vars["P"]
-    pb = vars["PB"]
+    ncvars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB"))
+    t = ncvars["T"]
+    p = ncvars["P"]
+    pb = ncvars["PB"]
     
     full_t = t + Constants.T_BASE
     full_p = p + pb
@@ -33,11 +33,11 @@ def get_temp(wrfnc, units="k", timeidx=0):
 def get_eth(wrfnc, units="k", timeidx=0):
     "Return equivalent potential temperature (Theta-e) in Kelvin"
     
-    vars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "QVAPOR"))
-    t = vars["T"]
-    p = vars["P"]
-    pb = vars["PB"]
-    qv = vars["QVAPOR"]
+    ncvars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "QVAPOR"))
+    t = ncvars["T"]
+    p = ncvars["P"]
+    pb = ncvars["PB"]
+    qv = ncvars["QVAPOR"]
     
     full_t = t + Constants.T_BASE
     full_p = p + pb
@@ -51,12 +51,12 @@ def get_eth(wrfnc, units="k", timeidx=0):
 def get_tv(wrfnc, units="k", timeidx=0):
     "Return the virtual temperature (tv) in Kelvin or Celsius"
     
-    vars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "QVAPOR"))
+    ncvars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "QVAPOR"))
     
-    t = vars["T"]
-    p = vars["P"]
-    pb = vars["PB"]
-    qv = vars["QVAPOR"]
+    t = ncvars["T"]
+    p = ncvars["P"]
+    pb = ncvars["PB"]
+    qv = ncvars["QVAPOR"]
     
     full_t = t + Constants.T_BASE
     full_p = p + pb
@@ -71,11 +71,11 @@ def get_tv(wrfnc, units="k", timeidx=0):
 def get_tw(wrfnc, units="k", timeidx=0):
     "Return the wetbulb temperature (tw)"
     
-    vars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "QVAPOR"))
-    t = vars["T"]
-    p = vars["P"]
-    pb = vars["PB"]
-    qv = vars["QVAPOR"]
+    ncvars = extract_vars(wrfnc, timeidx, vars=("T", "P", "PB", "QVAPOR"))
+    t = ncvars["T"]
+    p = ncvars["P"]
+    pb = ncvars["PB"]
+    qv = ncvars["QVAPOR"]
     
     full_t = t + Constants.T_BASE
     full_p = p + pb

wrf_open/var/src/python/wrf/var/vorticity.py

@@ -4,17 +4,17 @@ from wrf.var.util import extract_vars, extract_global_attrs
 __all__ = ["get_avo", "get_pvo"]
 
 def get_avo(wrfnc, timeidx=0):
-    vars = extract_vars(wrfnc, timeidx, vars=("U", "V", "MAPFAC_U",
+    ncvars = extract_vars(wrfnc, timeidx, vars=("U", "V", "MAPFAC_U",
                                               "MAPFAC_V", "MAPFAC_M",
                                               "F"))
     
     attrs = extract_global_attrs(wrfnc, attrs=("DX", "DY"))
-    u = vars["U"]
-    v = vars["V"]
-    msfu = vars["MAPFAC_U"]
-    msfv = vars["MAPFAC_V"]
-    msfm = vars["MAPFAC_M"]
-    cor = vars["F"]
+    u = ncvars["U"]
+    v = ncvars["V"]
+    msfu = ncvars["MAPFAC_U"]
+    msfv = ncvars["MAPFAC_V"]
+    msfm = ncvars["MAPFAC_M"]
+    cor = ncvars["F"]
     
     dx = attrs["DX"]
     dy = attrs["DY"]
@@ -23,21 +23,21 @@ def get_avo(wrfnc, timeidx=0):
 
 
 def get_pvo(wrfnc, timeidx=0):
-    vars = extract_vars(wrfnc, timeidx, vars=("U", "V", "T", "P",
+    ncvars = extract_vars(wrfnc, timeidx, vars=("U", "V", "T", "P",
                                               "PB", "MAPFAC_U",
                                               "MAPFAC_V", "MAPFAC_M",
                                               "F"))
     attrs = extract_global_attrs(wrfnc, attrs=("DX", "DY"))
     
-    u = vars["U"]
-    v = vars["V"]
-    t = vars["T"]
-    p = vars["P"]
-    pb = vars["PB"]
-    msfu = vars["MAPFAC_U"]
-    msfv = vars["MAPFAC_V"]
-    msfm = vars["MAPFAC_M"]
-    cor = vars["F"]
+    u = ncvars["U"]
+    v = ncvars["V"]
+    t = ncvars["T"]
+    p = ncvars["P"]
+    pb = ncvars["PB"]
+    msfu = ncvars["MAPFAC_U"]
+    msfv = ncvars["MAPFAC_V"]
+    msfm = ncvars["MAPFAC_M"]
+    cor = ncvars["F"]
     
     dx = attrs["DX"]
     dy = attrs["DY"]

wrf_open/var/src/python/wrf/var/wind.py

@@ -4,7 +4,6 @@ import numpy as n
 from wrf.var.constants import Constants
 from wrf.var.destagger import destagger_windcomp
 from wrf.var.decorators import convert_units
-from wrf.var.util import extract_vars
 
 __all__ = ["get_u_destag", "get_v_destag", "get_w_destag",
            "get_destag_wspd_wdir"]
@@ -18,7 +17,6 @@ def _calc_wdir(u, v):
     return n.remainder(wdir, 360.0)
 
 def _calc_wspd_wdir(u, v, units="mps"):
-    check_units(units, "wind")
     return (_calc_wspd(u,v, units), _calc_wdir(u,v))
 
 @convert_units("wind", "mps")