From 0d6f9230dac244c6c1f7e87f816a593a8980f45c Mon Sep 17 00:00:00 2001
From: Bill Ladwig <ladwig@ucar.edu>
Date: Mon, 22 Jan 2018 13:42:33 -0700
Subject: [PATCH] Fixed metadata bugs related to interpolation.

Unit tests were also updated to test for this situation.
---
 src/wrf/metadecorators.py       |  32 +++++++++++---------------------
 test/ci_tests/ci_test_file.nc   | Bin 3026450 -> 3030723 bytes
 test/ci_tests/make_test_file.py |   6 +++---
 test/ci_tests/utests.py         |  23 +++++++++++++++++++++++
 test/utests.py                  |  23 +++++++++++++++++++++--
 5 files changed, 58 insertions(+), 26 deletions(-)

diff --git a/src/wrf/metadecorators.py b/src/wrf/metadecorators.py
index 0549220..228c857 100644
--- a/src/wrf/metadecorators.py
+++ b/src/wrf/metadecorators.py
@@ -805,7 +805,7 @@ def _set_horiz_meta(wrapped, instance, args, kwargs):
     outname = None
     outdimnames = None
     outcoords = None
-    outattrs = None
+    outattrs = OrderedDict()
     
     # Get the vertical level units
     vert_units = None
@@ -823,7 +823,6 @@ def _set_horiz_meta(wrapped, instance, args, kwargs):
     
     if isinstance(field3d, DataArray):
         outcoords = OrderedDict()
-        outattrs = OrderedDict()
         outdimnames = list(field3d.dims)
         outcoords.update(field3d.coords)
         outdimnames.remove(field3d.dims[-3])
@@ -836,7 +835,6 @@ def _set_horiz_meta(wrapped, instance, args, kwargs):
         
     else:
         outname = "field3d_{0}".format(name_levelstr)
-        outattrs = OrderedDict()
         
     outattrs["level"] = levelstr
     outattrs["missing_value"] = missingval
@@ -959,7 +957,7 @@ def _set_cross_meta(wrapped, instance, args, kwargs):
     outname = None
     outdimnames = None
     outcoords = None
-    outattrs = None
+    outattrs = OrderedDict()
     
     # Use XY to set the cross-section metadata
     st_x = xy[0,0]
@@ -974,7 +972,6 @@ def _set_cross_meta(wrapped, instance, args, kwargs):
     
     if isinstance(field3d, DataArray):
         outcoords = OrderedDict()
-        outattrs = OrderedDict()
         outdimnames = list(field3d.dims)
         outcoords.update(field3d.coords)
         for i in py3range(-3,0,1):
@@ -1062,7 +1059,6 @@ def _set_cross_meta(wrapped, instance, args, kwargs):
                           "not of type xarray.DataArray and contains no "
                           "coordinate information")
         outname = "field3d_cross"
-        outattrs = OrderedDict()
     
     outattrs["orientation"] = cross_str
     outattrs["missing_value"] = missingval
@@ -1173,7 +1169,7 @@ def _set_line_meta(wrapped, instance, args, kwargs):
     outname = None
     outdimnames = None
     outcoords = None
-    outattrs = None
+    outattrs = OrderedDict()
     
     # Use XY to set the cross-section metadata
     st_x = xy[0,0]
@@ -1188,7 +1184,6 @@ def _set_line_meta(wrapped, instance, args, kwargs):
     
     if isinstance(field2d, DataArray):
         outcoords = OrderedDict()
-        outattrs = OrderedDict()
         outdimnames = list(field2d.dims)
         outcoords.update(field2d.coords)
         for i in py3range(-2,0,1):
@@ -1273,7 +1268,6 @@ def _set_line_meta(wrapped, instance, args, kwargs):
                           "not of type xarray.DataArray and contains no "
                           "coordinate information")
         outname = "field2d_line"
-        outattrs = OrderedDict()
     
     outattrs["orientation"] = cross_str
     
@@ -1334,12 +1328,11 @@ def _set_vinterp_meta(wrapped, instance, args, kwargs):
     outname = None
     outdimnames = None
     outcoords = None
-    outattrs = None
+    outattrs = OrderedDict()
     
     
     if isinstance(field, DataArray):
         outcoords = OrderedDict()
-        outattrs = OrderedDict()
         outdimnames = list(field.dims)
         outcoords.update(field.coords)
         
@@ -1352,13 +1345,14 @@ def _set_vinterp_meta(wrapped, instance, args, kwargs):
         outdimnames.insert(-2, "interp_level")
         outcoords["interp_level"] = interp_levels
         outattrs.update(field.attrs)
-        outattrs["vert_interp_type"] = vert_coord
+        
         
         outname = field.name
         
     else:
         outname = field_type
     
+    outattrs["vert_interp_type"] = vert_coord
     
     return DataArray(result, name=outname, dims=outdimnames, 
                      coords=outcoords, attrs=outattrs)  
