pycontrails 0.54.11__cp312-cp312-win_amd64.whl → 0.55.0__cp312-cp312-win_amd64.whl

pycontrails/models/issr.py

@@ -134,7 +134,7 @@ class ISSR(Model):
         if scale_humidity:
             humidity_scaling.eval(self.source, copy_source=False)
 
-        self.source["issr"] = issr(
+        self.source["issr"] = issr(  # type: ignore[type-var]
             air_temperature=self.source.data["air_temperature"],
             specific_humidity=self.source.data["specific_humidity"],
             air_pressure=self.source.data["air_pressure"],

pycontrails/models/pcr.py

@@ -90,7 +90,7 @@ class PCR(Model):
         sac_model = sac.SAC(met=None, params=sac_params, copy_source=False)
         sac_model.eval(self.source)
 
-        pcr_ = _pcr_from_issr_and_sac(self.source.data["issr"], self.source.data["sac"])
+        pcr_ = _pcr_from_issr_and_sac(self.source.data["issr"], self.source.data["sac"])  # type: ignore[type-var]
         self.source["pcr"] = pcr_
 
         return self.source

pycontrails/models/sac.py

@@ -17,7 +17,7 @@ from pycontrails.core.models import Model, ModelParams
 from pycontrails.core.vector import GeoVectorDataset
 from pycontrails.models.humidity_scaling import HumidityScaling
 from pycontrails.physics import constants, thermo
-from pycontrails.utils.types import ArrayLike, ArrayScalarLike, apply_nan_mask_to_arraylike
+from pycontrails.utils.types import ArrayLike, apply_nan_mask_to_arraylike
 
 # -----------------
 # Models as classes
@@ -133,8 +133,8 @@ class SAC(Model):
 
         G = slope_mixing_line(specific_humidity, air_pressure, engine_efficiency, ei_h2o, q_fuel)
         T_sat_liquid_ = T_sat_liquid(G)
-        rh_crit_sac = rh_critical_sac(air_temperature, T_sat_liquid_, G)
-        rh = thermo.rh(specific_humidity, air_temperature, air_pressure)
+        rh_crit_sac = rh_critical_sac(air_temperature, T_sat_liquid_, G)  # type: ignore[type-var]
+        rh = thermo.rh(specific_humidity, air_temperature, air_pressure)  # type: ignore[type-var]
         sac_ = sac(rh, rh_crit_sac)
 
         # Attaching some intermediate artifacts onto the source
@@ -239,23 +239,6 @@ def T_sat_liquid(G: ArrayLike) -> ArrayLike:
     return -46.46 - constants.absolute_zero + 9.43 * log_ + 0.72 * log_**2  # type: ignore[return-value]
 
 
-def _e_sat_liquid_prime(T: ArrayScalarLike) -> ArrayScalarLike:
-    r"""Calculate derivative of :func:`thermo.e_sat_liquid`.
-
-    Parameters
-    ----------
-    T : ArrayScalarLike
-        Temperature, [:math:`K`].
-
-    Returns
-    -------
-    ArrayScalarLike
-        Derivative of :func:`thermo.e_sat_liquid`, [:math:``Pa \ K^{-1}`].
-    """
-    d_inside = 6096.9385 / (T**2) - 0.02711193 + 1.673952 * 1e-5 * 2 * T + 2.433502 / T
-    return thermo.e_sat_liquid(T) * d_inside
-
-
 def T_sat_liquid_high_accuracy(
     G: ArrayLike,
     maxiter: int = 5,
@@ -293,7 +276,7 @@ def T_sat_liquid_high_accuracy(
 
     def func(T: ArrayLike) -> ArrayLike:
         """Equation (10) from Schumann 1996."""
-        return _e_sat_liquid_prime(T) - G
+        return thermo.e_sat_liquid_prime(T) - G
 
     return scipy.optimize.newton(func, init_guess, maxiter=maxiter)
 
@@ -441,7 +424,7 @@ def T_critical_sac(
         return T - T_LM_filt + (e_L_of_T_LM_filt - U_filt * thermo.e_sat_liquid(T)) / G_filt
 
     def fprime(T: ArrayLike) -> ArrayLike:
-        return 1.0 - U_filt * _e_sat_liquid_prime(T) / G_filt
+        return 1.0 - U_filt * thermo.e_sat_liquid_prime(T) / G_filt
 
     # This initial guess should be less than T_LM.
     # For relative_humidity away from 1, Newton's method converges quickly, and so

pycontrails/physics/constants.py

@@ -51,7 +51,7 @@ M_v: float = 18.0153e-3
 #: Ratio of heat capacities, TODO: which heat capacities?
 gamma: float = 1.4
 
-#:  molar gas constant :math:`[J \ mol^{-1} \ K^{-1}]`
+#: Molar gas constant :math:`[J \ mol^{-1} \ K^{-1}]`
 R: float = 8.314462618
 
 #: Gas constant of dry air :math:`[J \ kg^{-1} \ K^{-1}]`

pycontrails/physics/geo.py

@@ -7,7 +7,7 @@ import numpy.typing as npt
 import xarray as xr
 
 from pycontrails.physics import constants, units
-from pycontrails.utils.types import ArrayLike
+from pycontrails.utils.types import ArrayLike, ArrayOrFloat
 
 # ------------------
 # Spherical Geometry
@@ -373,8 +373,8 @@ def segment_length(
 def forward_azimuth(
     lons: npt.NDArray[np.floating],
     lats: npt.NDArray[np.floating],
-    az: npt.NDArray[np.floating] | float,
-    dist: npt.NDArray[np.floating] | float,
+    az: ArrayOrFloat,
+    dist: ArrayOrFloat,
 ) -> tuple[npt.NDArray[np.floating], npt.NDArray[np.floating]]:
     r"""Calculate coordinates along forward azimuth.
 

pycontrails/physics/thermo.py

@@ -87,6 +87,42 @@ def p_vapor(q: ArrayScalarLike, p: ArrayScalarLike) -> ArrayScalarLike:
     return q * p * (constants.R_v / constants.R_d)
 
 
+def water_vapor_partial_pressure_along_mixing_line(
+    specific_humidity: ArrayScalarLike,
+    air_pressure: ArrayScalarLike,
+    T_plume: ArrayScalarLike,
+    T_ambient: ArrayScalarLike,
+    G: ArrayScalarLike,
+) -> ArrayScalarLike:
+    """
+    Calculate water vapor partial pressure along mixing line.
+
+    Parameters
+    ----------
+    specific_humidity : ArrayScalarLike
+        Specific humidity at each waypoint, [:math:`kg_{H_{2}O} / kg_{air}`]
+    air_pressure : ArrayScalarLike
+        Pressure altitude at each waypoint, [:math:`Pa`]
+    T_plume : ArrayScalarLike
+        Plume temperature evolution along mixing line, [:math:`K`]
+    T_ambient : ArrayScalarLike
+        Ambient temperature for each waypoint, [:math:`K`]
+    G : ArrayScalarLike
+        Slope of the mixing line in a temperature-humidity diagram.
+
+    Returns
+    -------
+    ArrayScalarLike
+        Water vapor partial pressure along mixing line (p_mw), [:math:`Pa`]
+
+    References
+    ----------
+    Eq. (2) of Karcher et al. (2015).
+    """
+    p_wa = p_vapor(specific_humidity, air_pressure)
+    return p_wa + G * (T_plume - T_ambient)
+
+
 # -------------------
 # Saturation Pressure
 # -------------------
@@ -142,8 +178,8 @@ def e_sat_ice(T: ArrayScalarLike) -> ArrayScalarLike:
     )
 
 
-def e_sat_liquid(T: ArrayScalarLike) -> ArrayScalarLike:
-    r"""Calculate saturation pressure of water vapor over liquid water.
+def sonntag_e_sat_liquid(T: ArrayScalarLike) -> ArrayScalarLike:
+    """Calculate saturation pressure of water vapor over liquid water using Sonntag (1994).
 
     Parameters
     ----------
@@ -154,35 +190,99 @@ def e_sat_liquid(T: ArrayScalarLike) -> ArrayScalarLike:
     -------
     ArrayScalarLike
         Saturation pressure of water vapor over liquid water, [:math:`Pa`]
+    """
+    return 100.0 * np.exp(  # type: ignore[return-value]
+        -6096.9385 / T + 16.635794 - 0.02711193 * T + 1.673952 * 1e-5 * T**2 + 2.433502 * np.log(T)
+    )
 
-    References
+
+def mk05_e_sat_liquid(T: ArrayScalarLike) -> ArrayScalarLike:
+    """Calculate saturation pressure of water vapor over liquid water using Murphy and Koop (2005).
+
+    Parameters
     ----------
-    - :cite:`sonntag1994`
+    T : ArrayScalarLike
+        Temperature, [:math:`K`]
+
+    Returns
+    -------
+    ArrayScalarLike
+        Saturation pressure of water vapor over liquid water, [:math:`Pa`]
+
+    Notes
+    -----
+    Several formulations exist for the saturation vapor pressure over liquid water.
+
+    Buck (Buck Research Manual 1996)..
+
+        6.1121 * np.exp((18.678 * (T - 273.15) / 234.5) * (T - 273.15) / (257.14 + (T - 273.15)))
+
+    Magnus Tetens (Murray, 1967)..
+
+        6.1078 * np.exp(17.269388 * (T - 273.16) / (T - 35.86))
+
+    Guide to Meteorological Instruments and Methods of Observation (CIMO Guide) (WMO, 2008)..
+
+        6.112 * np.exp(17.62 * (T - 273.15) / (243.12 + T - 273.15))
+
+    Sonntag (1994) (see :func:`sonntag_e_sat_liquid`) is used in older versions of CoCiP.
     """
-    # Buck (Buck Research Manual 1996)
-    # 6.1121 * np.exp((18.678 * (T - 273.15) / 234.5) * (T - 273.15) / (257.14 + (T - 273.15)))
 
-    # Magnus Tetens (Murray, 1967)
-    # 6.1078 * np.exp(17.269388 * (T - 273.16) / (T - 35.86))
+    return np.exp(  # type: ignore[return-value]
+        54.842763
+        - 6763.22 / T
+        - 4.21 * np.log(T)
+        + 0.000367 * T
+        + np.tanh(0.0415 * (T - 218.8))
+        * (53.878 - 1331.22 / T - 9.44523 * np.log(T) + 0.014025 * T)
+    )
 
-    # Guide to Meteorological Instruments and Methods of Observation (CIMO Guide) (WMO, 2008)
-    # 6.112 * np.exp(17.62 * (T - 273.15) / (243.12 + T - 273.15))
 
-    # Sonntag (1994) is used in CoCiP
+def sonntag_e_sat_liquid_prime(T: ArrayScalarLike) -> ArrayScalarLike:
+    """Calculate the derivative of :func:`sonntag_e_sat_liquid`.
 
-    # FIXME: Presently, mypy is not aware that numpy ufuncs will return `xr.DataArray``
-    # when xr.DataArray is passed in. This will get fixed at some point in the future
-    # as `numpy` their typing patterns, after which the "type: ignore" comment can
-    # get ripped out.
-    # We could explicitly check for `xr.DataArray` then use `xr.apply_ufunc`, but
-    # this only renders our code more boilerplate and less performant.
-    # This comment is pasted several places in `pycontrails` -- they should all be
-    # addressed at the same time.
-    return 100.0 * np.exp(  # type: ignore[return-value]
-        -6096.9385 / T + 16.635794 - 0.02711193 * T + 1.673952 * 1e-5 * T**2 + 2.433502 * np.log(T)
+    Parameters
+    ----------
+    T : ArrayScalarLike
+        Temperature, [:math:`K`].
+
+    Returns
+    -------
+    ArrayScalarLike
+        Derivative of :func:`sonntag_e_sat_liquid`
+    """
+    d_inside = 6096.9385 / (T**2) - 0.02711193 + 1.673952 * 1e-5 * 2 * T + 2.433502 / T
+    return sonntag_e_sat_liquid(T) * d_inside
+
+
+def mk05_e_sat_liquid_prime(T: ArrayScalarLike) -> ArrayScalarLike:
+    """Calculate the derivative of :func:`mk05_e_sat_liquid`.
+
+    Parameters
+    ----------
+    T : ArrayScalarLike
+        Temperature, [:math:`K`].
+
+    Returns
+    -------
+    ArrayScalarLike
+        Derivative of :func:`mk05_e_sat_liquid`
+    """
+    tanh_term = np.tanh(0.0415 * (T - 218.8))
+    return mk05_e_sat_liquid(T) * (  # type: ignore[return-value]
+        6763.22 / T**2
+        - 4.21 / T
+        + 0.000367
+        + 0.0415 * (1 - tanh_term**2) * (53.878 - 1331.22 / T - 9.44523 * np.log(T) + 0.014025 * T)
+        + tanh_term * (1331.22 / T**2 - 9.44523 / T + 0.014025)
     )
 
 
+# Set aliases. These could be swapped out or made configurable.
+e_sat_liquid = mk05_e_sat_liquid
+e_sat_liquid_prime = mk05_e_sat_liquid_prime
+
+
 @support_arraylike
 def _e_sat_piecewise(T: np.ndarray) -> np.ndarray:
     """Calculate `e_sat_liquid` when T is above freezing otherwise `e_sat_ice`.

pycontrails/utils/types.py

@@ -14,20 +14,13 @@ import pandas as pd
 import xarray as xr
 
 #: Array like (np.ndarray, xr.DataArray)
-ArrayLike = TypeVar("ArrayLike", np.ndarray, xr.DataArray, xr.DataArray | np.ndarray)
+ArrayLike = TypeVar("ArrayLike", np.ndarray, xr.DataArray)
 
 #: Array or Float (np.ndarray, float)
-ArrayOrFloat = TypeVar("ArrayOrFloat", npt.NDArray[np.floating], float)
+ArrayOrFloat = TypeVar("ArrayOrFloat", np.ndarray, float)
 
 #: Array like input (np.ndarray, xr.DataArray, float)
-ArrayScalarLike = TypeVar(
-    "ArrayScalarLike",
-    np.ndarray,
-    xr.DataArray,
-    float,
-    np.ndarray | float,
-    xr.DataArray | np.ndarray,
-)
+ArrayScalarLike = TypeVar("ArrayScalarLike", np.ndarray, xr.DataArray, float)
 
 #: Datetime like input (datetime, pd.Timestamp, np.datetime64)
 DatetimeLike = TypeVar("DatetimeLike", datetime, pd.Timestamp, np.datetime64, str)

{pycontrails-0.54.11.dist-info → pycontrails-0.55.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycontrails
-Version: 0.54.11
+Version: 0.55.0
 Summary: Python library for modeling aviation climate impacts
 Author-email: "Contrails.org" <py@contrails.org>
 License-Expression: Apache-2.0

{pycontrails-0.54.11.dist-info → pycontrails-0.55.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 pycontrails/__init__.py,sha256=mKNmGUS5wW1n1PukeaOkmLwQVN24i1__mk0odjBzwEE,2107
-pycontrails/_version.py,sha256=3ZYGWQZfQ5wgpP3lg8ortMs3pMchQHAI8UBrkGV34P8,536
+pycontrails/_version.py,sha256=4MWnnoBh0SrKnCZ4cFSFP74uSUd0CfncpHHiW3hjbj0,748
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycontrails/core/__init__.py,sha256=kOAehIZBbvksSW3MuU2DfzsyeE4PaFnOTpYMeq2ZDPE,886
 pycontrails/core/aircraft_performance.py,sha256=dasanaqfm5eP9XUDhgoKGj-eQHTWwMZ_mN6_ZdFulT0,28911
@@ -15,10 +15,10 @@ pycontrails/core/met.py,sha256=NBboBTRKNt5WFSnKUdm2R_9N68EQTYii4P5A_hs79YQ,10689
 pycontrails/core/met_var.py,sha256=bFpBFpQnN6osVAuxNNhG6vG_NMThEIhDcL2B9VpXgww,12407
 pycontrails/core/models.py,sha256=MRDNYVr8WMTF5EJrwZ8zxPHKKMcU09apBcqycimCWwk,45236
 pycontrails/core/polygon.py,sha256=3_vYmlQoP3x3lmgwFyqQVgl9ziAQ5e160MCm2fwFou0,18619
-pycontrails/core/rgi_cython.cp312-win_amd64.pyd,sha256=OfJB__HdRggOtAvFPo2u87X-Ada_aQ61s7MNhvByQkI,243200
+pycontrails/core/rgi_cython.cp312-win_amd64.pyd,sha256=QOXgbm4bCbayz6LD5wizgUS5qx82xpmjTa3FPZ-EXVE,243200
 pycontrails/core/vector.py,sha256=n9b_HxQSWOUbxvut7mNaK523JlISi3-TLd5YwrmeOwM,75883
 pycontrails/datalib/__init__.py,sha256=Q2RrnjwtFzfsmJ2tEojDCzDMkd8R0MYw4mQz3YwUsqI,381
-pycontrails/datalib/goes.py,sha256=llpiUakz2Jo9B86rafS6yrBIDn53mqWdTojplZdp3AU,35249
+pycontrails/datalib/goes.py,sha256=HTjnh147GZQfYX7R0zGVddwMuCHZQJp4cWqthGLETHY,35321
 pycontrails/datalib/landsat.py,sha256=YrDpngF5HtvWFVwxN0FLFxCfZIEmeBMiifdkbH7fQTk,20263
 pycontrails/datalib/sentinel.py,sha256=ukzdSeHKC1UBWEYzehS2LqtKoCpKpaPobLfbZDGy6KU,17679
 pycontrails/datalib/_leo_utils/search.py,sha256=8JzT56ps3SH1W-5rwL8BWuxLLljwxa_5fjLAuZdL_Vg,8937
@@ -30,7 +30,7 @@ pycontrails/datalib/ecmwf/arco_era5.py,sha256=PojAfT0N12SLcgiecZtHiN96sbRWwFx3PT
 pycontrails/datalib/ecmwf/common.py,sha256=6fcZC_-3FvWJ3vtlZX89PiiS7-DSQhAOgxrLjwU4iW4,4138
 pycontrails/datalib/ecmwf/era5.py,sha256=TbZlOqn3fPmfvCUR1XrVBWxNgIBpSXgRx0S4M49TSeY,19506
 pycontrails/datalib/ecmwf/era5_model_level.py,sha256=NVquyG_3SzdmfoQl25Wvp4oB_pOe7K_AQOfNv7no14E,19844
-pycontrails/datalib/ecmwf/hres.py,sha256=JLLxv0O8UD8STT9gnlGPkjxAMdhAXzMV1O8bnmLEs9k,30482
+pycontrails/datalib/ecmwf/hres.py,sha256=3RHmikpMj0BXHyD6m6iqz56x7R8zN0METezISG_sNic,30484
 pycontrails/datalib/ecmwf/hres_model_level.py,sha256=EfKbCLyib2aMfeeTFuop4dutB7FiVFhX7UWW_hKtESE,18245
 pycontrails/datalib/ecmwf/ifs.py,sha256=a5QmXuihBNGx1eNN7EJGjR5dL9dO142nqkDSkPYGGlc,11048
 pycontrails/datalib/ecmwf/model_levels.py,sha256=noLSx45AHZ0rFPiUh3aK3iaEueHgsg6mG_AplHqHeU8,17431
@@ -48,11 +48,12 @@ pycontrails/ext/empirical_grid.py,sha256=mveQltokaGeQcxxbdMSLQ6wQ14oh3XX5dfzjWaF
 pycontrails/ext/synthetic_flight.py,sha256=dEWm9vrg6SAWieh6GLAE0m1orTrApav8HHP42-4bIHg,17233
 pycontrails/models/__init__.py,sha256=TKhrXe1Pu1-mV1gctx8cUAMrVxCCAtBkbZi9olfWq8s,34
 pycontrails/models/accf.py,sha256=rbEn6oTqXsgDPA3Ky0y-bADHWTxGXixa8OwpHH_pXag,13991
-pycontrails/models/dry_advection.py,sha256=4oOCMhUkmHJiQDdkLJGoODw0ebE4avoMpMDoF-6L59M,21085
-pycontrails/models/issr.py,sha256=J6mh4pze31XpD2_zD9ujzYPXsZFrmSwNcRORCcLoOVI,7588
+pycontrails/models/dry_advection.py,sha256=D1QT8ONFnHjYhuk4iimtjCiGq2TuVHV8l-mRnWNCXOE,21094
+pycontrails/models/extended_k15.py,sha256=Nl6lojJzk1qKaBagJWzWcQbNN51f68_EiYMlcFaGZaw,49385
+pycontrails/models/issr.py,sha256=1pqijM2ecEHhmclSRodyZNnj1f-rCn2H_d44SQYo25I,7614
 pycontrails/models/pcc.py,sha256=7k8kICqDeZ99O2n2Zpnu7EFNGjEpPka_9cu9nrmP44s,11394
-pycontrails/models/pcr.py,sha256=G_0yR5PsCMeJBP6tZFi3M7A6Wcq8s71UvosdA7ozUkI,5502
-pycontrails/models/sac.py,sha256=LhEwexJZnkxitj-x5eNVSCDGdkoCdj8Zh_I0WB8FWOY,16405
+pycontrails/models/pcr.py,sha256=YI7kd7BRdkHt970LCg0DhAOj-Bfukw0jclfvXGNo1jE,5528
+pycontrails/models/sac.py,sha256=5DZWCkHtJXpifWc0ltzecdPLVr1XgjctRuyn3w4zcQc,15958
 pycontrails/models/tau_cirrus.py,sha256=6hVeOahKX2MV8NNED7f5yej_2-z3ENPuTl3gjpKxzzI,5961
 pycontrails/models/apcemm/__init__.py,sha256=dDsRW3V6jjzKDd43Yoyc74m_Om1fccvftZgp3OFdAYE,183
 pycontrails/models/apcemm/apcemm.py,sha256=tbG57Vro7_vXwqE0YpXrimPTtvAXsurti2eBAVWGe-Y,40958
@@ -60,18 +61,18 @@ pycontrails/models/apcemm/inputs.py,sha256=zHRSWVVlwYw6ms7PpC0p0I-xFsRDUVY9eDZ1g
 pycontrails/models/apcemm/utils.py,sha256=gew1MGtuOwKy0CTVKomJ_Lmuhmy4JxsopkughzCeB4o,17519
 pycontrails/models/apcemm/static/apcemm_yaml_template.yaml,sha256=A3H_FWVOtqkZhG91TWLdblMKaLWIcjRMsKqkfTN6mB4,6928
 pycontrails/models/cocip/__init__.py,sha256=v8JJN_Jx3_tOHaqGaQG-Es7srEAtSCHI7-gCEnM-n-s,991
-pycontrails/models/cocip/cocip.py,sha256=zMJ-sDMO4mTAt6Qgc5uDvc-zJxZxO-Y_pbYvYD7rJCI,106820
-pycontrails/models/cocip/cocip_params.py,sha256=pk0fimh_Wz8g8Q75BIrsOlmeH85rbpHKttjp6rkcFGY,12833
-pycontrails/models/cocip/cocip_uncertainty.py,sha256=fKQVAg-HyviegwNauxLgX9wdA0cRpK8XAOCNjZZIRWI,12528
-pycontrails/models/cocip/contrail_properties.py,sha256=JUngbMCw3SUCYkNdOWsp66J4v1kK4KtrWh9QajXwH-s,57583
+pycontrails/models/cocip/cocip.py,sha256=wbsCjrqU07CuyIYh2CmbrIeRRKftwS9MrQR0id_yuw8,107589
+pycontrails/models/cocip/cocip_params.py,sha256=SLrK6N1KfadD6bd7f5sVcK-ifZfbYWVe3u8YnPKS55g,13113
+pycontrails/models/cocip/cocip_uncertainty.py,sha256=l7zfcMUw47uZ8vNhFeqF03DBXG67GFOH2tbegAPWBmw,12540
+pycontrails/models/cocip/contrail_properties.py,sha256=p1JBGFCn2wsxmnZAdoUKK_fy7F5FH3phUl6Fxs80oHM,57271
 pycontrails/models/cocip/output_formats.py,sha256=pffbcl9-7HpcJRWDCABHg7yGxjjX_-90uVyt3rIpLHc,86250
-pycontrails/models/cocip/radiative_forcing.py,sha256=qs5pEAPec0DAhqqCKJXJbRRH5hMIz4xwUQqZjCoJIyg,45910
+pycontrails/models/cocip/radiative_forcing.py,sha256=ypgnYi4v3gCQMm_-OQ6rfNocSXyryGxvwLGRgazO1YE,45946
 pycontrails/models/cocip/radiative_heating.py,sha256=PcOEkqRtQJNq7bxOoz1baBbVV2ku1UQRMrrQXXsRBwc,19504
-pycontrails/models/cocip/unterstrasser_wake_vortex.py,sha256=0TE1gK2p0b7RQjBGRGgfg7BmzmdxbJLPJ-9sdlak1gQ,19444
-pycontrails/models/cocip/wake_vortex.py,sha256=i6P1UDxde_WPP8SAliPdiaVCdeFMRxCFR7_zKaoNlno,14911
+pycontrails/models/cocip/unterstrasser_wake_vortex.py,sha256=wnkzJlm9L-QXZ4gZD4Pdq_XQEL3odXnvmOYPGCLyidA,19439
+pycontrails/models/cocip/wake_vortex.py,sha256=71bNGy95DYSXjEjDo0jDLGR41XMgia8zrFO7IuAHW6M,14951
 pycontrails/models/cocip/wind_shear.py,sha256=qhmP3RJ9SEjd-qnXcgRiYis9-apKGF-1d78z6N__tq8,3988
 pycontrails/models/cocipgrid/__init__.py,sha256=OYSdZ1Htbr_IP7N_HuOAj1Pa_KLHtdEeJfXP-cN-gnU,271
-pycontrails/models/cocipgrid/cocip_grid.py,sha256=2EzfbYhHrGfb6jfVuxNDW06PSvyJ2FGJqyRK_1gyH_g,93925
+pycontrails/models/cocipgrid/cocip_grid.py,sha256=X1ssHAHmqFcQLdybA8D5TETUnj1nfewBtZbVs--Ppbg,95230
 pycontrails/models/cocipgrid/cocip_grid_params.py,sha256=ZpN00VEmeRYaeZhvSfVjnEjrgn6XdClf1eqJC8Ytcuw,6013
 pycontrails/models/emissions/__init__.py,sha256=phai3wH5VuUyfyVpu5vHOFI0jXSyoYSWvLTknS78xs0,499
 pycontrails/models/emissions/black_carbon.py,sha256=o8mVfDZLnNlfnvsqk8O-ljXrMn4Y_ApFuPROAQWHaQY,21294
@@ -92,10 +93,10 @@ pycontrails/models/ps_model/ps_operational_limits.py,sha256=95evggmtPbnr3kqNgqfO
 pycontrails/models/ps_model/static/ps-aircraft-params-20250328.csv,sha256=TKeDak9DHVFByYo3yoEwDZLqOYCJcE32P7lWNm14TnA,26254
 pycontrails/models/ps_model/static/ps-synonym-list-20250328.csv,sha256=piFhytYtGMMF8bL64GKQausLiGUGQi30KBegknzjecE,1152
 pycontrails/physics/__init__.py,sha256=AScCMSMSZjKxfL6mssdSLwcja1ml7MzREThQp5PLr9U,45
-pycontrails/physics/constants.py,sha256=_MVuhk6GxxZhj5RL_ci6IAgSe4oJyxLZwBvpMuGcl3Q,3319
-pycontrails/physics/geo.py,sha256=WyZKLj-63yGCfjePEhiwxLp26be44VCdEiisu9tXtzE,37461
+pycontrails/physics/constants.py,sha256=QninjsmBvmKNj8uHWTuEGKKq9biNh6KmSRkj2SGQHuw,3318
+pycontrails/physics/geo.py,sha256=ceaOy9ffCRb8eu6LlOAvM04mVMKbmqNh1dvw6iXq5bI,37435
 pycontrails/physics/jet.py,sha256=nUJY-TVowCPYlhrTkEncDocoVKCeN2IAhvP-6vWP2dQ,31326
-pycontrails/physics/thermo.py,sha256=HAcg2wmNXW-vJbOF2kOXBoUyJiAosPY0nRWeM37otdY,13238
+pycontrails/physics/thermo.py,sha256=Bm1ERIEYxRwdhkAVzO-xdsmEInp9WZAJNT1TLV0WTVQ,15957
 pycontrails/physics/units.py,sha256=r6ncLqhFi9Roi73SfGvfjuB_jpwtsjJ39L3yxr8ndIc,12753
 pycontrails/physics/static/iata-cargo-load-factors-20250221.csv,sha256=ePGCUak5noyY63aL1a8T7EJf8sWzIpeY95-sbaYKF5w,3915
 pycontrails/physics/static/iata-passenger-load-factors-20250221.csv,sha256=sK9caPg9MvRYBHm_HVvXGA90x4j4OVIxkxFHF1HOKnA,3909
@@ -104,10 +105,10 @@ pycontrails/utils/dependencies.py,sha256=SjEdbDDKfGmmYResWZndMCUySO0W0ptWAeY1aA_
 pycontrails/utils/iteration.py,sha256=En2YY4NiNwCNtAVO8HL6tv9byBGKs8MKSI7R8P-gZy4,332
 pycontrails/utils/json.py,sha256=Pqashwoupuf_GfrrSfHclwug9Hg-kYQ4WNxEqay_0Rc,6083
 pycontrails/utils/temp.py,sha256=5XXqQoEfWjz1OrhoOBZD5vkkCFeuq9LpZkyhc38gIeY,1159
-pycontrails/utils/types.py,sha256=hPqUwaeRLgga69nj7LVbPojPg1k7pUSvYzFlGAiPKIM,5154
-pycontrails-0.54.11.dist-info/licenses/LICENSE,sha256=HVr8JnZfTaA-12BfKUQZi5hdrB3awOwLWs5X_ga5QzA,10353
-pycontrails-0.54.11.dist-info/licenses/NOTICE,sha256=VIhzKNYi4lQx6fpZyqiY6eMHpLuwp-_G0JQkmYYa7h0,2005
-pycontrails-0.54.11.dist-info/METADATA,sha256=ATxrKUPw9Q-7nbMQ7r3CFgRfgM3wuEn7OUSUWEUO2CM,9215
-pycontrails-0.54.11.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
-pycontrails-0.54.11.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
-pycontrails-0.54.11.dist-info/RECORD,,
+pycontrails/utils/types.py,sha256=WJS3rnYxU4l8eEJuJVWGBRD7-zvEBlRD8TQx-fxKbic,5032
+pycontrails-0.55.0.dist-info/licenses/LICENSE,sha256=HVr8JnZfTaA-12BfKUQZi5hdrB3awOwLWs5X_ga5QzA,10353
+pycontrails-0.55.0.dist-info/licenses/NOTICE,sha256=VIhzKNYi4lQx6fpZyqiY6eMHpLuwp-_G0JQkmYYa7h0,2005
+pycontrails-0.55.0.dist-info/METADATA,sha256=SsZW3aKx-5WzetpZ6_ALJsrJxrXW7biGEELCNLK2JL0,9214
+pycontrails-0.55.0.dist-info/WHEEL,sha256=8UP9x9puWI0P1V_d7K2oMTBqfeLNm21CTzZ_Ptr0NXU,101
+pycontrails-0.55.0.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
+pycontrails-0.55.0.dist-info/RECORD,,