Skip to content

Commit

Permalink
comply with whitespace and linewidth conventions
Browse files Browse the repository at this point in the history
  • Loading branch information
Osamu Miyawaki committed Oct 19, 2023
1 parent b052f98 commit 4522473
Showing 1 changed file with 45 additions and 20 deletions.
65 changes: 45 additions & 20 deletions src/metpy/calc/thermo.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,8 @@ def dry_lapse(pressure, temperature, reference_pressure=None, vertical_dim=0):
},
'[temperature]'
)
def moist_lapse(pressure, temperature, reference_pressure=None, lapse_type='standard', params=None):
def moist_lapse(pressure, temperature, reference_pressure=None,
lapse_type='standard', params=None):
r"""Calculate the temperature at a level assuming liquid saturation processes.
This function lifts a parcel starting at `temperature`. The starting pressure can
Expand Down Expand Up @@ -305,7 +306,8 @@ def moist_lapse(pressure, temperature, reference_pressure=None, lapse_type='stan
For 'r14': {
'de': scalar or 1-d array, detrainment rate [m**-1],
'ep': scalar or 1-d array, entrainment rate [m**-1],
'pa': 1-d array, optional, pressure levels defining detrainment and entrainment profile [Pa]
'pa': 1-d array, optional, pressure levels
defining detrainment and entrainment profile [Pa]
}
Returns
Expand Down Expand Up @@ -357,46 +359,65 @@ def dt_standard(p, t, params):

def dt_pseudoadiabatic(p, t, params):
rs = saturation_mixing_ratio._nounit(p, t)
frac = ( (1 + rs)*(mpconsts.nounit.Rd * t + mpconsts.nounit.Lv * rs)
/ (mpconsts.nounit.Cp_d + rs*mpconsts.nounit.Cv_d + (mpconsts.nounit.Lv**2 * rs * (mpconsts.nounit.epsilon + rs)
frac = ( (1 + rs) * (mpconsts.nounit.Rd * t + mpconsts.nounit.Lv * rs)
/ (mpconsts.nounit.Cp_d + rs * mpconsts.nounit.Cv_d +

Check failure on line 363 in src/metpy/calc/thermo.py

View workflow job for this annotation

GitHub Actions / Flake8 

[flake8] reported by reviewdog 🐶
W291 [*] Trailing whitespace

Raw Output:
src/metpy/calc/thermo.py:363:70: W291 [*] Trailing whitespace
(mpconsts.nounit.Lv**2 * rs * (mpconsts.nounit.epsilon + rs)
/ (mpconsts.nounit.Rd * t**2))))
return frac / p

def dt_reversible(p, t, params):
rs = saturation_mixing_ratio._nounit(p, t)
rl = params['rt'] - rs ## assuming no ice content
frac = ( (1 + params['rt'])*(mpconsts.nounit.Rd * t + mpconsts.nounit.Lv * rs)
/ (mpconsts.nounit.Cp_d + rs*mpconsts.nounit.Cv_d + rl*mpconsts.nounit.Cp_l + (mpconsts.nounit.Lv**2 * rs * (mpconsts.nounit.epsilon + rs)
frac = ( (1 + params['rt']) * (mpconsts.nounit.Rd * t + mpconsts.nounit.Lv * rs)
/ (mpconsts.nounit.Cp_d + rs * mpconsts.nounit.Cv_d +

Check failure on line 372 in src/metpy/calc/thermo.py

View workflow job for this annotation

GitHub Actions / Flake8 

[flake8] reported by reviewdog 🐶
W291 [*] Trailing whitespace

Raw Output:
src/metpy/calc/thermo.py:372:70: W291 [*] Trailing whitespace
rl * mpconsts.nounit.Cp_l + (mpconsts.nounit.Lv**2 * rs *

Check failure on line 373 in src/metpy/calc/thermo.py

View workflow job for this annotation

GitHub Actions / Flake8 

[flake8] reported by reviewdog 🐶
W291 [*] Trailing whitespace

Raw Output:
src/metpy/calc/thermo.py:373:78: W291 [*] Trailing whitespace
(mpconsts.nounit.epsilon + rs)
/ (mpconsts.nounit.Rd * t**2))))
return frac / p

def dt_so13(p, t, params):
zp = -params['h0']*np.log(p/params['p0']) # pseudoheight
zp = -params['h0'] * np.log(p / params['p0']) # pseudoheight
if np.abs(zp)==0: # entrainment rate undefined at z=0, assume dry adiabat
frac = mpconsts.nounit.Rd * t / mpconsts.nounit.Cp_d
else:
ep = params['ep0']/zp # entrainment rate
ep = params['ep0'] / zp # entrainment rate
rs = saturation_mixing_ratio._nounit(p, t)
qs = specific_humidity_from_mixing_ratio(rs)
frac = (
(mpconsts.nounit.Rd*t + mpconsts.nounit.Lv*qs + ep*qs*mpconsts.nounit.Lv*(1-params['rh0'])*mpconsts.nounit.Rd*t/mpconsts.nounit.g)
(mpconsts.nounit.Rd * t + mpconsts.nounit.Lv * qs +

Check failure on line 387 in src/metpy/calc/thermo.py

View workflow job for this annotation

GitHub Actions / Flake8 

[flake8] reported by reviewdog 🐶
W291 [*] Trailing whitespace

Raw Output:
src/metpy/calc/thermo.py:387:68: W291 [*] Trailing whitespace
ep * qs * mpconsts.nounit.Lv * (1 - params['rh0']) *
mpconsts.nounit.Rd * t / mpconsts.nounit.g)
/ (mpconsts.nounit.Cp_d + (
mpconsts.nounit.Lv**2 * qs * mpconsts.nounit.epsilon
/ (mpconsts.nounit.Rd * t**2)
))
)
frac = np.min([frac, mpconsts.nounit.Rd * t / mpconsts.nounit.Cp_d]) # cap lapse rate at dry adiabat
# cap lapse rate at dry adiabat (can be steeper with large entrainment rate)
frac = np.min([frac, mpconsts.nounit.Rd * t / mpconsts.nounit.Cp_d])

Check failure on line 396 in src/metpy/calc/thermo.py

View workflow job for this annotation

GitHub Actions / Flake8 

[flake8] reported by reviewdog 🐶
W291 [*] Trailing whitespace

Raw Output:
src/metpy/calc/thermo.py:396:81: W291 [*] Trailing whitespace
return frac / p

def dt_r14(p, t, params):
ep = np.interp(p,params['pa'],params['ep']) if hasattr(params['ep'],'__len__') else params['ep'] # entrainment rate at p
de = np.interp(p,params['pa'],params['de']) if hasattr(params['de'],'__len__') else params['de'] # detrainment rate at p
if hasattr(params['ep'],'__len__'): # evaluate entrainment rate at p if not constant
ep = np.interp(p,params['pa'],params['ep'])
else:
ep = params['ep']
if hasattr(params['de'],'__len__'): # same as above for detrainment
de = np.interp(p,params['pa'],params['de'])
else:
de = params['de']
rs = saturation_mixing_ratio._nounit(p, t)
qs = specific_humidity_from_mixing_ratio(rs)
a1 = mpconsts.nounit.Rv*mpconsts.nounit.Cp_d*t**2/mpconsts.nounit.Lv + qs*mpconsts.nounit.Lv
a2 = mpconsts.nounit.Rv*mpconsts.nounit.Cp_d*t**2/mpconsts.nounit.Lv*(de+mpconsts.nounit.g/(mpconsts.nounit.Rd*t)) + qs*mpconsts.nounit.Lv*(de-ep) - mpconsts.nounit.g
a3 = (mpconsts.nounit.Rv*mpconsts.nounit.Cp_d*t/(mpconsts.nounit.Rd*mpconsts.nounit.Lv) - 1)*mpconsts.nounit.g*de
frac = mpconsts.nounit.Rd*t/(mpconsts.nounit.g) * mpconsts.nounit.Rv*t**2/mpconsts.nounit.Lv * ((-a2+np.sqrt(a2**2-4*a1*a3))/(2*a1) + mpconsts.nounit.g/(mpconsts.nounit.Rd*t))
a1 = ( mpconsts.nounit.Rv * mpconsts.nounit.Cp_d * t**2 / mpconsts.nounit.Lv +

Check failure on line 410 in src/metpy/calc/thermo.py

View workflow job for this annotation

GitHub Actions / Flake8 

[flake8] reported by reviewdog 🐶
W291 [*] Trailing whitespace

Raw Output:
src/metpy/calc/thermo.py:410:87: W291 [*] Trailing whitespace
qs * mpconsts.nounit.Lv )
a2 = ( mpconsts.nounit.Rv * mpconsts.nounit.Cp_d * t**2 / mpconsts.nounit.Lv *
(de + mpconsts.nounit.g / (mpconsts.nounit.Rd * t)) +

Check failure on line 413 in src/metpy/calc/thermo.py

View workflow job for this annotation

GitHub Actions / Flake8 

[flake8] reported by reviewdog 🐶
W291 [*] Trailing whitespace

Raw Output:
src/metpy/calc/thermo.py:413:70: W291 [*] Trailing whitespace
qs * mpconsts.nounit.Lv * (de - ep) - mpconsts.nounit.g )
a3 = ( (mpconsts.nounit.Rv * mpconsts.nounit.Cp_d * t /
(mpconsts.nounit.Rd * mpconsts.nounit.Lv) - 1) * mpconsts.nounit.g * de )
frac = ( mpconsts.nounit.Rd * t / (mpconsts.nounit.g) *

Check failure on line 417 in src/metpy/calc/thermo.py

View workflow job for this annotation

GitHub Actions / Flake8 

[flake8] reported by reviewdog 🐶
W291 [*] Trailing whitespace

Raw Output:
src/metpy/calc/thermo.py:417:64: W291 [*] Trailing whitespace
mpconsts.nounit.Rv * t**2 / mpconsts.nounit.Lv *

Check failure on line 418 in src/metpy/calc/thermo.py

View workflow job for this annotation

GitHub Actions / Flake8 

[flake8] reported by reviewdog 🐶
W291 [*] Trailing whitespace

Raw Output:
src/metpy/calc/thermo.py:418:65: W291 [*] Trailing whitespace
((-a2+np.sqrt(a2**2 - 4 * a1 * a3)) / (2 * a1) +
mpconsts.nounit.g / (mpconsts.nounit.Rd * t)) )
return frac / p

temperature = np.atleast_1d(temperature)
Expand All @@ -410,10 +431,12 @@ def dt_r14(p, t, params):
dt=dt_pseudoadiabatic
elif lapse_type == 'reversible':
dt=dt_reversible
params={'rt':saturation_mixing_ratio._nounit(reference_pressure,temperature)} # total water at LCL = rs
# total water at LCL = rs
params={'rt':saturation_mixing_ratio._nounit(reference_pressure,temperature)}
elif lapse_type == 'so13':
dt=dt_so13
params.update({'h0':mpconsts.nounit.Rd * temperature[0] / mpconsts.nounit.g, 'p0':pressure[0]})
params.update({'h0':mpconsts.nounit.Rd * temperature[0] / mpconsts.nounit.g,
'p0':pressure[0]})
elif lapse_type == 'r14':
dt=dt_r14
else:
Expand Down Expand Up @@ -1037,7 +1060,8 @@ def parcel_profile(pressure, temperature, dewpoint, lapse_type='standard', param
For 'r14': {
'de': scalar or 1-d array, detrainment rate [m**-1],
'ep': scalar or 1-d array, entrainment rate [m**-1],
'pa': 1-d array, optional, pressure levels defining detrainment and entrainment profile [Pa]
'pa': 1-d array, optional, pressure levels
defining detrainment and entrainment profile [Pa]
}
Returns
Expand Down Expand Up @@ -1092,7 +1116,8 @@ def parcel_profile(pressure, temperature, dewpoint, lapse_type='standard', param
Renamed ``dewpt`` parameter to ``dewpoint``
"""
_, _, _, t_l, _, t_u = _parcel_profile_helper(pressure, temperature, dewpoint, lapse_type, params)
_, _, _, t_l, _, t_u = _parcel_profile_helper(pressure, temperature, dewpoint,
lapse_type, params)
return concatenate((t_l, t_u))


Expand Down

0 comments on commit 4522473

Please sign in to comment.