pycontrails 0.42.0__cp39-cp39-win_amd64.whl → 0.42.2__cp39-cp39-win_amd64.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/__init__.py,sha256=n4f_-X3ryUqkFo1vI7G-fDyIs4iC83dvaIlUYlRHUEU,2014
-pycontrails/_version.py,sha256=IrhdRylAsWMYPGakwTCLXKBhaWFO7oG2sMLJynYZHBk,166
+pycontrails/_version.py,sha256=DV5w0FxBOc0ieZdnbnOq2SN8N97gWalkx03aHRZYzwQ,166
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycontrails/core/__init__.py,sha256=ERJZtX_MJyVgxHTQFAcZtkK6lzeJRlpnFr9ZZbGKpto,897
 pycontrails/core/airports.py,sha256=YFxXk8FFDdH_mjCqqYIrA0GOrTsOFm7LYD4N6S7Eprg,6994
-pycontrails/core/cache.py,sha256=ouuEjOlPZxvV0ghYPc4Q1kT1mgqW2HCa4oBiXwt8EWU,29412
+pycontrails/core/cache.py,sha256=s4HHWDPmU0D9S5GNt3QDvYd4yTy7wQxdhKVC8WFDjkg,29304
 pycontrails/core/coordinates.py,sha256=TbttJt_UcntNI_SvjCTtGkXbqJeyGSFKtA6NM609lxU,5239
-pycontrails/core/datalib.py,sha256=5-fLs7vTOhF4I_omf6G8Ym7d4jE0LCZcFZWnf_FHmpo,22175
-pycontrails/core/fleet.py,sha256=uH3zlBbjrwsJPQ5AQWkCD33QYu3J4W9Hjhf3ZfQ-1nk,12795
-pycontrails/core/flight.py,sha256=717ZrznTmwuz6ZAuQu0cz-CF4biHoy8OQiGVIxeNuE0,58954
+pycontrails/core/datalib.py,sha256=zPOuzye-qH9L03D9nT-0wgqWHNFR7m_caUvTh21yZqo,22274
+pycontrails/core/fleet.py,sha256=Vt9uUARpykWcTkFJJbFNdStXYTx3SI_tkDf5RQSOJ0k,14813
+pycontrails/core/flight.py,sha256=_dDm_OqNIMWw6OOlUb7_LOOkFzRLTsffhP8J4iE-ptY,63760
+pycontrails/core/flightplan.py,sha256=hphWAKNAlCMHuC49vwObkVYiZTZ4gG3s6kON8nSwzDE,7874
 pycontrails/core/fuel.py,sha256=IgsubrJ0T242QKAFaWKt-G3s4pVXs9xrG38EiaxXIpI,4173
-pycontrails/core/interpolation.py,sha256=py0Q0yI7qA4qfBEv1JN5qHNMdX1kIp6Bs-H50yrFEOg,24713
-pycontrails/core/met.py,sha256=W2f-m3zdG6hzXeuNbsiLdwpG6hbsGANjS5QcyFk8gLc,89282
+pycontrails/core/interpolation.py,sha256=snwuKoqxUyDLvtVuoli3UsKwtkO9Dl3znaV5R6INdHM,24390
+pycontrails/core/met.py,sha256=H6rWYE3s-_YC7vL2Gi44YwRA3pY0MBiW4Ye4NsSkH58,89132
 pycontrails/core/met_var.py,sha256=Ent1Na3lWwMWGsthnQcQUTkHvlNXC4oCRyx1mcg-QvA,9498
-pycontrails/core/models.py,sha256=KIFx9pI2liPPLxWJORpO5xjJwfyrznnCFpBWXTYwyS0,27563
+pycontrails/core/models.py,sha256=UThmsakcBdZOYTiyFv9o0xSPJMAXY9u55vKTl4Ucimo,27744
 pycontrails/core/polygon.py,sha256=bvipvjyoZtOPWW2f8_X2YcC0FaJMmhoCM3OH1fVucA4,17146
