pycontrails 0.54.8__cp313-cp313-macosx_10_13_x86_64.whl → 0.54.10__cp313-cp313-macosx_10_13_x86_64.whl

pycontrails/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.54.8'
-__version_tuple__ = version_tuple = (0, 54, 8)
+__version__ = version = '0.54.10'
+__version_tuple__ = version_tuple = (0, 54, 10)

pycontrails/core/aircraft_performance.py

@@ -4,15 +4,9 @@ from __future__ import annotations
 
 import abc
 import dataclasses
-import sys
 import warnings
 from typing import Any, Generic, NoReturn, overload
 
-if sys.version_info >= (3, 12):
-    from typing import override
-else:
-    from typing_extensions import override
-
 import numpy as np
 import numpy.typing as npt
 
@@ -20,6 +14,7 @@ from pycontrails.core import flight, fuel
 from pycontrails.core.fleet import Fleet
 from pycontrails.core.flight import Flight
 from pycontrails.core.met import MetDataset
+from pycontrails.core.met_var import AirTemperature, EastwardWind, MetVariable, NorthwardWind
 from pycontrails.core.models import Model, ModelParams, interpolate_met
 from pycontrails.core.vector import GeoVectorDataset
 from pycontrails.physics import jet
@@ -97,6 +92,9 @@ class AircraftPerformance(Model):
     """
 
     source: Flight
+    met_variables: tuple[MetVariable, ...] = ()
+    optional_met_variables: tuple[MetVariable, ...] = (AirTemperature, EastwardWind, NorthwardWind)
+    default_params = AircraftPerformanceParams
 
     @overload
     def eval(self, source: Fleet, **params: Any) -> Fleet: ...
@@ -129,7 +127,8 @@ class AircraftPerformance(Model):
         self.set_source_met()
         self._cleanup_indices()
 
-        # Calculate true airspeed if not included on source
+        # Calculate temperature and true airspeed if not included on source
+        self.ensure_air_temperature_on_source()
         self.ensure_true_airspeed_on_source()
 
         if isinstance(self.source, Fleet):
@@ -162,23 +161,6 @@ class AircraftPerformance(Model):
         - ``total_fuel_burn``: total fuel burn, [:math:`kg`]
         """
 
