Compare commits

..

No commits in common. "2edea01934ce45c4925ccf030381d59c3b8e79d7" and "830425980ddf5a1544b0861f6f7fb3531853225a" have entirely different histories.

View file

@ -188,12 +188,26 @@ class Sounding(DatabaseTable):
def find_lfc(self, temp: float, pressure: float, temp_line: Series) -> tuple[float]:
moist_adiabat = follow_moist_adiabat(temp, pressure)
return moist_adiabat.intersect(temp_line, SeriesIntersection.GREATER)
pairs = nearest(sorted(moist_adiabat.keys(), reverse=True),
sorted(temp_line.keys(), reverse=True))
for pair in pairs:
v1, v2 = moist_adiabat[pair[0]], temp_line[pair[1]]
if v1 > v2:
return v1, pair[0]
def find_el(self, temp: float, pressure: float, temp_line: Series) -> tuple[float]:
moist_adiabat = follow_moist_adiabat(temp, pressure)
return moist_adiabat.intersect(temp_line, SeriesIntersection.LESSER)
pairs = nearest(sorted(moist_adiabat.keys(), reverse=True),
sorted(temp_line.keys(), reverse=True))
for pair in pairs:
v1, v2 = moist_adiabat[pair[0]], temp_line[pair[1]]
if v1 < v2:
return v1, pair[0]
def derive_parameters(self) -> SoundingParameters:
temp_line = self.follow_temp()