pycontrails 0.42.0__cp311-cp311-macosx_11_0_arm64.whl → 0.42.2__cp311-cp311-macosx_11_0_arm64.whl

pycontrails/models/humidity_scaling.py

@@ -1,17 +1,20 @@
-"""Support for humidity scaling methodologies on ERA5 data."""
+"""Support for humidity scaling methodologies."""
 
 from __future__ import annotations
 
 import abc
 import dataclasses
+import functools
+import pathlib
 import warnings
 from typing import Any, NoReturn, overload
 
 import numpy as np
+import numpy.typing as npt
 import xarray as xr
 from overrides import overrides
 
-from pycontrails.core.met import MetDataset
+from pycontrails.core.met import MetDataArray, MetDataset
 from pycontrails.core.models import Model, ModelParams
 from pycontrails.core.vector import GeoVectorDataset
 from pycontrails.physics import constants, thermo, units
@@ -19,7 +22,7 @@ from pycontrails.utils.types import ArrayLike
 
 
 def _rhi_over_q(air_temperature: ArrayLike, air_pressure: ArrayLike) -> ArrayLike:
-    """Compute the quotient RHi / q."""
+    """Compute the quotient ``RHi / q``."""
     return air_pressure * (constants.R_v / constants.R_d) / thermo.e_sat_ice(air_temperature)
 
 
@@ -140,12 +143,14 @@ class HumidityScaling(Model):
                 "being applied more than once."
             )
 
+        p: np.ndarray | xr.DataArray
         if isinstance(self.source, GeoVectorDataset):
-            self.source.setdefault("air_pressure", self.source.air_pressure)
+            p = self.source.setdefault("air_pressure", self.source.air_pressure)
+        else:
+            p = self.source.data["air_pressure"]
 
         q = self.source.data["specific_humidity"]
         T = self.source.data["air_temperature"]
-        p = self.source.data["air_pressure"]
         kwargs = {k: self.get_source_param(k) for k in self.scaler_specific_keys}
 
         q, rhi = self.scale(q, T, p, **kwargs)
@@ -264,7 +269,7 @@ class ExponentialBoostHumidityScaling(HumidityScaling):
         rhi /= rhi_adj
 
         # Find ISSRs
-        is_issr = rhi >= 1
+        is_issr = rhi >= 1.0
 
         # Apply boosting to ISSRs
         if isinstance(rhi, xr.DataArray):
@@ -440,7 +445,7 @@ def _calc_rhi_max(air_temperature: ArrayLike) -> ArrayLike:
         p_ice = thermo.e_sat_ice(air_temperature)
         p_liq = thermo.e_sat_liquid(air_temperature)
         return xr.where(
-            air_temperature < 235,
+            air_temperature < 235.0,
             1.67 + (1.45 - 1.67) * (air_temperature - 190.0) / (235.0 - 190.0),
             p_liq / p_ice,
         )
@@ -553,10 +558,262 @@ class HumidityScalingByLevel(HumidityScaling):
                 "attribute 'mid_troposphere_threshold'."
             )
 
-        level = air_pressure / 100
+        level = air_pressure / 100.0
         fp = [rhi_adj_stratosphere, rhi_adj_mid_troposphere]
         rhi_adj = np.interp(level, xp=xp, fp=fp)
 
         q = specific_humidity / rhi_adj
         rhi = thermo.rhi(q, air_temperature, air_pressure)
         return q, rhi
