Merge branch 'release/1.2.0'

.gitignore

@@ -49,6 +49,9 @@ test/ipynb/.ipynb_checkpoints
 fortran/omp.f90
 fortran/wrffortran.pyf
 fortran/*.mod
+fortran/_wrffortranmodule.c
+fortran/_wrffortran-f2pywrappers.f
+fortran/_wrffortran-f2pywrappers2.f90
 build
 .settings
 src/wrf_python.egg-info

doc/source/new.rst

@@ -4,6 +4,19 @@ What's New
 Releases
 -------------
 
+v1.2.0
+^^^^^^^^^^^^^^
+
+- Release 1.2.0
+- Previous versions of wrf-python promoted the strings used in xarray (e.g. 
+  name, attributes) to Unicode strings. This caused problems when porting 
+  examples for PyNGL to use wrf-python in Python 3.x. All strings are now the 
+  native string for the Python version being used. While this should be 
+  transparent to most users, any users that worked with the xarray name or 
+  attribute values on Python 2.7 may run in to string related errors, so we've 
+  decided to bump the major version number. 
+
+
 v1.1.3
 ^^^^^^^^^^^^^^
 

doc/source/tutorial.rst

@@ -24,3 +24,4 @@ Past Tutorials
    tutorials/wrf_workshop_2017.rst
    tutorials/tutorial_03_2018.rst
    
+   

fortran/wrf_constants.f90

@@ -9,13 +9,13 @@ MODULE wrf_constants
     REAL(KIND=8), PARAMETER :: PI = 3.1415926535897932384626433D0
     REAL(KIND=8), PARAMETER :: RAD_PER_DEG = PI/180.D0
     REAL(KIND=8), PARAMETER :: DEG_PER_RAD = 180.D0/PI
-    REAL(KIND=8), PARAMETER :: DEFAULT_FILL = 9.9692099683868690E36
+    REAL(KIND=8), PARAMETER :: DEFAULT_FILL = 9.9692099683868690D36
     INTEGER(KIND=1), PARAMETER :: DEFAULT_FILL_INT8 = -127
     INTEGER(KIND=2), PARAMETER :: DEFAULT_FILL_INT16 = -32767
     INTEGER(KIND=4), PARAMETER :: DEFAULT_FILL_INT32 = -2147483647
     INTEGER(KIND=8), PARAMETER :: DEFAULT_FILL_INT64 = INT(-9223372036854775806D0, KIND=8)
     REAL(KIND=4), PARAMETER :: DEFAULT_FILL_FLOAT = 9.9692099683868690E36
-    REAL(KIND=8), PARAMETER :: DEFAULT_FILL_DOUBLE = 9.9692099683868690E36
+    REAL(KIND=8), PARAMETER :: DEFAULT_FILL_DOUBLE = 9.9692099683868690D36
     CHARACTER(LEN=1), PARAMETER :: DEFAULT_FILL_CHAR = ACHAR(0)
 
 

fortran/wrffortran.pyf

@@ -322,7 +322,7 @@ python module _wrffortran ! in
             real(kind=8), parameter,optional :: p1000mb=100000.d0
             real(kind=8), parameter,optional :: rv=461.6d0
             real(kind=8), parameter,optional,depend(pi) :: rad_per_deg=pi/180.d0
-            real(kind=8), parameter,optional :: default_fill_double=9.96920996839e+36
+            real(kind=8), parameter,optional :: default_fill_double=9.9692099683868690d36
             real(kind=8), parameter,optional :: rd=287.d0
             real(kind=8), parameter,optional :: abscoef=.145d0
             real(kind=8), parameter,optional :: celkel=273.15d0
@@ -341,7 +341,7 @@ python module _wrffortran ! in
             real(kind=8), parameter,optional :: cpmd=.887d0
             real(kind=8), parameter,optional,depend(rd,g) :: sclht=rd*256.d0/g
             real(kind=8), parameter,optional :: ussalr=0.0065d0
-            real(kind=8), parameter,optional :: default_fill=9.96920996839e+36
+            real(kind=8), parameter,optional :: default_fill=9.9692099683868690d36
             real(kind=8), parameter,optional :: rho_s=100.d0
             real(kind=8), parameter,optional,depend(rhowat) :: rho_r=1000.0
             real(kind=8), parameter,optional :: alpha=0.224d0

src/wrf/__init__.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 import os
 import pkg_resources
 

src/wrf/cache.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from threading import local
 from collections import OrderedDict

src/wrf/computation.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 import numpy as np
 import numpy.ma as ma

src/wrf/config.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from threading import local
 import wrapt

src/wrf/constants.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from sys import version_info
 import struct

src/wrf/coordpair.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from .py3compat import py2round
         

src/wrf/decorators.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from collections import Iterable, OrderedDict
 

src/wrf/destag.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from .decorators import extract_and_transpose
 from .metadecorators import set_destag_metadata

src/wrf/extension.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 import numpy as np
 

src/wrf/g_cape.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 import numpy as np
 import numpy.ma as ma

src/wrf/g_cloudfrac.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 import numpy as np
 import numpy.ma as ma

src/wrf/g_ctt.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 import numpy as np
 import numpy.ma as ma

src/wrf/g_dbz.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 import numpy as np
 

src/wrf/g_dewpoint.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 #from .extension import computetd
 from .extension import _td

src/wrf/g_geoht.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 import warnings
 

src/wrf/g_helicity.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 import numpy as np
 

src/wrf/g_latlon.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from collections import OrderedDict
 

src/wrf/g_omega.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from .constants import Constants
 from .destag import destagger

src/wrf/g_precip.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from .util import extract_vars
 

src/wrf/g_pressure.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from .decorators import convert_units
 from .metadecorators import copy_and_set_metadata

src/wrf/g_pw.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 #from .extension import computepw,computetv,computetk
 from .extension import _pw, _tv, _tk

src/wrf/g_rh.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from .constants import Constants   
 #from .extension import computerh, computetk

src/wrf/g_slp.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 #from .extension import computeslp, computetk
 from .extension import _slp, _tk

src/wrf/g_temp.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from .constants import Constants
 from .extension import _tk, _eth, _tv, _wetbulb

src/wrf/g_terrain.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from .decorators import convert_units
 from .metadecorators import copy_and_set_metadata

src/wrf/g_times.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from .util import extract_times
 

src/wrf/g_uvmet.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from math import fabs, log, tan, sin, cos
 

src/wrf/g_vorticity.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from .extension import _avo, _pvo
 from .util import extract_vars, extract_global_attrs

src/wrf/g_wind.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 import numpy as np
 

src/wrf/geobnds.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from .coordpair import CoordPair
 

src/wrf/interp.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 import numpy as np
 import numpy.ma as ma

src/wrf/interputils.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from math import floor, ceil
 

src/wrf/latlonutils.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from collections import Iterable
 

src/wrf/metadecorators.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 import warnings
 import wrapt 
 from collections import OrderedDict
@@ -12,7 +11,7 @@ from .util import (extract_vars, either, from_args, arg_location,
                    is_coordvar, latlon_coordvars, to_np, 
                    from_var, iter_left_indexes, is_mapping)
 from .coordpair import CoordPair
-from .py3compat import viewkeys, viewitems, py3range, ucode
+from .py3compat import viewkeys, viewitems, py3range
 from .interputils import get_xy_z_params, get_xy, to_xy_coords
 from .config import xarray_enabled
 
@@ -135,7 +134,7 @@ def copy_and_set_metadata(copy_varname=None, delete_attrs=None, name=None,
         outattrs = OrderedDict()
         
         if copy_varname is not None:
-            outname = ucode(var_to_copy.name)
+            outname = var_to_copy.name
             
             if dimnames is not None:
                 outdimnames = dimnames
@@ -1854,7 +1853,7 @@ def set_smooth_metdata():
         outattrs = OrderedDict()
         
         if isinstance(field, DataArray):
-            outname = "smooth_" + ucode(field.name)
+            outname = "smooth_" + field.name
             outdimnames = list(field.dims)
             outcoords.update(field.coords)
             outattrs.update(field.attrs)

src/wrf/projection.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 import numpy as np
 import math
 from decimal import Decimal, Context, ROUND_HALF_UP
@@ -532,13 +531,13 @@ class LambertConformal(WrfProj):
                 else self.truelat2)
                                                 
         _pyngl = Resources()
-        _pyngl.mpProjection = bytes("LambertConformal")
+        _pyngl.mpProjection = "LambertConformal"
-        _pyngl.mpDataBaseVersion = bytes("MediumRes")
+        _pyngl.mpDataBaseVersion = "MediumRes"
         _pyngl.mpLambertMeridianF = self.stand_lon
         _pyngl.mpLambertParallel1F = self.truelat1
         _pyngl.mpLambertParallel2F = truelat2
         
-        _pyngl.mpLimitMode = bytes("Corners")
+        _pyngl.mpLimitMode = "Corners"
         _pyngl.mpLeftCornerLonF = geobounds.bottom_left.lon
         _pyngl.mpLeftCornerLatF = geobounds.bottom_left.lat
         _pyngl.mpRightCornerLonF = geobounds.top_right.lon
@@ -652,12 +651,12 @@ class Mercator(WrfProj):
             return None
         
         _pyngl = Resources()
-        _pyngl.mpProjection = bytes("Mercator")
+        _pyngl.mpProjection = "Mercator"
-        _pyngl.mpDataBaseVersion = bytes("MediumRes")
+        _pyngl.mpDataBaseVersion = "MediumRes"
         _pyngl.mpCenterLatF = 0.0
         _pyngl.mpCenterLonF = self.stand_lon
         
-        _pyngl.mpLimitMode = bytes("Corners")
+        _pyngl.mpLimitMode = "Corners"
         _pyngl.mpLeftCornerLonF = geobounds.bottom_left.lon
         _pyngl.mpLeftCornerLatF = geobounds.bottom_left.lat
         _pyngl.mpRightCornerLonF = geobounds.top_right.lon
@@ -770,8 +769,8 @@ class PolarStereographic(WrfProj):
             return None
         
         _pyngl = Resources()
-        _pyngl.mpProjection = bytes("Stereographic")
+        _pyngl.mpProjection = "Stereographic"
-        _pyngl.mpDataBaseVersion = bytes("MediumRes")
+        _pyngl.mpDataBaseVersion = "MediumRes"
         
         _pyngl.mpCenterLonF = self.stand_lon
         if self._hemi > 0:
@@ -779,7 +778,7 @@ class PolarStereographic(WrfProj):
         else:
             _pyngl.mpCenterLatF = -90.0
             
-        _pyngl.mpLimitMode = bytes("Corners")
+        _pyngl.mpLimitMode = "Corners"
         _pyngl.mpLeftCornerLonF = geobounds.bottom_left.lon
         _pyngl.mpLeftCornerLatF = geobounds.bottom_left.lat
         _pyngl.mpRightCornerLonF = geobounds.top_right.lon
@@ -877,12 +876,12 @@ class LatLon(WrfProj):
             return None
         
         _pyngl = Resources()
-        _pyngl.mpProjection = bytes("CylindricalEquidistant")
+        _pyngl.mpProjection = "CylindricalEquidistant"
-        _pyngl.mpDataBaseVersion = bytes("MediumRes")
+        _pyngl.mpDataBaseVersion = "MediumRes"
         _pyngl.mpCenterLonF = self.stand_lon
         _pyngl.mpCenterLatF = self.moad_cen_lat
         
-        _pyngl.mpLimitMode = bytes("Corners")
+        _pyngl.mpLimitMode = "Corners"
         _pyngl.mpLeftCornerLonF = geobounds.bottom_left.lon
         _pyngl.mpLeftCornerLatF = geobounds.bottom_left.lat
         _pyngl.mpRightCornerLonF = geobounds.top_right.lon
@@ -1055,12 +1054,12 @@ class RotatedLatLon(WrfProj):
             return None
         
         _pyngl = Resources()
-        _pyngl.mpProjection = bytes("CylindricalEquidistant")
+        _pyngl.mpProjection = "CylindricalEquidistant"
-        _pyngl.mpDataBaseVersion = bytes("MediumRes")
+        _pyngl.mpDataBaseVersion = "MediumRes"
         _pyngl.mpCenterLatF = self._pyngl_cen_lat
         _pyngl.mpCenterLonF = self._pyngl_cen_lon
         
-        _pyngl.mpLimitMode = bytes("Corners")
+        _pyngl.mpLimitMode = "Corners"
         _pyngl.mpLeftCornerLonF = geobounds.bottom_left.lon
         _pyngl.mpLeftCornerLatF = geobounds.bottom_left.lat
         _pyngl.mpRightCornerLonF = geobounds.top_right.lon

src/wrf/projutils.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from .py3compat import viewitems
 

src/wrf/py3compat.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from sys import version_info
 from math import floor, copysign

src/wrf/routines.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from .util import (get_iterable, is_standard_wrf_var, extract_vars, viewkeys,
                    get_id)
@@ -22,7 +21,7 @@ from .g_uvmet import (get_uvmet, get_uvmet10, get_uvmet10_wspd_wdir,
 from .g_vorticity import get_avo, get_pvo
 from .g_wind import (get_destag_wspd_wdir, get_destag_wspd_wdir10, 
                    get_u_destag, get_v_destag, get_w_destag)
-from .g_times import get_times
+from .g_times import get_times, get_xtimes
 from .g_cloudfrac import get_cloudfrac
 
 
@@ -52,6 +51,7 @@ _FUNC_MAP = {"cape2d" : get_2dcape,
              "twb" : get_tw, 
              "terrain" : get_terrain,
              "times" : get_times,
+             "xtimes" : get_xtimes,
              "uvmet" : get_uvmet, 
              "uvmet10" : get_uvmet10,
              "avo" : get_avo,
@@ -97,6 +97,7 @@ _VALID_KARGS = {"cape2d" : ["missing"],
              "twb" : ["units"], 
              "terrain" : ["units"],
              "times" : [],
+             "xtimes" : [],
              "uvmet" : ["units"], 
              "uvmet10" : ["units"],
              "avo" : [],

src/wrf/specialdec.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 import numpy as np
 

src/wrf/units.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 from .constants import Constants, ConversionFactors
 

src/wrf/util.py

@@ -1,5 +1,4 @@
-from __future__ import (absolute_import, division, print_function, 
+from __future__ import (absolute_import, division, print_function)
-                        unicode_literals)
 
 import os
 from sys import version_info
@@ -31,7 +30,7 @@ import numpy.ma as ma
 
 from .config import xarray_enabled
 from .constants import default_fill, ALL_TIMES
-from .py3compat import (viewitems, viewkeys, isstr, py3range, ucode)
+from .py3compat import (viewitems, viewkeys, isstr, py3range)
 from .cache import cache_item, get_cached_item
 from .geobnds import GeoBounds, NullGeoBounds
 from .coordpair import CoordPair
@@ -1722,7 +1721,7 @@ def _cat_files(wrfseq, varname, timeidx, is_moving, squeeze, meta, _key):
         if not timecached and outxtimes is not None:
             cache_item(_key, timekey, outxtimes)
             
-        outname = ucode(first_var.name)
+        outname = first_var.name
         outattrs = OrderedDict(first_var.attrs)
         outcoords = OrderedDict(first_var.coords)
         outdimnames = list(first_var.dims)
@@ -1986,7 +1985,7 @@ def _join_files(wrfseq, varname, timeidx, is_moving, meta, _key):
         if not timecached and outxtimes is not None:
             cache_item(_key, timekey, outxtimes)
         
-        outname = ucode(first_var.name)
+        outname = first_var.name
         outcoords = OrderedDict(first_var.coords)
         outattrs = OrderedDict(first_var.attrs)
         # New dimensions

src/wrf/version.py

@@ -1,2 +1,2 @@
-__version__ = "1.1.3"
+__version__ = "1.2.0"