pycontrails 0.54.11__cp312-cp312-macosx_11_0_arm64.whl → 0.54.12__cp312-cp312-macosx_11_0_arm64.whl

pycontrails/_version.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '0.54.11'
-__version_tuple__ = version_tuple = (0, 54, 11)
+__version__ = version = '0.54.12'
+__version_tuple__ = version_tuple = (0, 54, 12)
+
+__commit_id__ = commit_id = 'g5920a0c98'

pycontrails/datalib/ecmwf/hres.py

@@ -155,6 +155,7 @@ class HRES(ECMWFAPI):
         - "scda" = short cut-off high resolution forecast, atmospheric fields,
           run at hours 06Z and 18Z
         - "enfo" = ensemble forecast, atmospheric fields, run at hours 00Z, 06Z, 12Z, and 18Z
+
         Defaults to "oper" (HRES).
         If the stream is incompatible with a provided forecast_time, a ``ValueError`` is raised.
         See the `ECMWF documentation <https://confluence.ecmwf.int/display/DAC/ECMWF+open+data%3A+real-time+forecasts+from+IFS+and+AIFS>`_

pycontrails/datalib/goes.py

@@ -593,10 +593,10 @@ class GOES:
                 da = da_dict.popitem()[1]
             elif "C02" in da_dict:
                 da2 = da_dict.pop("C02")
-                da1 = xr.concat(da_dict.values(), dim="band_id")
-                da = _concat_c02(da1, da2)
+                da = xr.concat(da_dict.values(), dim="band_id", coords="different", compat="equals")
+                da = _concat_c02(da, da2)
             else:
-                da = xr.concat(da_dict.values(), dim="band_id")
+                da = xr.concat(da_dict.values(), dim="band_id", coords="different", compat="equals")
 
         else:
             ds = _load_via_tempfile(data)

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/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.54.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pycontrails
-Version: 0.54.11
+Version: 0.54.12
 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.54.12.dist-info}/RECORD

@@ -1,10 +1,10 @@
-pycontrails-0.54.11.dist-info/RECORD,,
-pycontrails-0.54.11.dist-info/WHEEL,sha256=V1loQ6TpxABu1APUg0MoTRBOzSKT5xVc3skizX-ovCU,136
-pycontrails-0.54.11.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
-pycontrails-0.54.11.dist-info/METADATA,sha256=ji2DnLEhspmnd-F0I7pEKUpBkTmmz4hd8-03MkLXvu4,9037
-pycontrails-0.54.11.dist-info/licenses/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
-pycontrails-0.54.11.dist-info/licenses/NOTICE,sha256=fiBPdjYibMpDzf8hqcn7TvAQ-yeK10q_Nqq24DnskYg,1962
-pycontrails/_version.py,sha256=29bQvK7ihNGFDKGpvLyBBYr5UGAm2ZLeme6yi4GyFoM,515
+pycontrails-0.54.12.dist-info/RECORD,,
+pycontrails-0.54.12.dist-info/WHEEL,sha256=V1loQ6TpxABu1APUg0MoTRBOzSKT5xVc3skizX-ovCU,136
+pycontrails-0.54.12.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
+pycontrails-0.54.12.dist-info/METADATA,sha256=UaUC4O8LMv-iJ_7xbgDskuRMX_GjT6dTodRHeda75Zc,9037
+pycontrails-0.54.12.dist-info/licenses/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
+pycontrails-0.54.12.dist-info/licenses/NOTICE,sha256=fiBPdjYibMpDzf8hqcn7TvAQ-yeK10q_Nqq24DnskYg,1962
+pycontrails/_version.py,sha256=UTr-0gLpdmG3tPVgS4kgxnF4fjydZpe2yN5_iKvXWmU,716
 pycontrails/__init__.py,sha256=9ypSB2fKZlKghTvSrjWo6OHm5qfASwiTIvlMew3Olu4,2037
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycontrails/core/vector.py,sha256=X_g8lzY6plJ6oeUHigSjt9qcPv34a3m1DeK1pqocrDw,73627
@@ -21,9 +21,9 @@ pycontrails/core/met.py,sha256=O9W6RaEwUsg7ZERR47Q-6fYjg13BzOZtcQdw92444xg,10398
 pycontrails/core/aircraft_performance.py,sha256=Kk_Rb61jDOWPmCQHwn2jR5vMPmB8b3aq1iTWfiUMj9U,28232
 pycontrails/core/airports.py,sha256=ubYo-WvxKPd_dUcADx6yew9Tqh1a4VJDgX7aFqLYwB8,6775
 pycontrails/core/met_var.py,sha256=lAbp3cko_rzMk_u0kq-F27sUXUxUKikUvCNycwp9ILY,12020