+
+
+@functools.cache
+def _load_iagos_quantiles() -> npt.NDArray[np.float64]:
+    path = pathlib.Path(__file__).parent / "quantiles" / "iagos_quantiles.npy"
+    # FIXME: Recompute to avoid the divide by 100.0 here
+    return np.load(path, allow_pickle=False) / 100.0
+
+
+@functools.cache
+def _load_era5_ensemble_quantiles() -> npt.NDArray[np.float64]:
+    path = pathlib.Path(__file__).parent / "quantiles" / "era5_ensemble_quantiles.npy"
+    # FIXME: Recompute to avoid the divide by 100.0 here
+    return np.load(path, allow_pickle=False) / 100.0
+
+
+def quantile_rhi_map(era5_rhi: npt.NDArray[np.float_], member: int) -> npt.NDArray[np.float64]:
+    """Map ERA5-derived RHi to it's corresponding IAGOS quantile via histogram matching.
+
+    This matching is performed on a **single** ERA5 ensemble member.
+
+    Parameters
+    ----------
+    era5_rhi : npt.NDArray[np.float_]
+        ERA5-derived RHi values for the given ensemble member.
+    member : int
+        The ERA5 ensemble member to use. Must be in the range ``[0, 10)``.
+
+    Returns
+    -------
+    npt.NDArray[np.float64]
+        The IAGOS quantiles corresponding to the ERA5-derived RHi values.
+    """
+
+    era5_quantiles = _load_era5_ensemble_quantiles()  # shape (801, 10)
+    era5_quantiles = era5_quantiles[:, member]  # shape (801,)
+    iagos_quantiles = _load_iagos_quantiles()  # shape (801,)
+
+    return np.interp(era5_rhi, era5_quantiles, iagos_quantiles)
+
+
+def recalibrate_rhi(
+    era5_rhi_all_members: npt.NDArray[np.float_], member: int
+) -> npt.NDArray[np.float_]:
+    """Recalibrate ERA5-derived RHi values to IAGOS quantiles.
+
+    This recalibration requires values for **all** ERA5 ensemble members.
+
+    Parameters
+    ----------
+    era5_rhi_all_members : npt.NDArray[np.float_]
+        ERA5-derived RHi values for all ensemble members. This array should have shape ``(n, 10)``.
+    member : int
+        The ERA5 ensemble member to use. Must be in the range ``[0, 10)``.
+
+    Returns
+    -------
+    npt.NDArray[np.float_]
+        The recalibrated RHi values. This is an array of shape ``(n,)``.
+
+    References
+    ----------
+    :cite:`eckelCalibratedProbabilisticQuantitative1998`
+    """
+
+    n_members = 10
+    assert era5_rhi_all_members.shape[1] == n_members
+
+    # Perform histogram matching on the given ensemble member
+    recalibrated_rhi = quantile_rhi_map(era5_rhi_all_members[:, member], member)
+
+    # Perform histogram matching on all other ensemble members
+    # Add up the results into a single 'ensemble_mean_rhi' array
+    ensemble_mean_rhi: npt.NDArray[np.float_] = 0.0  # type: ignore[assignment]
+    for r in range(n_members):
+        if r == member:
+            ensemble_mean_rhi += recalibrated_rhi
+        else:
+            ensemble_mean_rhi += quantile_rhi_map(era5_rhi_all_members[:, r], r)
+
+    # Divide by the number of ensemble members to get the mean
+    ensemble_mean_rhi /= n_members
+
+    eckel_a = -0.005213832567192828
+    eckel_c = 2.7859172756970354
+
+    out = (ensemble_mean_rhi - eckel_a) + eckel_c * (recalibrated_rhi - ensemble_mean_rhi)
+    return out.astype(era5_rhi_all_members.dtype)
+
+
+@dataclasses.dataclass
+class HistogramMatchingWithEckelParams(ModelParams):
+    """Parameters for :class:`HistogramMatchingWithEckel`.
+
+    .. warning::
+        Experimental. This may change or be removed in a future release.
+    """
+
+    #: A length-10 list of ERA5 ensemble members.
+    #: Each element is a :class:`MetDataArray` holding specific humidity
+    #: values for a single ensemble member. If None, a ValueError will be
+    #: raised at model instantiation time. The order of the list must be
+    #: consistent with the order of the ERA5 ensemble members.
+    ensemble_specific_humidity: list[MetDataArray] | None = None
+
+    #: The specific member used. Must be in the range [0, 10). If None,
+    #: a ValueError will be raised at model instantiation time.
+    member: int | None = None
+
+
+class HistogramMatchingWithEckel(HumidityScaling):
+    """Scale humidity by histogram matching to IAGOS RHi quantiles.
+
+    This method also applies the Eckel scaling to the recalibrated RHi values.
+
+    Unlike other specific humidity scaling methods, this method requires met data
+    and performs interpolation at evaluation time.
+
+    .. warning::
+        Experimental. This may change or be removed in a future release.
+
+    References
+    ----------
+    :cite:`eckelCalibratedProbabilisticQuantitative1998`
+    """
+
+    name = "histogram_matching_with_eckel"
+    long_name = "IAGOS RHi histogram matching with Eckel scaling"
+    formula = "era5_quantiles -> iagos_quantiles -> recalibrated_rhi"
+    default_params = HistogramMatchingWithEckelParams
+
+    n_members = 10  # hard-coded elsewhere
+
+    def __init__(
+        self,
+        met: MetDataset | None = None,
+        params: dict[str, Any] | None = None,
+        **params_kwargs: Any,
+    ) -> None:
+        super().__init__(met, params, **params_kwargs)
+
+        # Some very crude validation
+        member = self.params["member"]
+        assert member in range(self.n_members)
+        self.member: int = member
+
+        ensemble_specific_humidity = self.params["ensemble_specific_humidity"]
+        assert len(ensemble_specific_humidity) == self.n_members
+        for member, mda in enumerate(ensemble_specific_humidity):
+            try:
+                assert mda.data["number"] == member
+            except KeyError:
+                pass
+
+        self.ensemble_specific_humidity: list[MetDataArray] = ensemble_specific_humidity
+
+    @overload
+    def eval(self, source: GeoVectorDataset, **params: Any) -> GeoVectorDataset:
+        ...
+
+    @overload
+    def eval(self, source: MetDataset, **params: Any) -> NoReturn:
+        ...
+
+    @overload
+    def eval(self, source: None = ..., **params: Any) -> NoReturn:
+        ...
+
+    def eval(
+        self, source: GeoVectorDataset | MetDataset | None = None, **params: Any
+    ) -> GeoVectorDataset | MetDataset:
+        """Scale specific humidity by histogram matching to IAGOS RHi quantiles.
+
+        This method assumes ``source`` is equipped with the following variables:
+
+        - air_temperature
+        - specific_humidity: Humidity values for the :attr:`member` ERA5 ensemble member.
+        """
+
+        self.update_params(params)
+        self.set_source(source)
+        self.source = self.require_source_type(GeoVectorDataset)
+
+        if "rhi" in self.source:
+            warnings.warn(
+                "Variable 'rhi' already found on source to be scaled. This "
+                "is unexpected and may be the result of humidity scaling "
+                "being applied more than once."
+            )
+
+        # Create a 2D array of specific humidity values for all ensemble members
+        # The specific humidity values for the current member are taken from the source
+        # This matches patterns used in other humidity scaling methods
+        # The remaining values are interpolated from the ERA5 ensemble members
+        q = self.source.data["specific_humidity"]
+        q2d = np.empty((len(self.source), self.n_members), dtype=q.dtype)
+
+        for member, mda in enumerate(self.ensemble_specific_humidity):
+            if member == self.member:
+                q2d[:, member] = q
+            else:
+                q2d[:, member] = self.source.intersect_met(mda, **self.interp_kwargs)
+
+        p = self.source.setdefault("air_pressure", self.source.air_pressure)
+        T = self.source.data["air_temperature"]
+
+        q, rhi = self.scale(q2d, T, p)
+        self.source.update(specific_humidity=q, rhi=rhi)
+
+        return self.source
+
+    @overrides
+    def scale(  # type: ignore[override]
+        self,
+        specific_humidity: npt.NDArray[np.float_],
+        air_temperature: npt.NDArray[np.float_],
+        air_pressure: npt.NDArray[np.float_],
+        **kwargs: Any,
+    ) -> tuple[npt.NDArray[np.float_], npt.NDArray[np.float_]]:
+        """Scale specific humidity values via histogram matching and Eckel scaling.
+
+        Unlike the method on the base class, the method assumes each of the input
+        arrays are :class:`np.ndarray` and not :class:`xr.DataArray` objects.
+
+        Parameters
+        ----------
+        specific_humidity : npt.NDArray[np.float_]
+            A 2D array of specific humidity values for all ERA5 ensemble members.
+            The shape of this array must be ``(n, 10)``, where ``n`` is the number
+            of observations and ``10`` is the number of ERA5 ensemble members.
+        air_temperature : npt.NDArray[np.float_]
+            A 1D array of air temperature values with shape ``(n,)``.
+        air_pressure : npt.NDArray[np.float_]
+            A 1D array of air pressure values with shape ``(n,)``.
+        kwargs: Any
+            Unused, kept for compatibility with the base class.
+
+        Returns
+        -------
+        specific_humidity : npt.NDArray[np.float_]
+            The recalibrated specific humidity values. A 1D array with shape ``(n,)``.
+        rhi : npt.NDArray[np.float_]
+            The recalibrated RHi values. A 1D array with shape ``(n,)``.
+        """
+
+        rhi_over_q = _rhi_over_q(air_temperature, air_pressure)
+        rhi = rhi_over_q[:, np.newaxis] * specific_humidity
+
+        recalibrated_rhi = recalibrate_rhi(rhi, self.member)
+        recalibrated_q = recalibrated_rhi / rhi_over_q
+
+        return recalibrated_q, recalibrated_rhi