-    @override
-    def set_source_met(self, *args: Any, **kwargs: Any) -> None:
-        fill_with_isa = self.params["fill_low_altitude_with_isa_temperature"]
-        if fill_with_isa and (self.met is None or "air_temperature" not in self.met):
-            if "air_temperature" in self.source:
-                _fill_low_altitude_with_isa_temperature(self.source, 0.0)
-            else:
-                self.source["air_temperature"] = self.source.T_isa()
-            fill_with_isa = False  # we've just filled it
-
-        super().set_source_met(*args, **kwargs)
-        if not fill_with_isa:
-            return
-
-        met_level_0 = self.met.data["level"][-1].item()  # type: ignore[union-attr]
-        _fill_low_altitude_with_isa_temperature(self.source, met_level_0)
-
     def simulate_fuel_and_performance(
         self,
         *,
@@ -491,25 +473,57 @@ class AircraftPerformance(Model):
             Derived performance metrics at each waypoint.
         """
 
-    def ensure_true_airspeed_on_source(self) -> npt.NDArray[np.floating]:
+    def ensure_air_temperature_on_source(self) -> None:
+        """Add ``air_temperature`` field to :attr:`source` data if not already present.
+
+        This function operates in-place. If ``air_temperature`` is not already present
+        on :attr:`source`, it is calculated by interpolation from met data.
+        """
+        fill_with_isa = self.params["fill_low_altitude_with_isa_temperature"]
+
+        if "air_temperature" in self.source:
+            if not fill_with_isa:
+                return
+            _fill_low_altitude_with_isa_temperature(self.source, 0.0)
+            return
+
+        temp_available = self.met is not None and "air_temperature" in self.met
+
+        if not temp_available:
+            if fill_with_isa:
+                self.source["air_temperature"] = self.source.T_isa()
+                return
+            msg = (
+                "Cannot compute air temperature without providing met data that includes an "
+                "'air_temperature' variable. Either include met data with 'air_temperature' "
+                "in the model constructor, define 'air_temperature' data on the flight, or set "
+                "'fill_low_altitude_with_isa_temperature' to True."
+            )
+            raise ValueError(msg)
+
+        interpolate_met(self.met, self.source, "air_temperature", **self.interp_kwargs)
+
+        if not fill_with_isa:
+            return
+
+        met_level_0 = self.met.data["level"][-1].item()  # type: ignore[union-attr]
+        _fill_low_altitude_with_isa_temperature(self.source, met_level_0)
+
+    def ensure_true_airspeed_on_source(self) -> None:
         """Add ``true_airspeed`` field to :attr:`source` data if not already present.
 
-        Returns
-        -------
-        npt.NDArray[np.floating]
-            True airspeed, [:math:`m s^{-1}`]. If ``true_airspeed`` is already present
-            on :attr:`source`, this is returned directly. Otherwise, it is calculated
-            using :meth:`Flight.segment_true_airspeed`.
+        This function operates in-place. If ``true_airspeed`` is not already present
+        on :attr:`source`, it is calculated using :meth:`Flight.segment_true_airspeed`.
         """
         tas = self.source.get("true_airspeed")
         fill_with_groundspeed = self.params["fill_low_altitude_with_zero_wind"]
 
         if tas is not None:
             if not fill_with_groundspeed:
-                return tas
+                return
             cond = np.isnan(tas)
             tas[cond] = self.source.segment_groundspeed()[cond]
-            return tas
+            return
 
         # Use current cocip convention: eastward_wind on met, u_wind on source
         wind_available = ("u_wind" in self.source and "v_wind" in self.source) or (
@@ -520,7 +534,7 @@ class AircraftPerformance(Model):
             if fill_with_groundspeed:
                 tas = self.source.segment_groundspeed()
                 self.source["true_airspeed"] = tas
-                return tas
+                return
             msg = (
                 "Cannot compute 'true_airspeed' without 'eastward_wind' and 'northward_wind' "
                 "met data. Either include met data in the model constructor, define "
@@ -545,7 +559,6 @@ class AircraftPerformance(Model):
 
         out = self.source.segment_true_airspeed(u, v)
         self.source["true_airspeed"] = out
-        return out
 
 
 @dataclasses.dataclass

pycontrails/core/models.py

@@ -543,7 +543,7 @@ class Model(ABC):
 
         See Also
         --------
-        - :meth:`eval`
+        eval
         """
         self.source = self._get_source(source)
 
@@ -706,17 +706,20 @@ class Model(ABC):
     # https://github.com/python/cpython/blob/618b7a8260bb40290d6551f24885931077309590/Lib/collections/__init__.py#L231
     __marker = object()
 
-    def get_source_param(self, key: str, default: Any = __marker, *, set_attr: bool = True) -> Any:
-        """Get source data with default set by parameter key.
+    def get_data_param(
+        self, other: SourceType, key: str, default: Any = __marker, *, set_attr: bool = True
+    ) -> Any:
+        """Get data from other source-compatible object with default set by model parameter key.
 
         Retrieves data with the following hierarchy:
 
-        1. :attr:`source.data[key]`. Returns ``np.ndarray | xr.DataArray``.
-        2. :attr:`source.attrs[key]`
+        1. :attr:`other.data[key]`. Returns ``np.ndarray | xr.DataArray``.
+        2. :attr:`other.attrs[key]`
         3. :attr:`params[key]`
         4. ``default``
 
-        In case 3., the value of :attr:`params[key]` is attached to :attr:`source.attrs[key]`.
+        In case 3., the value of :attr:`params[key]` is attached to :attr:`other.attrs[key]`
+        unless ``set_attr`` is set to False.
 
         Parameters
         ----------
@@ -731,31 +734,33 @@ class Model(ABC):
         Returns
         -------
         Any
-            Value(s) found for key in source data, source attrs, or model params
+            Value(s) found for key in ``other`` data, ``other`` attrs, or model params
 
         Raises
         ------
         KeyError
             Raises KeyError if key is not found in any location and ``default`` is not provided.
 
+
         See Also
         --------
-        - GeoVectorDataset.get_data_or_attr
+        get_source_param
+        pycontrails.core.vector.GeoVectorDataset.get_data_or_attr
         """
         marker = self.__marker
 
-        out = self.source.data.get(key, marker)
+        out = other.data.get(key, marker)
         if out is not marker:
             return out
 
-        out = self.source.attrs.get(key, marker)
+        out = other.attrs.get(key, marker)
         if out is not marker:
             return out
 
         out = self.params.get(key, marker)
         if out is not marker:
             if set_attr:
-                self.source.attrs[key] = out
+                other.attrs[key] = out
 
             return out
 
@@ -765,6 +770,46 @@ class Model(ABC):
         msg = f"Key '{key}' not found in source data, attrs, or model params"
         raise KeyError(msg)
 
+    def get_source_param(self, key: str, default: Any = __marker, *, set_attr: bool = True) -> Any:
+        """Get source data with default set by parameter key.
+
+        Retrieves data with the following hierarchy:
+
+        1. :attr:`source.data[key]`. Returns ``np.ndarray | xr.DataArray``.
+        2. :attr:`source.attrs[key]`
+        3. :attr:`params[key]`
+        4. ``default``
+
+        In case 3., the value of :attr:`params[key]` is attached to :attr:`source.attrs[key]`
+        unless ``set_attr`` is set to False.
+
+        Parameters
+        ----------
+        key : str
+            Key to retrieve
+        default : Any, optional
+            Default value if key is not found.
+        set_attr : bool, optional
+            If True (default), set :attr:`source.attrs[key]` to :attr:`params[key]` if found.
+            This allows for better post model evaluation tracking.
+
+        Returns
+        -------
+        Any
+            Value(s) found for key in source data, source attrs, or model params
+
+        Raises
+        ------
+        KeyError
+            Raises KeyError if key is not found in any location and ``default`` is not provided.
+
+        See Also
+        --------
+        get_data_param
+        pycontrails.core.vector.GeoVectorDataset.get_data_or_attr
+        """
+        return self.get_data_param(self.source, key, default, set_attr=set_attr)
+
     def _cleanup_indices(self) -> None:
         """Cleanup indices artifacts if ``params["interpolation_use_indices"]`` is True."""
         if self.params["interpolation_use_indices"] and isinstance(self.source, GeoVectorDataset):

pycontrails/datalib/goes.py

@@ -16,6 +16,7 @@ from __future__ import annotations
 
 import datetime
 import enum
+import os
 import tempfile
 from collections.abc import Iterable
 
@@ -58,6 +59,22 @@ DEFAULT_CHANNELS = "C11", "C14", "C15"
 #: See `GOES ABI scan information <https://www.goes-r.gov/users/abiScanModeInfo.html>`_.
 GOES_SCAN_MODE_CHANGE = datetime.datetime(2019, 4, 2, 16)
 
+#: The date at which GOES-19 data started being available. This is used to
+#: determine the source (GOES-16 or GOES-19) of requested. In particular,
+#: Mesoscale images are only available for GOES-East from GOES-19 after this date.
+#: See the `NOAA press release <https://www.noaa.gov/news-release/noaas-goes-19-satellite-now-operational-providing-critical-new-data-to-forecasters>`_.
+GOES_16_19_SWITCH_DATE = datetime.datetime(2025, 4, 4)
+
+#: The GCS bucket for GOES-East data before ``GOES_16_19_SWITCH_DATE``.
+GOES_16_BUCKET = "gcp-public-data-goes-16"
+
+#: The GCS bucket for GOES-West data. Note that GOES-17 has degraded data quality
+#: and is not recommended for use. This bucket isn't used by the ``GOES`` handler by default.
+GOES_18_BUCKET = "gcp-public-data-goes-18"
+
+#: The GCS bucket for GOES-East data after ``GOES_16_19_SWITCH_DATE``.
+GOES_19_BUCKET = "gcp-public-data-goes-19"
+
 
 class GOESRegion(enum.Enum):
     """GOES Region of interest.
@@ -186,7 +203,7 @@ def gcs_goes_path(
     time: datetime.datetime,
     region: GOESRegion,
     channels: str | Iterable[str] | None = None,
-    bucket: str = "gcp-public-data-goes-16",
+    bucket: str | None = None,
     fs: gcsfs.GCSFileSystem | None = None,
 ) -> list[str]:
     """Return GCS paths to GOES data at the given time for the given region and channels.
@@ -207,6 +224,12 @@ def gcs_goes_path(
         set ``channels=("C11", "C14", "C15")``. For the true color scheme,
         set ``channels=("C01", "C02", "C03")``. By default, the channels
         required by the SEVIRI ash color scheme are used.
+    bucket : str | None
+        GCS bucket for GOES data. If None, the bucket is automatically
+        set to ``GOES_16_BUCKET`` if ``time`` is before
+        ``GOES_16_19_SWITCH_DATE`` and ``GOES_19_BUCKET`` otherwise.
+    fs : gcsfs.GCSFileSystem | None
+        GCS file system instance. If None, a default anonymous instance is created.
 
     Returns
     -------
@@ -235,6 +258,11 @@ def gcs_goes_path(
     >>> pprint(paths)
     ['gcp-public-data-goes-16/ABI-L2-CMIPM/2023/093/02/OR_ABI-L2-CMIPM1-M6C01_G16_s20230930211249_e20230930211309_c20230930211386.nc']
 
+    >>> t = datetime.datetime(2025, 5, 4, 3, 2)
+    >>> paths = gcs_goes_path(t, GOESRegion.M2, channels="C01")
+    >>> pprint(paths)
+    ['gcp-public-data-goes-19/ABI-L2-CMIPM/2025/124/03/OR_ABI-L2-CMIPM2-M6C01_G19_s20251240302557_e20251240303014_c20251240303092.nc']
+
     """
     time = _check_time_resolution(time, region)
     year = time.strftime("%Y")
@@ -246,7 +274,10 @@ def gcs_goes_path(
     product_name = "CMIP"  # Cloud and Moisture Imagery
     product = f"{sensor}-{level}-{product_name}{region.name[0]}"
 
-    bucket = bucket.removeprefix("gs://")
+    if bucket is None:
+        bucket = GOES_16_BUCKET if time < GOES_16_19_SWITCH_DATE else GOES_19_BUCKET
+    else:
+        bucket = bucket.removeprefix("gs://")
 
     path_prefix = f"gs://{bucket}/{product}/{year}/{yday}/{hour}/"
 
@@ -266,7 +297,13 @@ def gcs_goes_path(
             time_str = f"{time_str[:-1]}6"
 
     name_prefix = f"OR_{product[:-1]}{region.name}-{mode}"
-    name_suffix = f"_G16_s{time_str}*"
+
+    try:
+        satellite_number = int(bucket[-2:])  # 16 or 18 or 19 -- this may fail for custom buckets
+    except (ValueError, IndexError) as exc:
+        msg = f"Bucket name {bucket} does not end with a valid satellite number."
+        raise ValueError(msg) from exc
+    name_suffix = f"_G{satellite_number}_s{time_str}*"
 
     channels = _parse_channels(channels)
 
@@ -322,8 +359,12 @@ class GOES:
     cachestore : cache.CacheStore | None
         Cache store for GOES data. If None, data is downloaded directly into
         memory. By default, a :class:`cache.DiskCacheStore` is used.
-    goes_bucket : str = "gcp-public-data-goes-16"
-        GCP bucket for GOES data. AWS access is not supported.
+    goes_bucket : str | None = None
+        GCP bucket for GOES data. If None, the bucket is automatically
+        set to ``GOES_16_BUCKET`` if the requested time is before
+        ``GOES_16_19_SWITCH_DATE`` and ``GOES_19_BUCKET`` otherwise.
+        The satellite number used for filename construction is derived from the
+        last two characters of this bucket name.
 
     See Also
     --------
@@ -395,7 +436,7 @@ class GOES:
         region: GOESRegion | str = GOESRegion.F,
         channels: str | Iterable[str] | None = None,
         cachestore: cache.CacheStore | None = __marker,  # type: ignore[assignment]
-        goes_bucket: str = "gcp-public-data-goes-16",
+        goes_bucket: str | None = None,
     ) -> None:
         self.region = _parse_region(region)
         self.channels = _parse_channels(channels)
@@ -434,7 +475,7 @@ class GOES:
             List of GCS paths to GOES data.
         """
         channels = channels or self.channels
-        return gcs_goes_path(time, self.region, channels, self.goes_bucket)
+        return gcs_goes_path(time, self.region, channels, bucket=self.goes_bucket, fs=self.fs)
 
     def _lpaths(self, time: datetime.datetime) -> dict[str, str]:
         """Construct names for local netcdf files using the :attr:`cachestore`.
@@ -566,9 +607,12 @@ class GOES:
 
 def _load_via_tempfile(data: bytes) -> xr.Dataset:
     """Load xarray dataset via temporary file."""
-    with tempfile.NamedTemporaryFile(buffering=0) as tmp:
+    with tempfile.NamedTemporaryFile(delete=False) as tmp:
         tmp.write(data)
+    try:
         return xr.load_dataset(tmp.name)
+    finally:
+        os.remove(tmp.name)
 
 
 def _concat_c02(ds1: XArrayType, ds2: XArrayType) -> XArrayType:
@@ -660,6 +704,10 @@ def to_true_color(da: xr.DataArray, gamma: float = 2.2) -> npt.NDArray[np.float3
     ----------
     - `Unidata's true color recipe <https://unidata.github.io/python-gallery/examples/mapping_GOES16_TrueColor.html>`_
     """
+    if not np.all(np.isin([1, 2, 3], da["band_id"])):
+        msg = "DataArray must contain bands 1, 2, and 3 for true color"
+        raise ValueError(msg)
+
     red = da.sel(band_id=2).values
     green = da.sel(band_id=3).values
     blue = da.sel(band_id=1).values
@@ -716,6 +764,9 @@ def to_ash(da: xr.DataArray, convention: str = "SEVIRI") -> npt.NDArray[np.float
     array([0.0127004 , 0.22793579, 0.3930847 ], dtype=float32)
     """
     if convention == "standard":
+        if not np.all(np.isin([11, 13, 14, 15], da["band_id"])):
+            msg = "DataArray must contain bands 11, 13, 14, and 15 for standard ash"
+            raise ValueError(msg)
         c11 = da.sel(band_id=11).values  # 8.44
         c13 = da.sel(band_id=13).values  # 10.33
         c14 = da.sel(band_id=14).values  # 11.19
@@ -725,7 +776,10 @@ def to_ash(da: xr.DataArray, convention: str = "SEVIRI") -> npt.NDArray[np.float
         green = c14 - c11
         blue = c13
 
-    elif convention in ["SEVIRI", "MIT"]:  # retain MIT for backwards compatibility
+    elif convention in ("SEVIRI", "MIT"):  # retain MIT for backwards compatibility
+        if not np.all(np.isin([11, 14, 15], da["band_id"])):
+            msg = "DataArray must contain bands 11, 14, and 15 for SEVIRI ash"
+            raise ValueError(msg)
         c11 = da.sel(band_id=11).values  # 8.44
         c14 = da.sel(band_id=14).values  # 11.19
         c15 = da.sel(band_id=15).values  # 12.27
@@ -770,3 +824,133 @@ def _clip_and_scale(
         Clipped and scaled array.
     """
     return (arr.clip(low, high) - low) / (high - low)
+
+
+def parallax_correct(
+    longitude: npt.NDArray[np.floating],
+    latitude: npt.NDArray[np.floating],
+    altitude: npt.NDArray[np.floating],
+    goes_da: xr.DataArray,
+) -> tuple[npt.NDArray[np.floating], npt.NDArray[np.floating]]:
+    r"""Apply parallax correction to WGS84 geodetic coordinates based on satellite perspective.
+
+    This function considers the ray from the satellite to the points of interest and finds
+    the intersection of this ray with the WGS84 ellipsoid. The intersection point is then
+    returned as the corrected longitude and latitude coordinates.
+
+    ::
+
+       @ satellite
+        \
+         \
+          \
+           \
+            \
+             * aircraft
+              \
+               \
+                x parallax corrected aircraft
+        -------------------------  surface
+
+    If the point of interest is not visible from the satellite (ie, on the opposite side of the
+    earth), the function returns nan for the corrected coordinates.
+
+    This function requires the :mod:`pyproj` package to be installed.
+
+    Parameters
+    ----------
+    longitude : npt.NDArray[np.floating]
+        A 1D array of longitudes in degrees.
+    latitude : npt.NDArray[np.floating]
+        A 1D array of latitudes in degrees.
+    altitude : npt.NDArray[np.floating]
+        A 1D array of altitudes in meters.
+    goes_da : xr.DataArray
+        DataArray containing the GOES projection information. Only the ``goes_imager_projection``
+        field of the :attr:`xr.DataArray.attrs` is used.
+
+    Returns
+    -------
+    tuple[npt.NDArray[np.floating], npt.NDArray[np.floating]]
+        A tuple containing the corrected longitude and latitude coordinates.
+
+    """
+    goes_imager_projection = goes_da.attrs["goes_imager_projection"]
+    sat_lon = goes_imager_projection["longitude_of_projection_origin"]
+    sat_lat = goes_imager_projection["latitude_of_projection_origin"]
+    sat_alt = goes_imager_projection["perspective_point_height"]
+
+    try:
+        import pyproj
+    except ModuleNotFoundError as exc:
+        dependencies.raise_module_not_found_error(
+            name="parallax_correct function",
+            package_name="pyproj",
+            module_not_found_error=exc,
+            pycontrails_optional_package="pyproj",
+        )
+
+    # Convert from WGS84 to ECEF coordinates
+    ecef_crs = pyproj.CRS("EPSG:4978")
+    transformer = pyproj.Transformer.from_crs("WGS84", ecef_crs, always_xy=True)
+
+    p0 = np.array(transformer.transform([sat_lon], [sat_lat], [sat_alt]))
+    p1 = np.array(transformer.transform(longitude, latitude, altitude))
+
+    # Major and minor axes of the ellipsoid
+    a = ecef_crs.ellipsoid.semi_major_metre  # type: ignore[union-attr]
+    b = ecef_crs.ellipsoid.semi_minor_metre  # type: ignore[union-attr]
+    intersection = _intersection_with_ellipsoid(p0, p1, a, b)
+
+    # Convert back to WGS84 coordinates
+    inv_transformer = pyproj.Transformer.from_crs(ecef_crs, "WGS84", always_xy=True)
+    return inv_transformer.transform(*intersection)[:2]  # final coord is (close to) 0
+
+
+def _intersection_with_ellipsoid(
+    p0: npt.NDArray[np.floating],
+    p1: npt.NDArray[np.floating],
+    a: float,
+    b: float,
+) -> npt.NDArray[np.floating]:
+    """Find the intersection of a line with the surface of an ellipsoid."""
+    # Calculate the direction vector
+    px, py, pz = p0
+    v = p1 - p0
+    vx, vy, vz = v
+
+    # The line between p0 and p1 in parametric form is p(t) = p0 + t * v
+    # We need to find t such that p(t) lies on the ellipsoid
+    # x^2 / a^2 + y^2 / a^2 + z^2 / b^2 = 1
+    # (px + t * vx)^2 / a^2 + (py + t * vy)^2 / a^2 + (pz + t * vz)^2 / b^2 = 1
+    # Rearranging gives a quadratic in t
+
+    # Calculate the coefficients of this quadratic equation
+    A = vx**2 / a**2 + vy**2 / a**2 + vz**2 / b**2
+    B = 2 * (px * vx / a**2 + py * vy / a**2 + pz * vz / b**2)
+    C = px**2 / a**2 + py**2 / a**2 + pz**2 / b**2 - 1.0
+
+    # Calculate the discriminant
+    D = B**2 - 4 * A * C
+    sqrtD = np.sqrt(D, where=D >= 0, out=np.full_like(D, np.nan))
+
+    # Calculate the two possible solutions for t
+    t0 = (-B + sqrtD) / (2.0 * A)
+    t1 = (-B - sqrtD) / (2.0 * A)
+
+    # Calculate the intersection points
+    intersection0 = p0 + t0 * v
+    intersection1 = p0 + t1 * v
+
+    # Pick the intersection point that is closer to the aircraft (p1)
+    d0 = np.linalg.norm(intersection0 - p1, axis=0)
+    d1 = np.linalg.norm(intersection1 - p1, axis=0)
+    out = np.where(d0 < d1, intersection0, intersection1)
+
+    # Fill the points in which the aircraft is not visible by the satellite with nan
+    # This occurs when the earth is between the satellite and the aircraft
+    # In other words, we can check for t0 < 1 (or t1 < 1)
+    opposite_side = t0 < 1.0
+    out[:, opposite_side] = np.nan
+
+    return out

pycontrails/ext/synthetic_flight.py

@@ -207,7 +207,7 @@ class SyntheticFlight:
 
     def _id(self) -> int:
         """Get random flight ID."""
-        return self.rng.integers(100_000, 999_999)
+        return self.rng.integers(100_000, 999_999).item()
 
     def _define_aircraft(self) -> None:
         """Define or update instance variables pertaining to flight aircrafts.

pycontrails/models/dry_advection.py

@@ -217,6 +217,8 @@ class DryAdvection(models.Model):
         - ``age``: Age of plume.
         - ``waypoint``: Identifier for each waypoint.
 
+        If ``flight_id`` is present in :attr:`source`, it is retained.
+
         If `"azimuth"` is present in :attr:`source`, `source.attrs`, or :attr:`params`,
         the following variables will also be added:
 
@@ -236,6 +238,9 @@ class DryAdvection(models.Model):
         self.source.setdefault("waypoint", np.arange(self.source.size))
 
         columns = ["longitude", "latitude", "level", "time", "age", "waypoint"]
+        if "flight_id" in self.source:
+            columns.append("flight_id")
+
         azimuth = self.get_source_param("azimuth", set_attr=False)
         if azimuth is None:
             # Early exit for pointwise only simulation
@@ -541,6 +546,10 @@ def _evolve_one_step(
         }
     )
 
+    flight_id = vector.get("flight_id")
+    if flight_id is not None:
+        out["flight_id"] = flight_id
+
     azimuth = vector.get("azimuth")
     if azimuth is None:
         # Early exit for "pointwise only" simulation

pycontrails/models/ps_model/ps_model.py

@@ -27,7 +27,6 @@ from pycontrails.core.aircraft_performance import (
 )
 from pycontrails.core.flight import Flight
 from pycontrails.core.met import MetDataset
-from pycontrails.core.met_var import AirTemperature, EastwardWind, MetVariable, NorthwardWind
 from pycontrails.models.ps_model import ps_operational_limits as ps_lims
 from pycontrails.models.ps_model.ps_aircraft_params import (
     PSAircraftEngineParams,
@@ -70,8 +69,6 @@ class PSFlight(AircraftPerformance):
 
     name = "PSFlight"
     long_name = "Poll-Schumann Aircraft Performance Model"
-    met_variables: tuple[MetVariable, ...] = (AirTemperature,)
-    optional_met_variables = EastwardWind, NorthwardWind
     default_params = PSFlightParams
 
     aircraft_engine_params: Mapping[str, PSAircraftEngineParams]
@@ -160,10 +157,10 @@ class PSFlight(AircraftPerformance):
             time=fl["time"],
             true_airspeed=true_airspeed,
             air_temperature=fl["air_temperature"],
-            aircraft_mass=self.get_source_param("aircraft_mass", None),
-            thrust=self.get_source_param("thrust", None),
-            engine_efficiency=self.get_source_param("engine_efficiency", None),
-            fuel_flow=self.get_source_param("fuel_flow", None),
+            aircraft_mass=self.get_data_param(fl, "aircraft_mass", None),
+            thrust=self.get_data_param(fl, "thrust", None),
+            engine_efficiency=self.get_data_param(fl, "engine_efficiency", None),
+            fuel_flow=self.get_data_param(fl, "fuel_flow", None),
             q_fuel=q_fuel,
             n_iter=self.params["n_iter"],
             amass_oew=amass_oew,

{pycontrails-0.54.8.dist-info → pycontrails-0.54.10.dist-info}/METADATA

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

{pycontrails-0.54.8.dist-info → pycontrails-0.54.10.dist-info}/RECORD

@@ -1,14 +1,14 @@
-pycontrails-0.54.8.dist-info/RECORD,,
-pycontrails-0.54.8.dist-info/WHEEL,sha256=D5oYZcu7xsHPQ1lvRcEfimRZkYr_RmvD7J5S2QmS8s0,138
-pycontrails-0.54.8.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
-pycontrails-0.54.8.dist-info/METADATA,sha256=RmMykD8fNfp0FkT9-7ZQKcrfKNVtrfQYj9WKJGdRMqM,9131
-pycontrails-0.54.8.dist-info/licenses/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
-pycontrails-0.54.8.dist-info/licenses/NOTICE,sha256=fiBPdjYibMpDzf8hqcn7TvAQ-yeK10q_Nqq24DnskYg,1962
-pycontrails/_version.py,sha256=toc4afFEmuid8E3AkMqVXqnNfmxWW94KE_GHaPTt9lg,513
+pycontrails-0.54.10.dist-info/RECORD,,
+pycontrails-0.54.10.dist-info/WHEEL,sha256=7serL2wuoHsjl6sqYTxAO9RZ3KPeoUy7VZm2_MBalZ8,138
+pycontrails-0.54.10.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
+pycontrails-0.54.10.dist-info/METADATA,sha256=6_jv8g-Jc_JE5J9qHUY3iv9S2ZrggE_4zOg-7nbtJ98,9132
+pycontrails-0.54.10.dist-info/licenses/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
+pycontrails-0.54.10.dist-info/licenses/NOTICE,sha256=fiBPdjYibMpDzf8hqcn7TvAQ-yeK10q_Nqq24DnskYg,1962
+pycontrails/_version.py,sha256=XWNQstht0_G88RBCuMbHwa-c0eQNLQAijV1bVbgzzW8,515
 pycontrails/__init__.py,sha256=9ypSB2fKZlKghTvSrjWo6OHm5qfASwiTIvlMew3Olu4,2037
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycontrails/core/vector.py,sha256=N-3VhPaUEyFSJWjplMKFcv9GLvEqAibKn1zqJWuNZQU,73601
-pycontrails/core/models.py,sha256=iuGy9pQU-OI-AqPQyROxshSn2LbLcKNjXQcMEZw2IzA,42340
+pycontrails/core/models.py,sha256=gpG0hnXZox5caojierunxKkgFLQt-6nHRhzQZJKNrzo,43845
 pycontrails/core/interpolation.py,sha256=wovjj3TAf3xonVxjarclpvZLyLq6N7wZQQXsI9hT3YA,25713
 pycontrails/core/fleet.py,sha256=0hi_N4R93St-7iD29SE0EnadpBEl_p9lSGtDwpWvGkk,16704
 pycontrails/core/flight.py,sha256=QZTGeZVnZ14UUWHSqgCSU49g_EGQZel-hzKwm_9dcFY,80653
@@ -16,14 +16,14 @@ pycontrails/core/fuel.py,sha256=kJZ3P1lPm1L6rdPREM55XQ-VfJ_pt35cP4sO2Nnvmjs,4332
 pycontrails/core/polygon.py,sha256=EmfHPj0e58whsHvR-3YvDgMWkvMFgp_BgwaoG8IZ4n0,18044
 pycontrails/core/cache.py,sha256=IIyx726zN7JzNSKV0JJDksMI9OhCLdnJShmBVStRqzI,28154
 pycontrails/core/__init__.py,sha256=p0O09HxdeXU0X5Z3zrHMlTfXa92YumT3fJ8wJBI5ido,856
-pycontrails/core/rgi_cython.cpython-313-darwin.so,sha256=rDVTDKQiRog8OqjwwwEqDOcXEoKh0FWbvwGKfwztAWs,308768
+pycontrails/core/rgi_cython.cpython-313-darwin.so,sha256=LBb1akRp3WQ9HrkFKhXZ1suhpQgT0Rhs9YJoswxXY2Q,302408
 pycontrails/core/flightplan.py,sha256=xgyYLi36OlNKtIFuOHaifcDM6XMBYTyMQlXAtfd-6Js,7519
 pycontrails/core/met.py,sha256=4XQAJrKWBN0SZQSeBpMUnkLn87vYpn2VMiY3dQyFRIw,103992
-pycontrails/core/aircraft_performance.py,sha256=ww5YBZkCPiUxRZERI5bUmxBeiF6rIrS2AsZyv8mVjvE,27400
+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/coordinates.py,sha256=0ySsHtqTon7GMbuwmmxMbI92j3ueMteJZh4xxNm5zto,5391
-pycontrails/datalib/goes.py,sha256=mCEuDYdt1GIBA-sbDq5LdC6ZRvWJ28uaaBTnsXE4syc,26555
+pycontrails/datalib/goes.py,sha256=4bKtu1l3IVsjKv7mLAWhStRzOVaY9Wi_cZxvL_g-V3w,34081
 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
@@ -48,7 +48,7 @@ pycontrails/datalib/gfs/__init__.py,sha256=pXNjb9cJC6ngpuCnoHnmVZ2RHzbHZ0AlsyGvg
 pycontrails/datalib/spire/spire.py,sha256=h25BVgSr7E71Ox3-y9WgqFvp-54L08yzb2Ou-iMl7wM,24242
 pycontrails/datalib/spire/__init__.py,sha256=3-My8yQItS6PL0DqXgNaltLqvN6T7nbnNnLD-sy7kt4,186
 pycontrails/datalib/spire/exceptions.py,sha256=U0V_nZTLhxJwrzldvU9PdESx8-zLddRH3FmzkJyFyrI,1714
-pycontrails/ext/synthetic_flight.py,sha256=ByuJDfpuK5WaGMj41wflfzH6zwI1nejVcQXC4JoMvSI,16795
+pycontrails/ext/synthetic_flight.py,sha256=wROBQErfr_IhEPndC97fuWbnZQega2Z89VhzoXzZMO8,16802
 pycontrails/ext/cirium.py,sha256=DFPfRwLDwddpucAPRQhyT4bDGh0VvvoViMUd3pidam8,415
 pycontrails/ext/empirical_grid.py,sha256=FPNQA0x4nVwBXFlbs3DgIapSrXFYhoc8b8IX0M4xhBc,4363
 pycontrails/ext/bada.py,sha256=YlQq4nnFyWza1Am2e2ZucpaICHDuUFRTrtVzIKMzf9s,1091
@@ -64,7 +64,7 @@ pycontrails/models/__init__.py,sha256=dQTOLQb7RdUdUwslt5se__5y_ymbInBexQmNrmAeOd
 pycontrails/models/issr.py,sha256=AYLYLHxtG8je5UG6x1zLV0ul89MJPqe5Xk0oWIyZ7b0,7378
 pycontrails/models/sac.py,sha256=lV1Or0AaLxuS1Zo5V8h5c1fkSKC-hKEgiFm7bmmusWw,15946
 pycontrails/models/accf.py,sha256=egdBa4_G3BUaoUQYWvVlTlAIWpLEuNdtCxlK3eckLOc,13599
-pycontrails/models/dry_advection.py,sha256=FqUvRFbnwe4esHBYDayn3iu7R2UUuaQwY8x2oToxNI0,19164
+pycontrails/models/dry_advection.py,sha256=BlOQeap3rXKRhRlvhFfpOLIX3bFgYE_bJg2LlPRHIas,19424
 pycontrails/models/pcr.py,sha256=ZzbEuTOuDdUmmL5T3Wk3HL-O8XzX3HMnn98WcPbASaU,5348
 pycontrails/models/emissions/__init__.py,sha256=CZB2zIkLUI3NGNmq2ddvRYjEtiboY6PWJjiEiXj_zII,478
 pycontrails/models/emissions/ffm2.py,sha256=mAvBHnp-p3hIn2fjKGq50eaMHi0jcb5hA5uXbJGeE9I,12068
@@ -94,7 +94,7 @@ pycontrails/models/cocip/radiative_heating.py,sha256=1U4SQWwogtyQ2u6J996kAHP0Ofp
 pycontrails/models/cocip/contrail_properties.py,sha256=qdvFykCYBee17G1jDklzyoeYWDMzoOXCP-A6p9P_4sE,56053
 pycontrails/models/cocip/unterstrasser_wake_vortex.py,sha256=edMHuWKzFN1P4EMWC2HRv5ZS_rUI7Q5Nw3LsYkrI0mE,18936
 pycontrails/models/ps_model/__init__.py,sha256=Fuum5Rq8ya8qkvbeq2wh6NDo-42RCRnK1Y-2syYy0Ck,553
-pycontrails/models/ps_model/ps_model.py,sha256=U_xWn1b5CxmatvRSuGegfI-ANXscYq2s_7IROyK1p84,32131
+pycontrails/models/ps_model/ps_model.py,sha256=fgFekJpGuAu73KvpfLhlAbIwR7JJGwQpLILWmrONywc,31925
 pycontrails/models/ps_model/ps_aircraft_params.py,sha256=I2nBkdnRo9YGMn-0k35ooYpzPNJkHyEH5cU3K-Cz8b0,13350
 pycontrails/models/ps_model/ps_operational_limits.py,sha256=XwMHO8yu8EZUWtxRgjRKwxmCrmKGoHO7Ob6nlfkrthI,16441
 pycontrails/models/ps_model/ps_grid.py,sha256=rBsCEQkGY4cTf57spF0sqCfOo4oC4auE8ngS_mcl0VM,26207

{pycontrails-0.54.8.dist-info → pycontrails-0.54.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.1.0)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: false
 Tag: cp313-cp313-macosx_10_13_x86_64
 Generator: delocate 0.13.0