diff --git a/src/metpy/calc/kinematics.py b/src/metpy/calc/kinematics.py index 1ee602fe85f..2a81fd9fd7e 100644 --- a/src/metpy/calc/kinematics.py +++ b/src/metpy/calc/kinematics.py @@ -4,7 +4,7 @@ """Contains calculation of kinematic parameters (e.g. divergence or vorticity).""" import numpy as np -from . import coriolis_parameter +from . import coriolis_parameter, dry_static_energy from .tools import first_derivative, get_layer_heights, gradient from .. import constants as mpconsts from ..package_tools import Exporter @@ -484,7 +484,6 @@ def ageostrophic_wind(height, u, v, dx=None, dy=None, latitude=None, x_dim=-1, y @exporter.export -@preprocess_and_wrap(wrap_like='height', broadcast=('height', 'temperature')) @check_units('[length]', '[temperature]') def montgomery_streamfunction(height, temperature): r"""Compute the Montgomery Streamfunction on isentropic surfaces. @@ -519,10 +518,10 @@ def montgomery_streamfunction(height, temperature): See Also -------- - get_isentropic_pressure + get_isentropic_pressure, dry_static_energy """ - return (mpconsts.g * height) + (mpconsts.Cp_d * temperature) + return dry_static_energy(height, temperature) @exporter.export diff --git a/src/metpy/calc/thermo.py b/src/metpy/calc/thermo.py index 99b82295599..7b3392475e9 100644 --- a/src/metpy/calc/thermo.py +++ b/src/metpy/calc/thermo.py @@ -2358,6 +2358,10 @@ def dry_static_energy(height, temperature): `pint.Quantity` The dry static energy + See Also + -------- + montgomery_streamfunction + """ return (mpconsts.g * height + mpconsts.Cp_d * temperature).to('kJ/kg')