From 8b21b10860c7146e43ac6328f2d6f66095598dc4 Mon Sep 17 00:00:00 2001 From: Bill Ladwig Date: Mon, 18 Dec 2017 13:55:52 -0700 Subject: [PATCH] Renamed the internal 'get_' modules to have their names start with 'g_' to avoid naming issues with the raw computational routines. Closes #33. Closes #32. --- doc/source/internal_api/index.rst | 80 ++++++++++++------------ fortran/rip_cape.f90 | 2 +- src/wrf/api.py | 2 +- src/wrf/{cape.py => g_cape.py} | 0 src/wrf/{cloudfrac.py => g_cloudfrac.py} | 2 +- src/wrf/{ctt.py => g_ctt.py} | 0 src/wrf/{dbz.py => g_dbz.py} | 0 src/wrf/{dewpoint.py => g_dewpoint.py} | 0 src/wrf/{geoht.py => g_geoht.py} | 0 src/wrf/{helicity.py => g_helicity.py} | 0 src/wrf/{latlon.py => g_latlon.py} | 0 src/wrf/{omega.py => g_omega.py} | 0 src/wrf/{precip.py => g_precip.py} | 0 src/wrf/{pressure.py => g_pressure.py} | 0 src/wrf/{pw.py => g_pw.py} | 0 src/wrf/{rh.py => g_rh.py} | 0 src/wrf/{slp.py => g_slp.py} | 0 src/wrf/{temp.py => g_temp.py} | 0 src/wrf/{terrain.py => g_terrain.py} | 0 src/wrf/{times.py => g_times.py} | 0 src/wrf/{uvmet.py => g_uvmet.py} | 2 +- src/wrf/{vorticity.py => g_vorticity.py} | 0 src/wrf/{wind.py => g_wind.py} | 0 src/wrf/interp.py | 8 +-- src/wrf/routines.py | 38 +++++------ 25 files changed, 67 insertions(+), 67 deletions(-) rename src/wrf/{cape.py => g_cape.py} (100%) rename src/wrf/{cloudfrac.py => g_cloudfrac.py} (99%) rename src/wrf/{ctt.py => g_ctt.py} (100%) rename src/wrf/{dbz.py => g_dbz.py} (100%) rename src/wrf/{dewpoint.py => g_dewpoint.py} (100%) rename src/wrf/{geoht.py => g_geoht.py} (100%) rename src/wrf/{helicity.py => g_helicity.py} (100%) rename src/wrf/{latlon.py => g_latlon.py} (100%) rename src/wrf/{omega.py => g_omega.py} (100%) rename src/wrf/{precip.py => g_precip.py} (100%) rename src/wrf/{pressure.py => g_pressure.py} (100%) rename src/wrf/{pw.py => g_pw.py} (100%) rename src/wrf/{rh.py => g_rh.py} (100%) rename src/wrf/{slp.py => g_slp.py} (100%) rename src/wrf/{temp.py => g_temp.py} (100%) rename src/wrf/{terrain.py => g_terrain.py} (100%) rename src/wrf/{times.py => g_times.py} (100%) rename src/wrf/{uvmet.py => g_uvmet.py} (99%) rename src/wrf/{vorticity.py => g_vorticity.py} (100%) rename src/wrf/{wind.py => g_wind.py} (100%) diff --git a/doc/source/internal_api/index.rst b/doc/source/internal_api/index.rst index 11fa312..a41775b 100644 --- a/doc/source/internal_api/index.rst +++ b/doc/source/internal_api/index.rst @@ -13,46 +13,46 @@ The routines below are called internally by :meth:`wrf.getvar`. :nosignatures: :toctree: ./generated/ - wrf.cape.get_2dcape - wrf.cape.get_3dcape - wrf.cloudfrac.get_cloudfrac - wrf.ctt.get_ctt - wrf.dbz.get_dbz - wrf.dbz.get_max_dbz - wrf.dewpoint.get_dp - wrf.dewpoint.get_dp_2m - wrf.geoht.get_geopt - wrf.geoht.get_height - wrf.helicity.get_srh - wrf.helicity.get_uh - wrf.omega.get_omega - wrf.pressure.get_pressure - wrf.pressure.get_pressure_hpa - wrf.pw.get_pw - wrf.rh.get_rh - wrf.rh.get_rh_2m - wrf.slp.get_slp - wrf.temp.get_theta - wrf.temp.get_temp - wrf.temp.get_eth - wrf.temp.get_tv - wrf.temp.get_tw - wrf.temp.get_tk - wrf.temp.get_tc - wrf.terrain.get_terrain - wrf.times.get_times - wrf.times.get_xtimes - wrf.uvmet.get_uvmet - wrf.uvmet.get_uvmet10 - wrf.uvmet.get_uvmet_wspd_wdir - wrf.uvmet.get_uvmet10_wspd_wdir - wrf.vorticity.get_avo - wrf.vorticity.get_pvo - wrf.wind.get_u_destag - wrf.wind.get_v_destag - wrf.wind.get_w_destag - wrf.wind.get_destag_wspd_wdir - wrf.wind.get_destag_wspd_wdir10 + wrf.g_cape.get_2dcape + wrf.g_cape.get_3dcape + wrf.g_cloudfrac.get_cloudfrac + wrf.g_ctt.get_ctt + wrf.g_dbz.get_dbz + wrf.g_dbz.get_max_dbz + wrf.g_dewpoint.get_dp + wrf.g_dewpoint.get_dp_2m + wrf.g_geoht.get_geopt + wrf.g_geoht.get_height + wrf.g_helicity.get_srh + wrf.g_helicity.get_uh + wrf.g_omega.get_omega + wrf.g_pressure.get_pressure + wrf.g_pressure.get_pressure_hpa + wrf.g_pw.get_pw + wrf.g_rh.get_rh + wrf.g_rh.get_rh_2m + wrf.g_slp.get_slp + wrf.g_temp.get_theta + wrf.g_temp.get_temp + wrf.g_temp.get_eth + wrf.g_temp.get_tv + wrf.g_temp.get_tw + wrf.g_temp.get_tk + wrf.g_temp.get_tc + wrf.g_terrain.get_terrain + wrf.g_times.get_times + wrf.g_times.get_xtimes + wrf.g_uvmet.get_uvmet + wrf.g_uvmet.get_uvmet10 + wrf.g_uvmet.get_uvmet_wspd_wdir + wrf.g_uvmet.get_uvmet10_wspd_wdir + wrf.g_vorticity.get_avo + wrf.g_vorticity.get_pvo + wrf.g_wind.get_u_destag + wrf.g_wind.get_v_destag + wrf.g_wind.get_w_destag + wrf.g_wind.get_destag_wspd_wdir + wrf.g_wind.get_destag_wspd_wdir10 ------------------------- diff --git a/fortran/rip_cape.f90 b/fortran/rip_cape.f90 index dc5b79b..be05b79 100644 --- a/fortran/rip_cape.f90 +++ b/fortran/rip_cape.f90 @@ -710,7 +710,7 @@ SUBROUTINE DCAPECALC2D(prs,tmk,qvp,ght,ter,sfp,cape,cin,& !$OMP facden, tmkenv, qvpenv, eslift, qvplift, buoy, benamin, & !$OMP benaccum, zrel, kmax, dz, elfound, & !$OMP kel, klfc, pavg, p2, p1, totthe, totqvp, totprs, & - !$OMP i, j, k, kpar, kpar1, kpar2, qvppari, tmkpari,p, pup, pdn, q, th, & + !$OMP i, j, k, kpar, kpar1, kpar2, qvppari, tmkpari,p, pup, pdn, th, & !$OMP pp1, pp2, ethmax, eth_temp, klev) SCHEDULE(runtime) DO j = 1,mjy DO i = 1,mix diff --git a/src/wrf/api.py b/src/wrf/api.py index 9333b2d..0542972 100644 --- a/src/wrf/api.py +++ b/src/wrf/api.py @@ -29,7 +29,7 @@ from .extension import (DiagnosticError, omp_set_num_threads, omp_test_lock, omp_test_nest_lock, omp_get_wtime, omp_get_wtick) from .interp import (interplevel, vertcross, interpline, vinterp) -from .latlon import (xy_to_ll, ll_to_xy, xy_to_ll_proj, ll_to_xy_proj) +from .g_latlon import (xy_to_ll, ll_to_xy, xy_to_ll_proj, ll_to_xy_proj) from .py3compat import (viewitems, viewkeys, viewvalues, isstr, py2round, py3range, ucode) from .util import (to_np, extract_global_attrs, is_standard_wrf_var, diff --git a/src/wrf/cape.py b/src/wrf/g_cape.py similarity index 100% rename from src/wrf/cape.py rename to src/wrf/g_cape.py diff --git a/src/wrf/cloudfrac.py b/src/wrf/g_cloudfrac.py similarity index 99% rename from src/wrf/cloudfrac.py rename to src/wrf/g_cloudfrac.py index f093146..76c4356 100644 --- a/src/wrf/cloudfrac.py +++ b/src/wrf/g_cloudfrac.py @@ -8,7 +8,7 @@ from .constants import Constants, default_fill from .extension import _tk, _rh, _cloudfrac from .metadecorators import set_cloudfrac_metadata from .util import extract_vars -from .geoht import _get_geoht +from .g_geoht import _get_geoht @set_cloudfrac_metadata() diff --git a/src/wrf/ctt.py b/src/wrf/g_ctt.py similarity index 100% rename from src/wrf/ctt.py rename to src/wrf/g_ctt.py diff --git a/src/wrf/dbz.py b/src/wrf/g_dbz.py similarity index 100% rename from src/wrf/dbz.py rename to src/wrf/g_dbz.py diff --git a/src/wrf/dewpoint.py b/src/wrf/g_dewpoint.py similarity index 100% rename from src/wrf/dewpoint.py rename to src/wrf/g_dewpoint.py diff --git a/src/wrf/geoht.py b/src/wrf/g_geoht.py similarity index 100% rename from src/wrf/geoht.py rename to src/wrf/g_geoht.py diff --git a/src/wrf/helicity.py b/src/wrf/g_helicity.py similarity index 100% rename from src/wrf/helicity.py rename to src/wrf/g_helicity.py diff --git a/src/wrf/latlon.py b/src/wrf/g_latlon.py similarity index 100% rename from src/wrf/latlon.py rename to src/wrf/g_latlon.py diff --git a/src/wrf/omega.py b/src/wrf/g_omega.py similarity index 100% rename from src/wrf/omega.py rename to src/wrf/g_omega.py diff --git a/src/wrf/precip.py b/src/wrf/g_precip.py similarity index 100% rename from src/wrf/precip.py rename to src/wrf/g_precip.py diff --git a/src/wrf/pressure.py b/src/wrf/g_pressure.py similarity index 100% rename from src/wrf/pressure.py rename to src/wrf/g_pressure.py diff --git a/src/wrf/pw.py b/src/wrf/g_pw.py similarity index 100% rename from src/wrf/pw.py rename to src/wrf/g_pw.py diff --git a/src/wrf/rh.py b/src/wrf/g_rh.py similarity index 100% rename from src/wrf/rh.py rename to src/wrf/g_rh.py diff --git a/src/wrf/slp.py b/src/wrf/g_slp.py similarity index 100% rename from src/wrf/slp.py rename to src/wrf/g_slp.py diff --git a/src/wrf/temp.py b/src/wrf/g_temp.py similarity index 100% rename from src/wrf/temp.py rename to src/wrf/g_temp.py diff --git a/src/wrf/terrain.py b/src/wrf/g_terrain.py similarity index 100% rename from src/wrf/terrain.py rename to src/wrf/g_terrain.py diff --git a/src/wrf/times.py b/src/wrf/g_times.py similarity index 100% rename from src/wrf/times.py rename to src/wrf/g_times.py diff --git a/src/wrf/uvmet.py b/src/wrf/g_uvmet.py similarity index 99% rename from src/wrf/uvmet.py rename to src/wrf/g_uvmet.py index 6dba5e6..5ef19a3 100755 --- a/src/wrf/uvmet.py +++ b/src/wrf/g_uvmet.py @@ -9,7 +9,7 @@ import numpy as np from .extension import _uvmet from .destag import destagger from .constants import Constants -from .wind import _calc_wspd_wdir +from .g_wind import _calc_wspd_wdir from .decorators import convert_units from .metadecorators import set_wind_metadata from .util import extract_vars, extract_global_attrs, either diff --git a/src/wrf/vorticity.py b/src/wrf/g_vorticity.py similarity index 100% rename from src/wrf/vorticity.py rename to src/wrf/g_vorticity.py diff --git a/src/wrf/wind.py b/src/wrf/g_wind.py similarity index 100% rename from src/wrf/wind.py rename to src/wrf/g_wind.py diff --git a/src/wrf/interp.py b/src/wrf/interp.py index bf9e34b..403abd6 100755 --- a/src/wrf/interp.py +++ b/src/wrf/interp.py @@ -12,10 +12,10 @@ from .util import extract_vars, is_staggered, get_id, to_np from .py3compat import py3range from .interputils import get_xy, get_xy_z_params, to_xy_coords from .constants import Constants, default_fill, ConversionFactors -from .terrain import get_terrain -from .geoht import get_height -from .temp import get_theta, get_temp, get_eth -from .pressure import get_pressure +from wrf.g_terrain import get_terrain +from wrf.g_geoht import get_height +from wrf.g_temp import get_theta, get_temp, get_eth +from wrf.g_pressure import get_pressure # Note: Extension decorator is good enough to handle left dims diff --git a/src/wrf/routines.py b/src/wrf/routines.py index 4aed3d8..3267598 100644 --- a/src/wrf/routines.py +++ b/src/wrf/routines.py @@ -3,27 +3,27 @@ from __future__ import (absolute_import, division, print_function, from .util import (get_iterable, is_standard_wrf_var, extract_vars, viewkeys, get_id) -from .cape import get_2dcape, get_3dcape -from .ctt import get_ctt -from .dbz import get_dbz, get_max_dbz -from .dewpoint import get_dp, get_dp_2m -from .geoht import get_geopt, get_height -from .helicity import get_srh, get_uh -from .latlon import get_lat, get_lon -from .omega import get_omega -from .pressure import get_pressure, get_pressure_hpa -from .pw import get_pw -from .rh import get_rh, get_rh_2m -from .slp import get_slp -from .temp import get_tc, get_eth, get_temp, get_theta, get_tk, get_tv, get_tw -from .terrain import get_terrain -from .uvmet import (get_uvmet, get_uvmet10, get_uvmet10_wspd_wdir, +from .g_cape import get_2dcape, get_3dcape +from .g_ctt import get_ctt +from .g_dbz import get_dbz, get_max_dbz +from .g_dewpoint import get_dp, get_dp_2m +from .g_geoht import get_geopt, get_height +from .g_helicity import get_srh, get_uh +from .g_latlon import get_lat, get_lon +from .g_omega import get_omega +from .g_pressure import get_pressure, get_pressure_hpa +from .g_pw import get_pw +from .g_rh import get_rh, get_rh_2m +from .g_slp import get_slp +from .g_temp import get_tc, get_eth, get_temp, get_theta, get_tk, get_tv, get_tw +from .g_terrain import get_terrain +from .g_uvmet import (get_uvmet, get_uvmet10, get_uvmet10_wspd_wdir, get_uvmet_wspd_wdir) -from .vorticity import get_avo, get_pvo -from .wind import (get_destag_wspd_wdir, get_destag_wspd_wdir10, +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 .times import get_times -from .cloudfrac import get_cloudfrac +from .g_times import get_times +from .g_cloudfrac import get_cloudfrac # func is the function to call. kargs are required arguments that should