-pycontrails/core/rgi_cython.cp39-win_amd64.pyd,sha256=gSXzTHQwxhdgr85-90lxOWiJzAa-Cb-aulSKEilwtGw,198144
-pycontrails/core/vector.py,sha256=PbauZZkeEqzMDICsGofddAeUHuOv4AJ2l2_U2-sC6As,60135
+pycontrails/core/rgi_cython.cp39-win_amd64.pyd,sha256=G0B_djVkvIje-6KA_ZNH6-wYC6bskXAX_1maCU2cw_M,198144
+pycontrails/core/vector.py,sha256=Gkl-HI7RXhlfITpmhnJi8kubGKzJvHkWlxzIcPypeS4,60276
 pycontrails/datalib/__init__.py,sha256=WnXqgv20SrHZLjFZ9qpQEwRnf0QvfZU-YvMqh7PAUwg,246
 pycontrails/datalib/ecmwf/__init__.py,sha256=Qil0XaK3SpPFgTn-jZ2l4xsUwYhs1kp9fwNN1ctxh4A,1086
-pycontrails/datalib/ecmwf/common.py,sha256=1tQJIsnJ7xFQdEjxdx0RAG72jxRdq84LjCoJOkg4wFg,5022
+pycontrails/datalib/ecmwf/common.py,sha256=_8mu73arA1MXPVoUJxetXzo_UllJSkRfZt2Nh4LuRGQ,4794
 pycontrails/datalib/ecmwf/era5.py,sha256=P28_RxbCDKxYDf76OReexBaItsi9LPGeZ0HnOnhicTU,20163
 pycontrails/datalib/ecmwf/hres.py,sha256=0KYaN1VHhl4PrxsGw3J81ah7sBBsPiMbf7djM8r31rI,31163
 pycontrails/datalib/ecmwf/ifs.py,sha256=0_kSrlbXrTpwm0M6xFF9gmSrYAIMN9zs7o-tqJ3PDlE,10725
@@ -28,25 +29,25 @@ pycontrails/datalib/gfs/gfs.py,sha256=bU80wKB5UQBrkOdHj79yXdKsLih7G8JQaCevjPjmiT
 pycontrails/datalib/gfs/variables.py,sha256=DHzhNaXEgcfZJCGUqfRyKcmnaJDMnMVKKC4KzbjrPKo,2959
 pycontrails/datalib/spire/__init__.py,sha256=YiS2SMSNU0bLHfbh41nQuKB8MnQNU8o3MldreM1nrM0,362
 pycontrails/datalib/spire/spire.py,sha256=cEIx8eC4JBC9J8RJng902bpiWA9CKrWFJxX28Wwqr4M,26090
-pycontrails/ext/bada/__init__.py,sha256=whbmKjOwJW0M6IhO8ztVpZ8c5l1ieOUkz4KZbmf98lE,1095
-pycontrails/ext/cirium/__init__.py,sha256=e5yUjoX5kK2_tuSaZLyZvI55PP3-rkTBzQEYbd8HJ_E,420
+pycontrails/ext/bada/__init__.py,sha256=08M4NPJfi2N_tffJzflP-gFub-NAdLgRMk1TMaFzPyk,1100
+pycontrails/ext/cirium/__init__.py,sha256=KJWOcMMgNJAkqYcxDU4NS4NoUYLJI6cOv5P4zzEv0yo,425
 pycontrails/models/__init__.py,sha256=TKhrXe1Pu1-mV1gctx8cUAMrVxCCAtBkbZi9olfWq8s,34
 pycontrails/models/accf.py,sha256=wdnWizzkaCu7C-qy_v511oSu8BOe6tGoXOW_A9oFbPE,12744
 pycontrails/models/aircraft_performance.py,sha256=OhLFdSu5f1Mh9-xcx0yDOPL4PSIRmmgwu7nm96VUDFU,1782
-pycontrails/models/humidity_scaling.py,sha256=FIDFBMtyaf6M3uuPVh7P7_qDEMdFche9Xv0knu8E-4g,20485
-pycontrails/models/issr.py,sha256=mBvk6abw7MpE9nm4ceU6YtS_n7o7J6nBJy1_qIomGXE,7792
+pycontrails/models/humidity_scaling.py,sha256=mn7SwizdsCIdg_vlYch9S3Jh_hU1sqw9fwSHMZSb00s,30235
+pycontrails/models/issr.py,sha256=EIxY5hgGx7_BWJ0sNKizhKSTRBlbnWVAdOyZRz7on4c,7762
 pycontrails/models/pcc.py,sha256=n5TmzpMVw4vbDspD5f1Q6oM0U5Vbj9kA7M0xXj4cbyo,11617
 pycontrails/models/pcr.py,sha256=NNnaXR4JeK8XIbhDCLJsCRDumSVdZVcgmaEN6q-wtfI,6067