pycontrails/models/issr.py

@@ -51,7 +51,7 @@ class ISSR(Model):
     >>> variables = ["air_temperature", "specific_humidity"]
     >>> pressure_levels = [200, 250, 300]
     >>> era5 = ERA5(time, variables, pressure_levels)
-    >>> met = era5.open_metdataset(xr_kwargs=dict(parallel=False))
+    >>> met = era5.open_metdataset()
 
     >>> # Instantiate and run model
     >>> scaling = ConstantHumidityScaling(rhi_adj=0.98)

pycontrails/models/sac.py

@@ -438,6 +438,8 @@ def T_critical_sac(
     # We only apply Newton's method at points with rh bounded below 1 (scipy will
     # raise an error if Newton's method is not converging well).
     filt = relative_humidity < 0.999
+    if not np.any(filt):
+        return T_LM
 
     U_filt = relative_humidity[filt]
     T_LM_filt = T_LM[filt]

pycontrails/physics/geo.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import numpy as np
+import numpy.typing as npt
 import xarray as xr
 
 from pycontrails.physics import constants, units
@@ -834,7 +835,7 @@ def advect_level(
     return (level * 100.0 + (dt_s * velocity)) / 100.0
 
 
-def _dt_to_float_seconds(dt: np.ndarray | np.timedelta64, dtype: np.dtype) -> np.ndarray:
+def _dt_to_float_seconds(dt: np.ndarray | np.timedelta64, dtype: npt.DTypeLike) -> np.ndarray:
     """Convert a time delta to seconds as a float with specified ``dtype`` precision.
 
     Parameters

pycontrails/utils/json.py

@@ -161,9 +161,9 @@ def dataframe_to_geojson_points(
 
     def row_to_feature(row: pd.Series) -> dict[str, str | dict[str, Any]]:
         point = [
-            np.around(row.longitude, decimals=4) if not np.isnan(row.longitude) else None,
-            np.around(row.latitude, decimals=4) if not np.isnan(row.latitude) else None,
-            np.around(row.altitude, decimals=4) if not np.isnan(row.altitude) else None,
+            np.round(row.longitude, decimals=4) if not np.isnan(row.longitude) else None,
+            np.round(row.latitude, decimals=4) if not np.isnan(row.latitude) else None,
+            np.round(row.altitude, decimals=4) if not np.isnan(row.altitude) else None,
         ]
         # converting to int to allow JSON serialization
         properties = {"time": int(row.time.timestamp())}

{pycontrails-0.42.0.dist-info → pycontrails-0.42.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycontrails
-Version: 0.42.0
+Version: 0.42.2
 Summary: Python library for modeling aviation climate impacts
 Author-email: Breakthrough Energy <py@contrails.org>
 License: Apache-2.0
@@ -34,12 +34,7 @@ Requires-Dist: pyproj (>=3.5)
 Requires-Dist: scipy (>=1.10)
 Requires-Dist: xarray (>=2022.3)
 Provides-Extra: complete
-Requires-Dist: pycontrails[ecmwf] ; extra == 'complete'
-Requires-Dist: pycontrails[gcp] ; extra == 'complete'
-Requires-Dist: pycontrails[gfs] ; extra == 'complete'
-Requires-Dist: pycontrails[jupyter] ; extra == 'complete'
-Requires-Dist: pycontrails[vis] ; extra == 'complete'
-Requires-Dist: pycontrails[zarr] ; extra == 'complete'
+Requires-Dist: pycontrails[ecmwf,gcp,gfs,jupyter,pwlf,vis,zarr] ; extra == 'complete'
 Provides-Extra: dev
 Requires-Dist: black (>=22) ; extra == 'dev'
 Requires-Dist: black[jupyter] ; extra == 'dev'
@@ -96,6 +91,8 @@ Requires-Dist: ipywidgets (>=7.6) ; extra == 'jupyter'
 Requires-Dist: jupyterlab (>=2.2) ; extra == 'jupyter'
 Provides-Extra: open3d
 Requires-Dist: open3d (>=0.14) ; extra == 'open3d'
+Provides-Extra: pwlf
+Requires-Dist: pwlf (>=2.2.1) ; extra == 'pwlf'
 Provides-Extra: vis
 Requires-Dist: matplotlib (>=3.3) ; extra == 'vis'
 Requires-Dist: opencv-python-headless (>=4.5) ; extra == 'vis'

{pycontrails-0.42.0.dist-info → pycontrails-0.42.2.dist-info}/RECORD

@@ -1,24 +1,25 @@
-pycontrails-0.42.0.dist-info/RECORD,,
-pycontrails-0.42.0.dist-info/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
-pycontrails-0.42.0.dist-info/WHEEL,sha256=GYWT1Q_60SI2bAUaGrkLwkEA5yYDmphib6XcY6K30ZQ,110
-pycontrails-0.42.0.dist-info/NOTICE,sha256=gKI8DcN1WhiXB2SFRKDogcjONldGubTvBxiOYdC4CXU,1926
-pycontrails-0.42.0.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
-pycontrails-0.42.0.dist-info/METADATA,sha256=xQ9tt3JbcEkYt0cretDHsuaUW0Aorvo93bIC2Ue6CaM,8354
-pycontrails/_version.py,sha256=CprMv6GTEx4IrrUdo6yTukVOLmxjWTO3U6cWecLEjMA,162
+pycontrails-0.42.2.dist-info/RECORD,,
+pycontrails-0.42.2.dist-info/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
+pycontrails-0.42.2.dist-info/WHEEL,sha256=GYWT1Q_60SI2bAUaGrkLwkEA5yYDmphib6XcY6K30ZQ,110
+pycontrails-0.42.2.dist-info/NOTICE,sha256=gKI8DcN1WhiXB2SFRKDogcjONldGubTvBxiOYdC4CXU,1926
+pycontrails-0.42.2.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
+pycontrails-0.42.2.dist-info/METADATA,sha256=Eyt-RbhPHpnumnU-YHOXVzYv6GFaHe5NXkzbjdo9hd4,8178
+pycontrails/_version.py,sha256=JQ-ensPiphsIDBK4lnzSeMWxygjAp19P9cOtQQsBrjI,162
 pycontrails/__init__.py,sha256=sf7Xhr91V2jAvcQkla9oPqNCaXSKQp2M_dcxkiVkl6w,1943
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycontrails/core/rgi_cython.cpython-311-darwin.so,sha256=xys8mlfel4-CeSskueU16xo1YzO0CU36gpRKPHjAjaw,261341
-pycontrails/core/vector.py,sha256=qxxYQK1YJF5rC5d3wIeOumlDh0QPATiAUTFYipQhEtQ,58368
-pycontrails/core/models.py,sha256=eapTP-JlMgfXVvvLn3WcbushGpCRgbUp3u25sgwi9IU,26792
-pycontrails/core/interpolation.py,sha256=3SK7xE0ChmCc7Ev4uM1saUF3LhS7h0mqNMk4qR3XxwY,24032
-pycontrails/core/fleet.py,sha256=L-tQPLjflT_ofc5z0mt49O2o4_gzXxoQTpCZLA_VkpE,12453
-pycontrails/core/flight.py,sha256=qd0lZQ_0xIUVMbDByOVlYl_8gdm85r0tPtK5SIlptcM,57318
+pycontrails/core/rgi_cython.cpython-311-darwin.so,sha256=uWNsaY22_-09tZ4fCijYCyAAfbcwYFp7cY_KfvcCm6g,261341
+pycontrails/core/vector.py,sha256=JF-K_6ieGh5TG0TrqF-jexH5diusfluYW1lzzzSapV8,58504
+pycontrails/core/models.py,sha256=-_W0nbAlfeYQfiHnzAIyHB-Wi8957B_s4T8q-gmGmwQ,26969
+pycontrails/core/interpolation.py,sha256=J-drgXpacQG_z7pOOpIIfWBW3TSkK09pEUL7HV8qfOk,23713
+pycontrails/core/fleet.py,sha256=dkDHEvzqB0T1_zxGUQhkdZaER4SR8H1wnTryWRkc42Q,14419
+pycontrails/core/flight.py,sha256=VIIvRtdPPqJxP170ZGcBnHngvBwhphdnvyRP3DXAx7g,61998
 pycontrails/core/fuel.py,sha256=lEMUgLeFBoazDsiKN07s9udQ12xghOos5v3H9bjveBs,4044
 pycontrails/core/polygon.py,sha256=FlFHJvonnxajq6iY12cuqW-MP8wGGeb3aiNJh-hks3g,16636
-pycontrails/core/datalib.py,sha256=BT-iFvD2nACKqh82j0wxBRcRgH2WL8VtN3FdSmNFMiQ,21517
-pycontrails/core/cache.py,sha256=uMzN45MUgIni1uhlypLVjc0NhFDvn6m-uK78p9sDdE8,28536
+pycontrails/core/datalib.py,sha256=bI1PRTYdYYEQAp0d6MEm7HXq0n7Xgpwa_MESsbux2RY,21613
+pycontrails/core/cache.py,sha256=0JyO0N5gddWoeo3UeOVUHtCkXoPVhIJ-RBLk_eFgYqs,28430
 pycontrails/core/__init__.py,sha256=C6bOLNBKeQaLCHCRza1oPrQTUazutPST7hX4C6O2MG0,866
-pycontrails/core/met.py,sha256=jID-joG-1Mm-SSHVAWijOZL6yLwGd7GJAs2v7dybR2E,86826
+pycontrails/core/flightplan.py,sha256=Vq__4eDPo6hTwXMgiCj7boV4P9gTjNtst5n0sy6j4UI,7636
+pycontrails/core/met.py,sha256=zW9HFpaaS3pXUFZxWboTo_cV6RPPMrz_j5DLiPcnkzs,86676
 pycontrails/core/airports.py,sha256=5D0VF9DxleQlVOmMW-P8_fVVkob-aB3doO1Co2XNFss,6766
 pycontrails/core/met_var.py,sha256=-gaodcmxx507ryMVKvFclqKkf1c8OHVVtXeG9s2eOOs,9191
 pycontrails/core/coordinates.py,sha256=b7D2lknnnwh8rBSla9M3ojqRYiASAOrVv0OAFD8xpDw,5078
@@ -27,27 +28,27 @@ pycontrails/datalib/ecmwf/era5.py,sha256=ulII_wQDSLmaqpMdZpAlOCmCCxhpzfSdBBgb8NW
 pycontrails/datalib/ecmwf/hres.py,sha256=wnGSZ67fnJ7NOw4hZXk3UCNcfFvShK1pWMm4nx0fz6c,30333
 pycontrails/datalib/ecmwf/variables.py,sha256=akqjUS3WKnSzV1Y0KkHLylH7QByvitc3wo8NBFeSNew,8714
 pycontrails/datalib/ecmwf/__init__.py,sha256=9rrlhfePtMrkofmFMg7t9fJ3teVufRJ0uM3Y-2PdzQ4,1045
-pycontrails/datalib/ecmwf/common.py,sha256=MCIFgGPnjb9tzjia4QzyPxIOAZBBqmpb4ucmua-B62Q,4890
+pycontrails/datalib/ecmwf/common.py,sha256=tqoKnYOH3B4OzdEe6ZzoyjFO03GaT9QVJqe3sBPYyWQ,4667
 pycontrails/datalib/ecmwf/ifs.py,sha256=2Atnpc4q6Yy9LjEyE4tYzmnlC0bnnbzUiZvj7XUh0Bs,10448
 pycontrails/datalib/gfs/gfs.py,sha256=-3_Qd1fKRU2LYCBK8mDvc9FycL2lYTEzJfXeAXpP73M,23084
 pycontrails/datalib/gfs/variables.py,sha256=s6rKyFdDA8E0Jz8X4twM7mgq5zhRGlk5qTedItyqoY8,2860
 pycontrails/datalib/gfs/__init__.py,sha256=tWxgqmlW8Uo07J-3fBTXPrteatzTka9mSXomhWy3NVA,684
 pycontrails/datalib/spire/spire.py,sha256=l52ID6LdYWpWcxxVbupCBono06MvPfwIBOGI9AcxpHQ,25351
 pycontrails/datalib/spire/__init__.py,sha256=4EZPJUmNnF8v2n6QhBvSi_3rYXRBX2zGcPE-WEA-dP8,343
-pycontrails/ext/cirium/__init__.py,sha256=dkNoMUbMfNQJCK69OMgspJGBBI5T6rXzp2MqjDtfkTw,406
-pycontrails/ext/bada/__init__.py,sha256=LYRF_nDHDocSJ603XSJKEEFIX0kfUpFBMXercEndQd8,1054
+pycontrails/ext/cirium/__init__.py,sha256=erApEeJGry3Nbk5yh6YDvwDXmwgtr-Mmav2BuvC9dDU,411
+pycontrails/ext/bada/__init__.py,sha256=n7BZKOxtAew9CaGOICDfO4mzhP_ndURtoGK_WyTbpfg,1059
 pycontrails/utils/iteration.py,sha256=UjMn2FRDyC0A7q_MqKNpqqeNZm-lA23Ws-KV7zFzAl4,292
 pycontrails/utils/synthetic_flight.py,sha256=y05WJE4Z_SuDlU3q5wodiLImyub_dd4MxYqGZb9XOno,16596
 pycontrails/utils/__init__.py,sha256=Gt_57sBgfliFSxx9sDpuchykFDxmM11Wg9xAeSqPcnI,32
 pycontrails/utils/types.py,sha256=0uH2eVmQJZiL76N0v_UtHDyv3FJHeRd7BxEZ_occ0n4,4525
 pycontrails/utils/temp.py,sha256=6BlJ5NaQpACyL-n3FuqfscFb9Mfbgvs72BwWfSzBfmU,1100
-pycontrails/utils/json.py,sha256=lcZtaeJQNx_U5rgR322spbI8zs1XcQ-5So1bb26ow9E,5993
-pycontrails/models/humidity_scaling.py,sha256=pmKDGFT9wRkz7u_qHjeE1uZSi_lOADM2BVg0VlpZof4,19923
+pycontrails/utils/json.py,sha256=zB_23_mqE39G231sQ_XXmxpQQ9pGjIGQCPJ2JaknRrY,5990
+pycontrails/models/humidity_scaling.py,sha256=AkJGD_hNRxsu9na_PPAhgy6ShUE-FlYQvmMKOuFSdPo,29416
 pycontrails/models/pcc.py,sha256=yWi0TochaCWCgrb68dUad9xPMqysIRa2hr6VT8PvxL4,11286
 pycontrails/models/tau_cirrus.py,sha256=jYilgsGQw7aFLjIJaG8zvbu8ITNGlXZvbl18C8vHbE4,4491
 pycontrails/models/__init__.py,sha256=dQTOLQb7RdUdUwslt5se__5y_ymbInBexQmNrmAeOdE,33
-pycontrails/models/issr.py,sha256=VIafGHMXLrTnU52WKvpujsKwUIPu4cVwFjGbB1-9ncs,7577
-pycontrails/models/sac.py,sha256=6kwCAC3kFfgXiEJfyEzdPdH9OhlguPaaVBiESSPSFBs,16105
+pycontrails/models/issr.py,sha256=a1mT_dGPliGHIDYxOtTHw3svb8KW19pHFP1wRuyiYS8,7547
+pycontrails/models/sac.py,sha256=FNM8_LmHl7NPHFHw1R6_r3Mr-dcwELppt969OOvjth4,16150
 pycontrails/models/accf.py,sha256=WRFGNrkt2hLgO-mIsgk3JXk9_R7Hbw0jCPUC6iGpcCg,12368
 pycontrails/models/aircraft_performance.py,sha256=r-SdOw6Aor9JXIz4mVKe7HTrG4lKCXpAraUY2KTZhiE,1722
 pycontrails/models/pcr.py,sha256=m9cLtZr2DK4omtljgWdIVzDpQAeb3hDEDVVfr6zMDtM,5900
@@ -57,23 +58,25 @@ pycontrails/models/emissions/emissions.py,sha256=VW7ZPWmeWfmIsEgcQ88-A08YlmdBTpK
 pycontrails/models/emissions/black_carbon.py,sha256=EDU5yMTuPeWQIeUE3YDkZ6HHFii8ngfi67Svt3AOVH4,20122
 pycontrails/models/emissions/static/edb-gaseous-v28c-engines.csv,sha256=9mok7P9NQSNJnej_gna29pTbgBuZsfI9N5OOoj1S4WI,118901
 pycontrails/models/emissions/static/edb-nvpm-v28c-engines.csv,sha256=otZ3PWXcbu7ZuEgZ3v3bLB0CGjGRAacd69CGFUXAdSU,63472
-pycontrails/models/cocip/radiative_forcing.py,sha256=ReLufq2BWw_Vot18MIBkTkaOqNXrbGyGcoZnAwO0NOg,28853
+pycontrails/models/cocip/radiative_forcing.py,sha256=WfsPtCfUhK7MNTG734dDpDbsOL-BVVNKzeZ4UoUNxyQ,30055
 pycontrails/models/cocip/wind_shear.py,sha256=p4QVwqcpqCP4Pf8rAHPhU_rPM6LlmuWy_fSpOwdIi5w,3727
-pycontrails/models/cocip/cocip.py,sha256=PDnMfZZ7FXqd5r-WWtQCZurD_FyLIvcY2qBELw0YXZE,86552
+pycontrails/models/cocip/cocip.py,sha256=yqVVvqFCeRQoBM2nZlikowEmwebrLiF3qrqu6EPW7S8,86666
 pycontrails/models/cocip/__init__.py,sha256=vBicDVNyw-M3bglx1iVplxm6CQRPRk5SS-3_VgL7WQM,370
-pycontrails/models/cocip/cocip_params.py,sha256=0624P6cVc2vBeD8-2S3lMnfZtKkdOaycGhscgyp_nYo,9098
-pycontrails/models/cocip/wake_vortex.py,sha256=mH8qbuWvZlFzmjBokHp6TAIgii6wVXvaV_xmHzb34MI,11654
-pycontrails/models/cocip/cocip_uncertainty.py,sha256=qZjMi9xZkSFftCrY1kQvoJpdys9ve-fkYu98o3O7V-k,12133
+pycontrails/models/cocip/cocip_params.py,sha256=MQr3I_On4m1MVB_lJbm7FREaOUGRyMNqIog4qKKZcB8,9213
+pycontrails/models/cocip/wake_vortex.py,sha256=DV9Qvjp-nlZjBJK6TFkls8nd7aALlXQZeMpxolUSaHQ,12814
+pycontrails/models/cocip/cocip_uncertainty.py,sha256=wJ43NJr3YZX92GiMhY6LUVni9qbsqKg0duCRSS_r_mw,11782
 pycontrails/models/cocip/radiative_heating.py,sha256=HTvAXv4kU_HIasLUFCF15K-sRzJVK8UAulj2W_gNjKE,18770
 pycontrails/models/cocip/contrail_properties.py,sha256=aoFg19_L2Fd7-Uv3SSMJ5i2rV3xl17XMSZMOekt2tkA,55613
 pycontrails/models/cocip/output/flight_summary.py,sha256=vjm6UwKJT0PoIBj0zLj1_1Q8ZokAZT-GO4T3tB3Jw1I,8838
 pycontrails/models/cocip/output/__init__.py,sha256=-PzsG-acxd6jXOdBjK4kxuYiQ_9Llf5C6JqgZ8mse6U,62
 pycontrails/models/cocip/output/grid_cirrus.py,sha256=_2MdTTahsOK3M14ONOZAN58XS2j90xtt1MAaclLbEhc,25194
+pycontrails/models/quantiles/iagos_quantiles.npy,sha256=mdpQBBsCVUnv8B66xbIOqcNff9bO66wqkNV7V92zD2E,6536
+pycontrails/models/quantiles/era5_ensemble_quantiles.npy,sha256=78NME7RD7-HIy8xZgXc2cyDnfffbzm6eVN7Tau-amZA,64208
 pycontrails/models/cocipgrid/cocip_grid_params.py,sha256=fe7w2bw-wQ-PG8ua5K7nBb19lSMfAoVuaHCVKUsKQCk,5323
 pycontrails/models/cocipgrid/__init__.py,sha256=ar6bF_8Pusbb-myujz_q5ntFylQTNH8yiM8fxP7Zk30,262
 pycontrails/models/cocipgrid/cocip_time_handling.py,sha256=kXO8ePbmjlqZgdV6FMxqA7IAWXUQtVQDRU8RJ12ClWU,13826
 pycontrails/models/cocipgrid/cocip_grid.py,sha256=RCtYk1I49qNgALzLaNlI6EoJaAX4JMmXr_pDYUYJhy4,84548
-pycontrails/physics/geo.py,sha256=-PoXkcdRJ-KR_a7YdZN15q-b5DnGuSuYboG8ATzqFOM,25121
+pycontrails/physics/geo.py,sha256=qQMu4R63I_lyK3p6uztuzCViPK_ja0wHzxAU-3VHdZk,25153
 pycontrails/physics/units.py,sha256=MV2C3qDV7Qf9Bk-ri_crqNSY-qSZj8MPdelNNu--crM,11349
 pycontrails/physics/constants.py,sha256=GJ_M9W7N78osXopNIfRDcHuqcaINLLAhOpOHQBsaI3I,2955
 pycontrails/physics/__init__.py,sha256=_1eWbEy6evEWdfJCEkwDiSdpiDNzNWEPVqaPekHyhwU,44