Calculations are getting there
This commit is contained in:
parent
56d15ef499
commit
8e483e1325
1 changed files with 13 additions and 6 deletions
|
@ -252,7 +252,9 @@ class SoundingParams():
|
||||||
|
|
||||||
temp_line = sounding.follow_temp()
|
temp_line = sounding.follow_temp()
|
||||||
dewpoint_line = sounding.follow_dewpoint()
|
dewpoint_line = sounding.follow_dewpoint()
|
||||||
dry_adiabat = follow_dry_adiabat(tv, surface.pressure)
|
virtual_temp_line = sounding.follow_virtual_temp()
|
||||||
|
|
||||||
|
dry_adiabat = follow_dry_adiabat(surface.temp, surface.pressure)
|
||||||
|
|
||||||
mixing_ratio_line = follow_saturated_mixing_ratio(surface.dewpoint,
|
mixing_ratio_line = follow_saturated_mixing_ratio(surface.dewpoint,
|
||||||
surface.pressure)
|
surface.pressure)
|
||||||
|
@ -266,15 +268,20 @@ class SoundingParams():
|
||||||
|
|
||||||
moist_adiabat = follow_moist_adiabat(tv2, lcl[1])
|
moist_adiabat = follow_moist_adiabat(tv2, lcl[1])
|
||||||
|
|
||||||
lfc = moist_adiabat.intersect(temp_line, SeriesIntersection.GREATER)
|
lfc = moist_adiabat.intersect(virtual_temp_line,
|
||||||
|
SeriesIntersection.GREATER)
|
||||||
|
|
||||||
el = temp_line.intersect(moist_adiabat, SeriesIntersection.GREATER,
|
el = temp_line.intersect(moist_adiabat,
|
||||||
|
SeriesIntersection.GREATER,
|
||||||
lfc[1])
|
lfc[1])
|
||||||
|
|
||||||
self.lcl = lcl
|
self.lcl = lcl
|
||||||
self.lfc = lfc
|
self.lfc = lfc
|
||||||
self.el = el
|
self.el = el
|
||||||
self.cape = SoundingParams.cape(temp_line, moist_adiabat, lfc, el)
|
self.cape = SoundingParams.cape(virtual_temp_line,
|
||||||
|
moist_adiabat,
|
||||||
|
lfc,
|
||||||
|
el)
|
||||||
|
|
||||||
self.temp_line = temp_line
|
self.temp_line = temp_line
|
||||||
self.dry_adiabat = dry_adiabat
|
self.dry_adiabat = dry_adiabat
|
||||||
|
|
Loading…
Add table
Reference in a new issue