-pycontrails/core/rgi_cython.cpython-312-darwin.so,sha256=PRBpIMzFPal9KIEwpzcw-Np56ZYGoWkay0pefkzxL74,315088
+pycontrails/core/rgi_cython.cpython-312-darwin.so,sha256=v_ht-5-BFREneDU0LmtlfiQjbRCDBkZFo6W-pe6q8sM,315040
 pycontrails/core/coordinates.py,sha256=0ySsHtqTon7GMbuwmmxMbI92j3ueMteJZh4xxNm5zto,5391
-pycontrails/datalib/goes.py,sha256=2FqpepeNb1w-nwhlDAOQZdWT7hJmpMwiJFrEkJ_9CAM,34286
+pycontrails/datalib/goes.py,sha256=_TB32tGWxumASOEZUQ_PwGWz8QMZPTJf8pG4jbPR-WY,34358
 pycontrails/datalib/landsat.py,sha256=r6366rEF7fOA7mT5KySCPGJplgGE5LvBw5fMqk-U1oM,19697
 pycontrails/datalib/__init__.py,sha256=hW9NWdFPC3y_2vHMteQ7GgQdop3917MkDaf5ZhU2RBY,369
 pycontrails/datalib/sentinel.py,sha256=hYSxIlQnyJHqtHWlKn73HOK_1pm-_IbGebmkHnh4UcA,17172
@@ -31,7 +31,7 @@ pycontrails/datalib/_met_utils/metsource.py,sha256=B4Gd9gkfMMlXe-xc_xcNNZAJ0gOeR
 pycontrails/datalib/ecmwf/arco_era5.py,sha256=7HXQU5S02PzX9Ew2ZrDKSp0tDEG1eeVAvbP3decmm20,12437
 pycontrails/datalib/ecmwf/era5.py,sha256=4ULNdDlUN0kP6Tbp8D_-Bc12nAsLf0iNfZaDoj_AoZU,18952
 pycontrails/datalib/ecmwf/era5_model_level.py,sha256=AO7ePIGZtavx5nQSPYP4p07RNZeg3bbzmoZC7RUC4Gg,19354
-pycontrails/datalib/ecmwf/hres.py,sha256=6DZc8gKhnKMXHYHxppRpJ3So5ZpjfncAqX1u_Rhj3d4,29679
+pycontrails/datalib/ecmwf/hres.py,sha256=isRQkybVZyKxVvqpQyGQsMtePFfv_qqAMBQ98wDLYtc,29680
 pycontrails/datalib/ecmwf/variables.py,sha256=lU3BNe265XVhCXvdMwZqfkWQwtsetZxVRLSfPqHFKAE,9913
 pycontrails/datalib/ecmwf/hres_model_level.py,sha256=CcxMKiFJyLvM9njmBVywAXJxyWE7atsgHXBubKJQqHM,17779
 pycontrails/datalib/ecmwf/__init__.py,sha256=wdfhplEaW2UKTItIoshTtVEjbPyfDYoprTJNxbKZuvA,2021
@@ -54,18 +54,18 @@ pycontrails/ext/empirical_grid.py,sha256=FPNQA0x4nVwBXFlbs3DgIapSrXFYhoc8b8IX0M4
 pycontrails/ext/bada.py,sha256=YlQq4nnFyWza1Am2e2ZucpaICHDuUFRTrtVzIKMzf9s,1091
 pycontrails/utils/iteration.py,sha256=q_vb39VjxRr4hqTyPYko3gK4sboJOJf_Evq6m_2DL-g,319
 pycontrails/utils/__init__.py,sha256=Gt_57sBgfliFSxx9sDpuchykFDxmM11Wg9xAeSqPcnI,32
-pycontrails/utils/types.py,sha256=dN2oYVNNbekqvM89Lfs0FmmhavRQGC7NgGhi_7m6UBU,4984
+pycontrails/utils/types.py,sha256=1AaY1x_qGlYAl08xg6PS0MPKm3OZwFBM7xLI_nHK7EY,4869
 pycontrails/utils/temp.py,sha256=lGU0b_R8ze4yKlsOusHIIBaoNFBrmrB3vBjgHRlfcXk,1109
 pycontrails/utils/json.py,sha256=oTiO8xh603esfBGaGVmA5eUzR0NhAqNpQCegMMgnSbg,5896
 pycontrails/utils/dependencies.py,sha256=ATP45xYdUbIyGFzgbOe5SbokMytvB84TcexUEFnEUZE,2559
 pycontrails/models/pcc.py,sha256=0Qdl4u8PmUEpNYd398glTChkbTwsh83wYPt0Bmi8qd8,11068
 pycontrails/models/tau_cirrus.py,sha256=2Z4egt-QFprkyITRgtarA5alOTTQRQbjzgmSqE49_1g,5778
 pycontrails/models/__init__.py,sha256=dQTOLQb7RdUdUwslt5se__5y_ymbInBexQmNrmAeOdE,33
