xan/xmet
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only follow temperature line once

Browse source
This commit is contained in:
XANTRONIX 2025-03-09 12:08:50 -04:00
parent 5f55060b09
commit 830425980d
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/xmet/sounding.py
View file

@ -185,9 +185,8 @@ class Sounding(DatabaseTable):
return series return series
def find_lfc(self, temp: float, pressure: float) -> tuple[float]: def find_lfc(self, temp: float, pressure: float, temp_line: Series) -> tuple[float]:
moist_adiabat = follow_moist_adiabat(temp, pressure) moist_adiabat = follow_moist_adiabat(temp, pressure)
temp_line = self.follow_temp()
pairs = nearest(sorted(moist_adiabat.keys(), reverse=True), pairs = nearest(sorted(moist_adiabat.keys(), reverse=True),
sorted(temp_line.keys(), reverse=True)) sorted(temp_line.keys(), reverse=True))
@ -198,9 +197,8 @@ class Sounding(DatabaseTable):
if v1 > v2: if v1 > v2:
return v1, pair[0] return v1, pair[0]
def find_el(self, temp: float, pressure: float) -> tuple[float]: def find_el(self, temp: float, pressure: float, temp_line: Series) -> tuple[float]:
moist_adiabat = follow_moist_adiabat(temp, pressure) moist_adiabat = follow_moist_adiabat(temp, pressure)
temp_line = self.follow_temp()
pairs = nearest(sorted(moist_adiabat.keys(), reverse=True), pairs = nearest(sorted(moist_adiabat.keys(), reverse=True),
sorted(temp_line.keys(), reverse=True)) sorted(temp_line.keys(), reverse=True))
@ -212,6 +210,7 @@ class Sounding(DatabaseTable):
return v1, pair[0] return v1, pair[0]
def derive_parameters(self) -> SoundingParameters: def derive_parameters(self) -> SoundingParameters:
temp_line = self.follow_temp()
dry_adiabat = follow_dry_adiabat(self.samples[0].temp, dry_adiabat = follow_dry_adiabat(self.samples[0].temp,
self.samples[0].pressure) self.samples[0].pressure)
@ -219,8 +218,8 @@ class Sounding(DatabaseTable):
self.samples[0].pressure) self.samples[0].pressure)
lcl = dry_adiabat.intersect(saturated_mr_line, SeriesIntersection.LESSER) lcl = dry_adiabat.intersect(saturated_mr_line, SeriesIntersection.LESSER)
lfc = self.find_lfc(lcl[0], lcl[1]) lfc = self.find_lfc(lcl[0], lcl[1], temp_line)
el = self.find_el(lfc[0], lfc[1]) el = self.find_el(lfc[0], lfc[1], temp_line)
params = SoundingParameters() params = SoundingParameters()
params.lcl = lcl params.lcl = lcl