nilyin
/
wrf-python
forked from 3rdparty/wrf-python
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Moved some variable extraction to where it is needed. 

Fixed a unit issue with extrapolating pressure below ground.
Added support for height fields in km and pressure fields in hPa.
Updated documentation.
Fixes #71. Fixes #74.
lon0
Bill Ladwig 7 years ago
parent
881800e921
commit
cf188383ed
2 changed files with 74 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      fortran/wrf_vinterp.f90
  2. 86
      src/wrf/interp.py

6
fortran/wrf_vinterp.f90
Unescape View File

@ -340,7 +340,7 @@ SUBROUTINE wrf_vintrp(datain, dataout, pres, tk, qvp, ght, terrain,&
plev = ((ezlev - ezlhsl)*& plev = ((ezlev - ezlhsl)*&
psurf + (ezsurf - ezlev)*plhsl)/(ezsurf - ezlhsl) psurf + (ezsurf - ezlev)*plhsl)/(ezsurf - ezlhsl)
IF (icase .EQ. 1) THEN IF (icase .EQ. 1) THEN
tempout(i,j) = plev tempout(i,j) = plev * 100.
CYCLE CYCLE
END IF END IF
END IF END IF
@ -377,7 +377,7 @@ SUBROUTINE wrf_vintrp(datain, dataout, pres, tk, qvp, ght, terrain,&
zlev = -sclht*LOG(vlev) zlev = -sclht*LOG(vlev)
plev = pbot*(1. + USSALR/vt*(zbot - zlev))**EXPONI plev = pbot*(1. + USSALR/vt*(zbot - zlev))**EXPONI
IF (icase .EQ. 1) THEN IF (icase .EQ. 1) THEN
tempout(i,j) = plev tempout(i,j) = plev * 100.
CYCLE CYCLE
END IF END IF
END IF END IF
@ -395,7 +395,7 @@ SUBROUTINE wrf_vintrp(datain, dataout, pres, tk, qvp, ght, terrain,&
! Potential temperature - theta ! Potential temperature - theta
ELSE IF (icase .EQ. 5) THEN ELSE IF (icase .EQ. 5) THEN
tempout(i,j) = tlev*(1000.D0/plev)**gammam tempout(i,j) = tlev*(1000.D0/plev)**gammam
! extraolation for equivalent potential temperature ! extrapolation for equivalent potential temperature
ELSE IF (icase .EQ. 6) THEN ELSE IF (icase .EQ. 6) THEN
e = qvapor*plev/(EPS + qvapor) e = qvapor*plev/(EPS + qvapor)
tlcl = TLCLC1/(LOG(tlev**TLCLC2/e) - TLCLC3) + TLCLC4 tlcl = TLCLC1/(LOG(tlev**TLCLC2/e) - TLCLC3) + TLCLC4

86
src/wrf/interp.py
Unescape View File

@ -488,18 +488,24 @@ def vinterp(wrfin, field, vert_coord, interp_levels, extrapolate=False,
[K] [K]
interp_levels (sequence): A 1D sequence of vertical levels to interp_levels (sequence): A 1D sequence of vertical levels to
interpolate to. interpolate to. Values must be in the same units as specified
above for the *vert_coord* parameter.
extrapolate (:obj:`bool`, optional): Set to True to extrapolate extrapolate (:obj:`bool`, optional): Set to True to extrapolate
values below ground. Default is False. values below ground. This is only performed when the
vertical coordinate type is pressure or height. For temperature
vertical coordinate types, setting this to True will set
values below ground to the lowest model level. Default is False.
field_type (:obj:`str`, optional): field_type (:obj:`str`, optional):
The type of field. Default is None. The type of field. Default is None.
Valid strings are: Valid strings are:
* 'none': None * 'none': None
* 'pressure', 'pres', 'p': pressure * 'pressure', 'pres', 'p': pressure [Pa]
* 'z', 'ght': geopotential height * 'pressure_hpa', 'pres_hpa', 'p_hpa': pressure [hPa]
* 'z', 'ght': geopotential height [m]
* 'z_km', 'ght_km': geopotential height [km]
* 'tc': temperature [degC] * 'tc': temperature [degC]
* 'tk': temperature [K] * 'tk': temperature [K]
* 'theta', 'th': potential temperature [K] * 'theta', 'th': potential temperature [K]
@ -556,16 +562,22 @@ def vinterp(wrfin, field, vert_coord, interp_levels, extrapolate=False,
valid_coords = ("pressure", "pres", "p", "ght_msl", valid_coords = ("pressure", "pres", "p", "ght_msl",
"ght_agl", "theta", "th", "theta-e", "thetae", "eth") "ght_agl", "theta", "th", "theta-e", "thetae", "eth")
valid_field_types = ("none", "pressure", "pres", "p", "z", valid_field_types = ("none", "pressure", "pres", "p",
'pressure_hpa', 'pres_hpa', 'p_hpa', "z",
"tc", "tk", "theta", "th", "theta-e", "thetae", "tc", "tk", "theta", "th", "theta-e", "thetae",
"eth", "ght") "eth", "ght", 'z_km', 'ght_km')
icase_lookup = {"none" : 0, icase_lookup = {"none" : 0,
"p" : 1, "p" : 1,
"pres" : 1, "pres" : 1,
"pressure" : 1, "pressure" : 1,
"p_hpa" : 1,
"pres_hpa" : 1,
"pressure_hpa" : 1,
"z" : 2, "z" : 2,
"ght" : 2, "ght" : 2,
"z_km" : 2,
"ght_km" : 2,
"tc" : 3, "tc" : 3,
"tk" : 4, "tk" : 4,
"theta" : 5, "theta" : 5,
@ -574,6 +586,22 @@ def vinterp(wrfin, field, vert_coord, interp_levels, extrapolate=False,
"thetae" : 6, "thetae" : 6,
"eth" : 6} "eth" : 6}
in_unitmap = {"p_hpa" : 1.0/ConversionFactors.PA_TO_HPA,
"pres_hpa" : 1.0/ConversionFactors.PA_TO_HPA,
"pressure_hpa" : 1.0/ConversionFactors.PA_TO_HPA,
"z_km" : 1.0/ConversionFactors.M_TO_KM,
"ght_km" : 1.0/ConversionFactors.M_TO_KM,
}
out_unitmap = {"p_hpa" : ConversionFactors.PA_TO_HPA,
"pres_hpa" : ConversionFactors.PA_TO_HPA,
"pressure_hpa" : ConversionFactors.PA_TO_HPA,
"z_km" : ConversionFactors.M_TO_KM,
"ght_km" : ConversionFactors.M_TO_KM,
}
# These constants match what's in the fortran code. # These constants match what's in the fortran code.
rgas = Constants.RD rgas = Constants.RD
ussalr = Constants.USSALR ussalr = Constants.USSALR
@ -583,18 +611,21 @@ def vinterp(wrfin, field, vert_coord, interp_levels, extrapolate=False,
if not isinstance(interp_levels, np.ndarray): if not isinstance(interp_levels, np.ndarray):
interp_levels = np.asarray(interp_levels, np.float64) interp_levels = np.asarray(interp_levels, np.float64)
# TODO: Check if field is staggered if len(interp_levels) == 0:
raise ValueError("'interp_levels' contains no values")
# Check if field is staggered
if is_staggered(_wrfin, field): if is_staggered(_wrfin, field):
raise RuntimeError("Please unstagger field in the vertical") raise ValueError("Please unstagger field in the vertical")
# Check for valid coord # Check for valid coord
if vert_coord not in valid_coords: if vert_coord not in valid_coords:
raise RuntimeError("'%s' is not a valid vertical " raise ValueError("'%s' is not a valid vertical "
"coordinate type" % vert_coord) "coordinate type" % vert_coord)
# Check for valid field type # Check for valid field type
if field_type not in valid_field_types: if field_type not in valid_field_types:
raise RuntimeError("'%s' is not a valid field type" % field_type) raise ValueError("'%s' is not a valid field type" % field_type)
log_p_int = 1 if log_p else 0 log_p_int = 1 if log_p else 0
@ -605,14 +636,12 @@ def vinterp(wrfin, field, vert_coord, interp_levels, extrapolate=False,
extrap = 1 extrap = 1
icase = icase_lookup[field_type] icase = icase_lookup[field_type]
# Extract vriables # Extract variables
#timeidx = -1 # Should this be an argument? ncvars = extract_vars(_wrfin, timeidx, ("PSFC", "QVAPOR"),
ncvars = extract_vars(_wrfin, timeidx, ("PSFC", "QVAPOR", "F"),
method, squeeze, cache, meta=False, _key=_key) method, squeeze, cache, meta=False, _key=_key)
sfp = ncvars["PSFC"] * ConversionFactors.PA_TO_HPA sfp = ncvars["PSFC"] * ConversionFactors.PA_TO_HPA
qv = ncvars["QVAPOR"] qv = ncvars["QVAPOR"]
coriolis = ncvars["F"]
terht = get_terrain(_wrfin, timeidx, units="m", terht = get_terrain(_wrfin, timeidx, units="m",
method=method, squeeze=squeeze, cache=cache, method=method, squeeze=squeeze, cache=cache,
@ -652,6 +681,10 @@ def vinterp(wrfin, field, vert_coord, interp_levels, extrapolate=False,
method=method, squeeze=squeeze, cache=cache, method=method, squeeze=squeeze, cache=cache,
meta=False, _key=_key) meta=False, _key=_key)
coriolis = extract_vars(_wrfin, timeidx, "F",
method, squeeze, cache, meta=False,
_key=_key)["F"]
vcor = 4 vcor = 4
idir = 1 idir = 1
icorsw = 0 icorsw = 0
@ -675,6 +708,10 @@ def vinterp(wrfin, field, vert_coord, interp_levels, extrapolate=False,
eth = get_eth(_wrfin, timeidx, method=method, squeeze=squeeze, eth = get_eth(_wrfin, timeidx, method=method, squeeze=squeeze,
cache=cache, meta=False, _key=_key) cache=cache, meta=False, _key=_key)
coriolis = extract_vars(_wrfin, timeidx, "F",
method, squeeze, cache, meta=False,
_key=_key)["F"]
p_hpa = p * ConversionFactors.PA_TO_HPA p_hpa = p * ConversionFactors.PA_TO_HPA
vcord_array = _monotonic(eth, p_hpa, coriolis, idir, delta, icorsw) vcord_array = _monotonic(eth, p_hpa, coriolis, idir, delta, icorsw)
@ -694,11 +731,28 @@ def vinterp(wrfin, field, vert_coord, interp_levels, extrapolate=False,
"same value used when extracting the 'field' " "same value used when extracting the 'field' "
"variable.") "variable.")
res = _vintrp(field, p, tk, qv, ght, terht, sfp, smsfp, # Some field types are in different units than the Fortran routine
# expects
conv_factor = in_unitmap.get(field_type)
if conv_factor is not None:
field_ = field * conv_factor
else:
field_ = field
res = _vintrp(field_, p, tk, qv, ght, terht, sfp, smsfp,
vcord_array, interp_levels, vcord_array, interp_levels,
icase, extrap, vcor, log_p_int, missing) icase, extrap, vcor, log_p_int, missing)
return ma.masked_values(res, missing) conv_factor = out_unitmap.get(field_type)
if conv_factor is not None:
res_ = res * conv_factor
else:
res_ = res
return ma.masked_values(res_, missing)

Write Preview
Loading…
Cancel
Save