-pycontrails/models/sac.py,sha256=1lvXssdqtCsRbsLAJ9FrlE9j2W8LPxfJ_DODgJJSVJM,16570
+pycontrails/models/sac.py,sha256=_tkjX0Qf8pFOdlRERK1O5tXsNC8Gt0iuCrLlFMoHZAc,16617
 pycontrails/models/tau_cirrus.py,sha256=3zpjLXr68moOrjK3vSiCydINBxVkw-F5lF5pKWGcJpI,4642
 pycontrails/models/cocip/__init__.py,sha256=qkj5BtAqJky6hu1dNwkk_kn3kme2iDqRgGJnn5B6DvI,382
-pycontrails/models/cocip/cocip.py,sha256=CWk4iN_mzWCBR9ti3m-vBaNsfhukWEpSkrrWuWnIlyk,88824
-pycontrails/models/cocip/cocip_params.py,sha256=S3MLjqFzfOQ8aK5NKeN7bqEWlKzBV9qZSez5anL51yA,9332
-pycontrails/models/cocip/cocip_uncertainty.py,sha256=9y_oa4ZKS3pjnN_inKFopjtjGIQrCVn9UXboxamnbE0,12429
+pycontrails/models/cocip/cocip.py,sha256=JFFbe_t4rbHuH8M2-A05nA46KBvrarEDR_ZjKO7ujew,88936
+pycontrails/models/cocip/cocip_params.py,sha256=--vZbn-c62umyXZ1FWENbm6_Idkp_18iun1KuHn6Xhs,9454
+pycontrails/models/cocip/cocip_uncertainty.py,sha256=ma4ZHZS5stCyJgVlCb1Vy-QjSbyaxG5PU4fr4ifr3Wg,12067
 pycontrails/models/cocip/contrail_properties.py,sha256=UqXPra10YMPY_P6eh23cVd30hxPriNK3oEBsqQYIeNQ,57135
-pycontrails/models/cocip/radiative_forcing.py,sha256=WX6gBX1zEeSInBHXBgoZiNIJ3nTJvxQM2sh-vTCb3XI,29690
+pycontrails/models/cocip/radiative_forcing.py,sha256=FwE-1w8Q1IVQAoesZGljHXTI3iFXGhqSRKIcMJxSgbA,30919
 pycontrails/models/cocip/radiative_heating.py,sha256=k3HRZv2ik7SffG9FV7N8u2OIniudJKEmHQ95iQJKrxE,19295
-pycontrails/models/cocip/wake_vortex.py,sha256=dXeHr-OGt8UgPWecOpmanLSUQn4Fq9rxVCAXG5l7qVA,12016
+pycontrails/models/cocip/wake_vortex.py,sha256=5t3xA4jiGcySPMLu8Z_MYQBQbYxpe1nYOyyNe58iSjU,13181
 pycontrails/models/cocip/wind_shear.py,sha256=ufZUJcxU-sPVS-egq1A0JefyxOH9-n1AUIjkh5z_naY,3846
 pycontrails/models/cocip/output/__init__.py,sha256=3TY2d0_fYj_Jh6umktdhdSkko2cP0r7blWa4Qq4rOCM,63
 pycontrails/models/cocip/output/flight_summary.py,sha256=e7oPCIp6Hk3zZsIzJNhzMbVRBCAKwxk76aoJ3JCinCw,9072
@@ -61,21 +62,23 @@ pycontrails/models/emissions/emissions.py,sha256=ngwoIiC0JPY3QVqSQQOmZuDdZ8xHt6U
 pycontrails/models/emissions/ffm2.py,sha256=JICuusRlHp--Limr-9NWGbHS4zQKGzaa4B5ll5CGp4I,12274
 pycontrails/models/emissions/static/edb-gaseous-v28c-engines.csv,sha256=UJjnqdyOwkokzz3Vd5bSXCpn8Sm-mSygOdC8CrGhhqo,119459
 pycontrails/models/emissions/static/edb-nvpm-v28c-engines.csv,sha256=JKYYEd42dQSeNujub6HgwbUoVZG84iHzBY9YO086lxA,63651