@@ -1402,8 +1396,7 @@ def _set_2dxy_meta(wrapped, instance, args, kwargs):
     argvars = from_args(wrapped, ("field3d", "xy"), *args, **kwargs)  
     
     field3d = argvars["field3d"]
-    xy = argvars["xy"]
-    xy = to_np(xy)
+    xy = to_np(argvars["xy"])
     
     result = wrapped(*args, **kwargs)
     
@@ -1419,12 +1412,11 @@ def _set_2dxy_meta(wrapped, instance, args, kwargs):
     outname = None
     outdimnames = None
     outcoords = None
-    outattrs = None
+    outattrs = OrderedDict()
     
     # Dims are (...,xy,z)
     if isinstance(field3d, DataArray):
         outcoords = OrderedDict()
-        outattrs = OrderedDict()
         outdimnames = list(field3d.dims)
         outcoords.update(field3d.coords)
         
@@ -1520,12 +1512,11 @@ def _set_1d_meta(wrapped, instance, args, kwargs):
     outname = None
     outdimnames = None
     outcoords = None
-    outattrs = None
+    outattrs = OrderedDict()
     
     # Dims are (...,xy,z)
     if isinstance(field, DataArray):
         outcoords = OrderedDict()
-        outattrs = OrderedDict()
         outdimnames = list(field.dims)
         
         outdimnames.pop(-1)
@@ -1540,9 +1531,6 @@ def _set_1d_meta(wrapped, instance, args, kwargs):
         outname = "{0}_z".format(field.name)
         outcoords["z"] = z_out
         
-        outattrs["_FillValue"] = missingval
-        outattrs["missing_value"] = missingval
-        
         desc = field.attrs.get("description", None)
         if desc is not None:
             outattrs["description"] = desc
@@ -1554,6 +1542,8 @@ def _set_1d_meta(wrapped, instance, args, kwargs):
     else:
         outname = "field_z"
     
+    outattrs["_FillValue"] = missingval
+    outattrs["missing_value"] = missingval
     
     return DataArray(result, name=outname, dims=outdimnames, 
                      coords=outcoords, attrs=outattrs)
