removed the var package. wrf is no longer a namespace package.

wrf_open/setup.py

@@ -2,23 +2,23 @@ import setuptools
 import numpy.distutils.core
  
 ext1 = numpy.distutils.core.Extension(
-    name = "wrf.var._wrfext",
-    sources = ["src/python/wrf/var/wrfext.f90",
-               "src/python/wrf/var/wrfext.pyf"]
+    name = "wrf._wrfext",
+    sources = ["src/python/wrf/wrfext.f90",
+               "src/python/wrf/wrfext.pyf"]
     )
 
 ext2 = numpy.distutils.core.Extension(
-    name = "wrf.var._wrfcape",
-    sources = ["src/python/wrf/var/wrfcape.f90",
-               "src/python/wrf/var/wrfcape.pyf"]
+    name = "wrf._wrfcape",
+    sources = ["src/python/wrf/wrfcape.f90",
+               "src/python/wrf/wrfcape.pyf"]
     )
 
 numpy.distutils.core.setup( 
-    name = "wrf.var",
+    name = "wrf",
     version = "0.0.1",        
     packages = setuptools.find_packages("src/python"),   
     ext_modules = [ext1,ext2],
     package_dir={"":"src/python"},
-    namespace_packages=["wrf"],
+    #namespace_packages=["wrf"],
     scripts=[],
 )  

wrf_open/test/test_vinterp.ncl

@@ -0,0 +1,87 @@
+    load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/gsn_code.ncl"
+    load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/gsn_csm.ncl"
+    load "$NCARG_ROOT/lib/ncarg/nclscripts/wrf/WRFUserARW.ncl"
+    
+    in_files = (/"/Users/ladwig/Documents/wrf_files/wrf_vortex_multi/wrfout_d02_2005-08-28_00:00:00", \
+                 "/Users/ladwig/Documents/wrf_files/wrf_vortex_multi/wrfout_d02_2005-08-28_12:00:00", \
+                 "/Users/ladwig/Documents/wrf_files/wrf_vortex_multi/wrfout_d02_2005-08-29_00:00:00"/)
+    
+    input_file = addfiles(in_files, "r")
+    
+    timeidx = 6
+    
+    ; 3D interpolation to new vertical coordinates
+    ; interp t to theta
+    fld1 = wrf_user_getvar(input_file, "tk", timeidx)
+    vert_coord       = "theta"
+    ;interp_levels    = (/200,300,500,1000/)
+     interp_levels = ispan(200,1000,50)
+    opts             = True
+    opts@extrapolate = True 
+    opts@field_type  = "T"
+    opts@logP        = True
+    opts@time        = timeidx  
+    
+    fld1_intrp = wrf_user_vert_interp(input_file,fld1,vert_coord,interp_levels,opts)
+    
+    printVarSummary(fld1_intrp)
+    
+    ; interp t to theta-e
+    fld2 = fld1
+    vert_coord := "theta-e"
+    fld2_intrp = wrf_user_vert_interp(input_file,fld2,vert_coord,interp_levels,opts)
+    
+    printVarSummary(fld2_intrp)
+    
+    ; interp t to pressure
+    fld3 = fld1
+    vert_coord := "pressure"
+    interp_levels    := (/850,500/)
+    fld3_intrp = wrf_user_vert_interp(input_file,fld3,vert_coord,interp_levels,opts)
+    
+    printVarSummary(fld3_intrp)
+    
+    ; interp t to ght_msl
+    fld4 = fld1
+    vert_coord := "ght_msl"
+    interp_levels    := (/1,2/)
+    fld4_intrp = wrf_user_vert_interp(input_file,fld4,vert_coord,interp_levels,opts)
+    
+    printVarSummary(fld4_intrp)
+    
+    ; interp t to ght_agl
+    fld5 = fld1
+    vert_coord := "ght_agl"
+    interp_levels    := (/1,2/)
+    fld5_intrp = wrf_user_vert_interp(input_file,fld1,vert_coord,interp_levels,opts)
+    
+    printVarSummary(fld5_intrp)
+    
+    ; interp ht to pres
+    fld6 = wrf_user_getvar(input_file, "height", timeidx)
+    vert_coord := "pressure"
+    opts@field_type  = "ght"
+    interp_levels    := (/500,50/)
+    fld6_intrp = wrf_user_vert_interp(input_file,fld6,vert_coord,interp_levels,opts)
+    
+    printVarSummary(fld6_intrp)
+    
+    ; interp pres to theta
+    fld7 = wrf_user_getvar(input_file, "pressure", timeidx)
+    vert_coord := "theta"
+    opts@field_type  = "pressure"
+    interp_levels    := (/200,300,500,1000/)
+    fld7_intrp = wrf_user_vert_interp(input_file,fld7,vert_coord,interp_levels,opts)
+    
+    printVarSummary(fld7_intrp)
+    
+    ; interp theta-e to pressure
+    fld8 = wrf_user_getvar(input_file, "eth", timeidx)
+    vert_coord := "pressure"
+    opts@field_type  = "T"
+    interp_levels    := (/850,500,5/)
+    fld8_intrp = wrf_user_vert_interp(input_file,fld8,vert_coord,interp_levels,opts)
+    
+    printVarSummary(fld8_intrp)
+    
+    

wrf_open/test/utests.py

@@ -104,7 +104,6 @@ def make_test(varname, wrf_in, referent, multi=False, repeat=3, pynio=False):
             my_vals = getvar(in_wrfnc, "temp", timeidx=timeidx, units="c")
             tol = 0
             atol = .1 # Note:  NCL uses 273.16 as conversion for some reason
-            print my_vals.shape, ref_vals.shape
             nt.assert_allclose(npvalues(my_vals), ref_vals, tol, atol)
         elif (varname == "pw"):
             my_vals = getvar(in_wrfnc, "pw", timeidx=timeidx)

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

@@ -1,7 +0,0 @@
-try:
-    import pkg_resources
-    pkg_resources.declare_namespace(__name__)
-except ImportError:
-    import pkgutil
-    __path__ = pkgutil.extend_path(__path__, __name__)
-