+pycontrails/models/quantiles/era5_ensemble_quantiles.npy,sha256=78NME7RD7-HIy8xZgXc2cyDnfffbzm6eVN7Tau-amZA,64208
+pycontrails/models/quantiles/iagos_quantiles.npy,sha256=mdpQBBsCVUnv8B66xbIOqcNff9bO66wqkNV7V92zD2E,6536
 pycontrails/physics/__init__.py,sha256=AScCMSMSZjKxfL6mssdSLwcja1ml7MzREThQp5PLr9U,45
 pycontrails/physics/constants.py,sha256=Qf_7943-wlWC6sBr64GNv4Z6eD0W8UZyFWnd6-YEenk,3064
-pycontrails/physics/geo.py,sha256=2bkuyWQ3u6S4iQN78o9X-bD2hpt0PujY0cjrfJ0Z__A,25975
+pycontrails/physics/geo.py,sha256=WY2LJzb3fUzUYQVBTKQK0JTaQvRVRsGOpRK_oYP_8Ew,26008
 pycontrails/physics/jet.py,sha256=CStK4lLEzOu2MfXHo-AAtnMd6JowmGKRsxlvEXHq1XY,22802
 pycontrails/physics/thermo.py,sha256=_HkpS8EdzjRgdPNu7eLYC91-G4D25ZS-YfoEaYa9xlg,13266
 pycontrails/physics/units.py,sha256=SgMSqvoWu1MASDexkponfWKdlPCctvu3Qq6S-_WypfA,11795
 pycontrails/utils/__init__.py,sha256=VmklFC-5I5lGFQEzuomlPk_bM6CoM9XDljfjCovG3vw,33
 pycontrails/utils/iteration.py,sha256=jSII_Eb0kvDZz1uPiulTKVB4E0v3XJQurbSzpHqrFIQ,304
-pycontrails/utils/json.py,sha256=sOomUaRmAdOcFRjKTumXYCF7_DiQh8ePjgXTehpWav0,6183
+pycontrails/utils/json.py,sha256=d2MJutSd4ZtVQFco70lURA2zuokFGryaTdKmjePd2qM,6180
 pycontrails/utils/synthetic_flight.py,sha256=FZF64zWX91UMdDLNlgpvPtIlIiO3COauo-wMe3W7PcQ,17020
 pycontrails/utils/temp.py,sha256=4S2BeY2mR5W_3gap3RyzQQmjwyuhJa7sOo68J1VrmWA,1150
 pycontrails/utils/types.py,sha256=ByKfuaQ6CSeQdOf_Wn_k93hkjDTNWf89bhCT9ErXQ5M,4685
-pycontrails-0.42.0.dist-info/LICENSE,sha256=HVr8JnZfTaA-12BfKUQZi5hdrB3awOwLWs5X_ga5QzA,10353
-pycontrails-0.42.0.dist-info/METADATA,sha256=1QwU6aPzmQkVqhtmmPD2u72jGq4N03JKa3umLgYwVsU,8516
-pycontrails-0.42.0.dist-info/NOTICE,sha256=qYeNEp8OjDK5jSW3hTlr9LQRjZeEhXQm0zDei5UFaYs,1969
-pycontrails-0.42.0.dist-info/WHEEL,sha256=eep6QWEFiQfg2wcclssb_WY-D33AnLYLnEKGA9Rn-VU,100
-pycontrails-0.42.0.dist-info/top_level.txt,sha256=dwaYXVcMhF92QWtAYcLvL0k02vyBqwhsv92lYs2V6zQ,23
-pycontrails-0.42.0.dist-info/RECORD,,
+pycontrails-0.42.2.dist-info/LICENSE,sha256=HVr8JnZfTaA-12BfKUQZi5hdrB3awOwLWs5X_ga5QzA,10353
+pycontrails-0.42.2.dist-info/METADATA,sha256=xyl17F0w-AYzi4XVhhnSIJEfIyVkfbDuAjPKm03voWg,8337
+pycontrails-0.42.2.dist-info/NOTICE,sha256=qYeNEp8OjDK5jSW3hTlr9LQRjZeEhXQm0zDei5UFaYs,1969
+pycontrails-0.42.2.dist-info/WHEEL,sha256=eep6QWEFiQfg2wcclssb_WY-D33AnLYLnEKGA9Rn-VU,100
+pycontrails-0.42.2.dist-info/top_level.txt,sha256=dwaYXVcMhF92QWtAYcLvL0k02vyBqwhsv92lYs2V6zQ,23
+pycontrails-0.42.2.dist-info/RECORD,,