diff --git a/test/ci_tests/ci_test_file.nc b/test/ci_tests/ci_test_file.nc
index ad5a3f62a6597f3491b7fb5bc771ffedc00699aa..b0f89455468774ee3342a9c096b70aafc8d9465f 100644
GIT binary patch
delta 12439
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
Vhuf=t<j$@BlZZOsv)YTL{{Y7E=2rj!

delta 11864
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

diff --git a/test/ci_tests/make_test_file.py b/test/ci_tests/make_test_file.py
index 5f76b5d..e6ec29b 100644
--- a/test/ci_tests/make_test_file.py
+++ b/test/ci_tests/make_test_file.py
@@ -9,9 +9,9 @@ from netCDF4 import Dataset
 from wrf import (getvar, interplevel, interpline, vertcross, vinterp, py2round,
                  CoordPair, ll_to_xy, xy_to_ll, to_np)
 
-VARS_TO_KEEP = ("XLAT", "XLONG", "XLAT_U", "XLAT_V", "XLONG_U", "XLONG_V",
-                "U", "V", "W", "PH", "PHB", "T", "P", "PB", "Q2", "T2",
-                "PSFC", "U10", "V10", "XTIME", "QVAPOR", "QCLOUD", 
+VARS_TO_KEEP = ("Times", "XLAT", "XLONG", "XLAT_U", "XLAT_V", "XLONG_U", 
+                "XLONG_V", "U", "V", "W", "PH", "PHB", "T", "P", "PB", "Q2", 
+                "T2", "PSFC", "U10", "V10", "XTIME", "QVAPOR", "QCLOUD", 
                 "QGRAUP", "QRAIN", "QSNOW", "MAPFAC_M", "MAPFAC_U",
                 "MAPFAC_V", "F", "HGT", "RAINC", "RAINSH", "RAINNC")
 
diff --git a/test/ci_tests/utests.py b/test/ci_tests/utests.py
index 0a1535f..a61cf5c 100644
--- a/test/ci_tests/utests.py
+++ b/test/ci_tests/utests.py
@@ -100,6 +100,10 @@ def make_interp_test(varname, wrf_in, referent, multi=False,
             ref_ht_850 = _get_refvals(referent, "interplevel", repeat, multi)
             hts = getvar(in_wrfnc, "z", timeidx=timeidx)
             p = getvar(in_wrfnc, "pressure", timeidx=timeidx)
+
+            # Check that it works with numpy arrays
+            hts_850 = interplevel(to_np(hts), p, 850)
+            #print (hts_850)
             hts_850 = interplevel(hts, p, 850)
             
             nt.assert_allclose(to_np(hts_850), ref_ht_850)
@@ -111,6 +115,10 @@ def make_interp_test(varname, wrf_in, referent, multi=False,
             p = getvar(in_wrfnc, "pressure", timeidx=timeidx)
             
             pivot_point = CoordPair(hts.shape[-1] // 2, hts.shape[-2] // 2) 
+            # Check that it works with numpy arrays
+            ht_cross = vertcross(to_np(hts), to_np(p), 
+                                 pivot_point=pivot_point, angle=90.)
+            #print (ht_cross)
             ht_cross = vertcross(hts, p, pivot_point=pivot_point, angle=90.)
 
             nt.assert_allclose(to_np(ht_cross), ref_ht_cross, rtol=.01)
@@ -123,6 +131,10 @@ def make_interp_test(varname, wrf_in, referent, multi=False,
             t2 = getvar(in_wrfnc, "T2", timeidx=timeidx)
             pivot_point = CoordPair(t2.shape[-1] // 2, t2.shape[-2] // 2)
             
+            # Check that it works with numpy arrays
+            t2_line1 = interpline(to_np(t2), pivot_point=pivot_point, 
+                                  angle=90.0)
+            #print (t2_line1)
             t2_line1 = interpline(t2, pivot_point=pivot_point, angle=90.0)
             
             nt.assert_allclose(to_np(t2_line1), ref_t2_line)
@@ -136,6 +148,17 @@ def make_interp_test(varname, wrf_in, referent, multi=False,
             
             interp_levels = [200,300,500,1000]
             
+            # Check that it works with numpy arrays
+            field = vinterp(in_wrfnc, 
+                            field=to_np(tk), 
+                            vert_coord="theta", 
+                            interp_levels=interp_levels, 
+                            extrapolate=True, 
+                            field_type="tk",
+                            timeidx=timeidx, 
+                            log_p=True)
+            #print (field)
+            
             field = vinterp(in_wrfnc, 
                             field=tk, 
                             vert_coord="theta", 
diff --git a/test/utests.py b/test/utests.py
index 9c9ba12..75cf254 100644
--- a/test/utests.py
+++ b/test/utests.py
@@ -269,6 +269,9 @@ def make_interp_test(varname, wrf_in, referent, multi=False,
             ref_ht_500 = _get_refvals(referent, "z_500", repeat, multi)
             hts = getvar(in_wrfnc, "z", timeidx=timeidx)
             p = getvar(in_wrfnc, "pressure", timeidx=timeidx)
+            
+            # Make sure the numpy versions work first
+            hts_500 = interplevel(to_np(hts), to_np(p), 500)
             hts_500 = interplevel(hts, p, 500)
             
             nt.assert_allclose(to_np(hts_500), ref_ht_500)
@@ -283,6 +286,9 @@ def make_interp_test(varname, wrf_in, referent, multi=False,
             pivot_point = CoordPair(hts.shape[-1] / 2, hts.shape[-2] / 2) 
             #ht_cross = vertcross(to_np(hts), p, pivot_point=pivot_point, 
             #                     angle=90., latlon=True)
+            # Make sure the numpy versions work first
+            ht_cross = vertcross(to_np(hts), to_np(p), 
+                                 pivot_point=pivot_point, angle=90.)
             ht_cross = vertcross(hts, p, pivot_point=pivot_point, angle=90.)
             
             # Note:  Until the bug is fixed in NCL, the wrf-python cross 
@@ -315,6 +321,9 @@ def make_interp_test(varname, wrf_in, referent, multi=False,
             
             #t2_line1 = interpline(to_np(t2), pivot_point=pivot_point, 
             #                      angle=90.0, latlon=True)
+            # Make sure the numpy version works
+            t2_line1 = interpline(to_np(t2), pivot_point=pivot_point, 
+                                  angle=90.0)
             t2_line1 = interpline(t2, pivot_point=pivot_point, angle=90.0)
             
             # Note:  After NCL is fixed, remove the slice.
@@ -337,6 +346,16 @@ def make_interp_test(varname, wrf_in, referent, multi=False,
             
             interp_levels = [200,300,500,1000]
             
+            # Make sure the numpy version works
+            field = vinterp(in_wrfnc, 
+                            field=to_np(tk), 
+                            vert_coord="theta", 
+                            interp_levels=interp_levels, 
+                            extrapolate=True, 
+                            field_type="tk",
+                            timeidx=timeidx, 
+                            log_p=True)
+            
             field = vinterp(in_wrfnc, 
                             field=tk, 
                             vert_coord="theta", 
@@ -630,8 +649,8 @@ class WRFLatLonTest(ut.TestCase):
 
 if __name__ == "__main__":
     from wrf import (omp_set_num_threads, omp_set_schedule, omp_get_schedule, 
-                     omp_set_dynamic, OMP_SCHED_STATIC)
-    omp_set_num_threads(8)
+                     omp_set_dynamic, omp_get_num_procs, OMP_SCHED_STATIC)
+    omp_set_num_threads(omp_get_num_procs()-1)
     omp_set_schedule(OMP_SCHED_STATIC, 0)
     omp_set_dynamic(False)