diff --git a/wrf_open/var/src/python/wrf/var/__init__.py b/wrf_open/var/src/python/wrf/var/__init__.py index 42d1417..4c66b74 100755 --- a/wrf_open/var/src/python/wrf/var/__init__.py +++ b/wrf_open/var/src/python/wrf/var/__init__.py @@ -12,8 +12,8 @@ from ctt import * import ctt from dbz import * import dbz -from destagger import * -import destagger +from destag import * +import destag from dewpoint import * import dewpoint from etaconv import * @@ -62,7 +62,7 @@ __all__ += cape.__all__ __all__ += constants.__all__ __all__ += ctt.__all__ __all__ += dbz.__all__ -__all__ += destagger.__all__ +__all__ += destag.__all__ __all__ += dewpoint.__all__ __all__ += etaconv.__all__ __all__ += geoht.__all__ diff --git a/wrf_open/var/src/python/wrf/var/cape.py b/wrf_open/var/src/python/wrf/var/cape.py index 73bb548..a3ce834 100755 --- a/wrf_open/var/src/python/wrf/var/cape.py +++ b/wrf_open/var/src/python/wrf/var/cape.py @@ -2,7 +2,7 @@ import numpy as n import numpy.ma as ma from wrf.var.extension import computetk,computecape -from wrf.var.destagger import destagger +from wrf.var.destag import destagger from wrf.var.constants import Constants, ConversionFactors from wrf.var.util import extract_vars diff --git a/wrf_open/var/src/python/wrf/var/ctt.py b/wrf_open/var/src/python/wrf/var/ctt.py index b364208..e092f8a 100644 --- a/wrf_open/var/src/python/wrf/var/ctt.py +++ b/wrf_open/var/src/python/wrf/var/ctt.py @@ -3,7 +3,7 @@ import numpy as n from wrf.var.extension import computectt, computetk from wrf.var.constants import Constants, ConversionFactors -from wrf.var.destagger import destagger +from wrf.var.destag import destagger from wrf.var.decorators import convert_units from wrf.var.util import extract_vars diff --git a/wrf_open/var/src/python/wrf/var/decorators.py b/wrf_open/var/src/python/wrf/var/decorators.py index 9c5f972..d0a1c80 100644 --- a/wrf_open/var/src/python/wrf/var/decorators.py +++ b/wrf_open/var/src/python/wrf/var/decorators.py @@ -5,7 +5,7 @@ from itertools import product import numpy as n from wrf.var.units import do_conversion, check_units -from wrf.var.destagger import destagger +from wrf.var.destag import destagger __all__ = ["convert_units", "handle_left_iter"] diff --git a/wrf_open/var/src/python/wrf/var/destag.py b/wrf_open/var/src/python/wrf/var/destag.py index 160f4e4..07d9350 100755 --- a/wrf_open/var/src/python/wrf/var/destag.py +++ b/wrf_open/var/src/python/wrf/var/destag.py @@ -1,5 +1,4 @@ -import numpy as n from wrf.var.util import extract_vars diff --git a/wrf_open/var/src/python/wrf/var/geoht.py b/wrf_open/var/src/python/wrf/var/geoht.py index edd40cc..caf5810 100755 --- a/wrf_open/var/src/python/wrf/var/geoht.py +++ b/wrf_open/var/src/python/wrf/var/geoht.py @@ -1,5 +1,5 @@ from wrf.var.constants import Constants -from wrf.var.destagger import destagger +from wrf.var.destag import destagger from wrf.var.decorators import convert_units from wrf.var.util import extract_vars diff --git a/wrf_open/var/src/python/wrf/var/helicity.py b/wrf_open/var/src/python/wrf/var/helicity.py index 09220b9..91ec9b4 100755 --- a/wrf_open/var/src/python/wrf/var/helicity.py +++ b/wrf_open/var/src/python/wrf/var/helicity.py @@ -1,7 +1,7 @@ from wrf.var.constants import Constants from wrf.var.extension import computesrh, computeuh -from wrf.var.destagger import destagger +from wrf.var.destag import destagger from wrf.var.util import extract_vars, extract_global_attrs __all__ = ["get_srh", "get_uh"] diff --git a/wrf_open/var/src/python/wrf/var/omega.py b/wrf_open/var/src/python/wrf/var/omega.py index a78812e..5d4d371 100755 --- a/wrf_open/var/src/python/wrf/var/omega.py +++ b/wrf_open/var/src/python/wrf/var/omega.py @@ -1,6 +1,6 @@ from wrf.var.constants import Constants -from wrf.var.destagger import destagger +from wrf.var.destag import destagger from wrf.var.extension import computeomega,computetk from wrf.var.util import extract_vars diff --git a/wrf_open/var/src/python/wrf/var/slp.py b/wrf_open/var/src/python/wrf/var/slp.py index cbde168..13dd557 100755 --- a/wrf_open/var/src/python/wrf/var/slp.py +++ b/wrf_open/var/src/python/wrf/var/slp.py @@ -1,6 +1,6 @@ from wrf.var.extension import computeslp, computetk from wrf.var.constants import Constants -from wrf.var.destagger import destagger +from wrf.var.destag import destagger from wrf.var.decorators import convert_units from wrf.var.util import extract_vars diff --git a/wrf_open/var/src/python/wrf/var/uvmet.py b/wrf_open/var/src/python/wrf/var/uvmet.py index 6181841..42b2a87 100755 --- a/wrf_open/var/src/python/wrf/var/uvmet.py +++ b/wrf_open/var/src/python/wrf/var/uvmet.py @@ -1,7 +1,7 @@ from math import fabs, log, tan, sin, cos from wrf.var.extension import computeuvmet -from wrf.var.destagger import destagger +from wrf.var.destag import destagger from wrf.var.constants import Constants from wrf.var.wind import _calc_wspd_wdir from wrf.var.decorators import convert_units diff --git a/wrf_open/var/src/python/wrf/var/wind.py b/wrf_open/var/src/python/wrf/var/wind.py index 92dd1cd..38b3dfc 100755 --- a/wrf_open/var/src/python/wrf/var/wind.py +++ b/wrf_open/var/src/python/wrf/var/wind.py @@ -2,7 +2,7 @@ import numpy as n from wrf.var.constants import Constants -from wrf.var.destagger import destagger_windcomp +from wrf.var.destag import destagger_windcomp from wrf.var.decorators import convert_units __all__ = ["get_u_destag", "get_v_destag", "get_w_destag",