diff --git a/lib/xmet/sounding.py b/lib/xmet/sounding.py index e40a4c2..3d1d93d 100644 --- a/lib/xmet/sounding.py +++ b/lib/xmet/sounding.py @@ -185,11 +185,6 @@ class Sounding(DatabaseTable): return series - 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) - def find_el(self, temp: float, pressure: float, temp_line: Series) -> tuple[float]: moist_adiabat = follow_moist_adiabat(temp, pressure) @@ -204,7 +199,10 @@ class Sounding(DatabaseTable): self.samples[0].pressure) lcl = dry_adiabat.intersect(saturated_mr_line, SeriesIntersection.LESSER) - lfc = self.find_lfc(lcl[0], lcl[1], temp_line) + + moist_adiabat = follow_moist_adiabat(*lcl) + + lfc = moist_adiabat.intersect(temp_line, SeriesIntersection.GREATER) el = self.find_el(lfc[0], lfc[1], temp_line) params = SoundingParameters()