-pycontrails/models/issr.py,sha256=AYLYLHxtG8je5UG6x1zLV0ul89MJPqe5Xk0oWIyZ7b0,7378
-pycontrails/models/sac.py,sha256=lV1Or0AaLxuS1Zo5V8h5c1fkSKC-hKEgiFm7bmmusWw,15946
+pycontrails/models/issr.py,sha256=_qIKDgO0Owxeb0Q4WJlxcn1FJEvF3QDU-cqh2fpDsBo,7404
+pycontrails/models/sac.py,sha256=8Vx5wg4-Kb8l4GK67wp7VNVpdFM4Wyux1xKuNrjZ_IQ,15516
 pycontrails/models/accf.py,sha256=_tunWpw1sYW8ES8RvpdhNahXwaf4LwdHMEdXhv7-cCI,13566
 pycontrails/models/dry_advection.py,sha256=8vkHesYx3rM858LrIpXCZ9xQ6GmL3tZeOhj5MJh42Q0,20483
-pycontrails/models/pcr.py,sha256=ZzbEuTOuDdUmmL5T3Wk3HL-O8XzX3HMnn98WcPbASaU,5348
+pycontrails/models/pcr.py,sha256=Xde0aF8cMV9jTQ_uI2UvdHSLqotVUgPutb1Wgq7LtfY,5374
 pycontrails/models/emissions/__init__.py,sha256=CZB2zIkLUI3NGNmq2ddvRYjEtiboY6PWJjiEiXj_zII,478
 pycontrails/models/emissions/ffm2.py,sha256=mAvBHnp-p3hIn2fjKGq50eaMHi0jcb5hA5uXbJGeE9I,12068
 pycontrails/models/emissions/emissions.py,sha256=qt689n4MuWw4XZ0NneBTNR2RqVG3XRYafgkkdSc1yEw,47757
@@ -103,11 +103,11 @@ pycontrails/models/ps_model/static/ps-synonym-list-20250328.csv,sha256=phtrf0m-U
 pycontrails/models/cocipgrid/cocip_grid_params.py,sha256=l4vBPrOKCJDz5Y1uMjmOGVyUcSWgfZtFWbjW968OPz8,5875
 pycontrails/models/cocipgrid/__init__.py,sha256=ar6bF_8Pusbb-myujz_q5ntFylQTNH8yiM8fxP7Zk30,262
 pycontrails/models/cocipgrid/cocip_grid.py,sha256=OTltSP9wWNEZbi0Pcr19sDeBlbRWssmJy085X5TZ-lo,91401
-pycontrails/physics/geo.py,sha256=5THIXgpaHBQdSYWLgtK4mV_8e1hWW9XeTsSHOShFMeA,36323
+pycontrails/physics/geo.py,sha256=ITK23l1A2lzjNPTFC8ZKyQH59I5Cy_TvuvM_gbALo94,36297
 pycontrails/physics/units.py,sha256=p-6PzFLpVCMpvmfrhXVh3Hs-nMJw9Y1x-hvgnL9Lo9c,12281
 pycontrails/physics/constants.py,sha256=xWy7OkDOJNM6umq5dYiuzwG0aTEl5aECLxEpg3Z2SBQ,3202
 pycontrails/physics/__init__.py,sha256=_1eWbEy6evEWdfJCEkwDiSdpiDNzNWEPVqaPekHyhwU,44
-pycontrails/physics/thermo.py,sha256=sWGpKa12daSpqZYNgyXd8Ii5nfA_1Mm5mMbnM5GsW-E,12787
+pycontrails/physics/thermo.py,sha256=v7-66PE31SJXz45MXAB9Iq9XfPg1Sn5FpOsTngLaDDI,15406
 pycontrails/physics/jet.py,sha256=Je1d3vgbBEaVIAL1WZ3C-4p2f9fy9dWOjP5vFVsGGh8,30358
 pycontrails/physics/static/iata-cargo-load-factors-20250221.csv,sha256=ixsnQk1DyGxHMo0pDy4aOoQIwgOyrGfhMRPumEwPMBc,3841
 pycontrails/physics/static/iata-passenger-load-factors-20250221.csv,sha256=Q2olRIqUpbOaavvM5ikG8m1v1YQAN3KLNHeFDPvM53Q,3835