Merge pull request #1554 from dopplershift/montgomery

MNT: Refactor montgomery_streamfunction

src/metpy/calc/kinematics.py

@@ -484,8 +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 +517,11 @@ def montgomery_streamfunction(height, temperature):
 
     See Also
     --------
-    get_isentropic_pressure
+    get_isentropic_pressure, dry_static_energy
 
     """
-    return (mpconsts.g * height) + (mpconsts.Cp_d * temperature)
+    from . import dry_static_energy
+    return dry_static_energy(height, temperature)
 
 
 @exporter.export

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')