pycontrails 0.54.0__cp310-cp310-macosx_10_9_x86_64.whl → 0.54.1__cp310-cp310-macosx_10_9_x86_64.whl

pycontrails/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.54.0'
-__version_tuple__ = version_tuple = (0, 54, 0)
+__version__ = version = '0.54.1'
+__version_tuple__ = version_tuple = (0, 54, 1)

pycontrails/core/aircraft_performance.py

@@ -12,6 +12,7 @@ import numpy.typing as npt
 from overrides import overrides
 
 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.models import Model, ModelParams, interpolate_met
@@ -76,6 +77,10 @@ class AircraftPerformance(Model):
 
     source: Flight
 
+    @abc.abstractmethod
+    @overload
+    def eval(self, source: Fleet, **params: Any) -> Fleet: ...
+
     @abc.abstractmethod
     @overload
     def eval(self, source: Flight, **params: Any) -> Flight: ...
@@ -467,10 +472,11 @@ class AircraftPerformance(Model):
             tas[cond] = self.source.segment_groundspeed()[cond]
             return tas
 
-        met_incomplete = (
-            self.met is None or "eastward_wind" not in self.met or "northward_wind" not in self.met
+        wind_available = ("eastward_wind" in self.source and "northward_wind" in self.source) or (
+            self.met is not None and "eastward_wind" in self.met and "northward_wind" in self.met
         )
-        if met_incomplete:
+
+        if not wind_available:
             if fill_with_groundspeed:
                 tas = self.source.segment_groundspeed()
                 self.source["true_airspeed"] = tas

pycontrails/core/fleet.py

@@ -196,17 +196,15 @@ class Fleet(Flight):
 
         fl_attrs: dict[str, Any] = {}
 
-        # Pluck from the first flight to get fuel, data_keys, and crs
+        # Pluck from the first flight to get fuel and data_keys
         fuel = seq[0].fuel
         data_keys = set(seq[0])  # convert to a new instance to because we mutate seq[0]
-        crs = seq[0].attrs["crs"]
 
         for fl in seq:
             _validate_fl(
                 fl,
                 fl_attrs=fl_attrs,
                 data_keys=data_keys,
-                crs=crs,
                 fuel=fuel,
                 broadcast_numeric=broadcast_numeric,
             )
@@ -318,10 +316,9 @@ class Fleet(Flight):
 
     @overrides
     def segment_groundspeed(self, *args: Any, **kwargs: Any) -> npt.NDArray[np.float64]:
-        # Implement if we have a usecase for this.
-        # Because the super() method uses a smoothing pattern, it will not reliably
-        # work on Fleet.
-        raise NotImplementedError
+        fls = self.to_flight_list(copy=False)
+        gs = [fl.segment_groundspeed(*args, **kwargs) for fl in fls]
+        return np.concatenate(gs)
 
     @overrides
     def resample_and_fill(self, *args: Any, **kwargs: Any) -> Fleet:
@@ -336,10 +333,6 @@ class Fleet(Flight):
     @property
     @overrides
     def max_distance_gap(self) -> float:
-        if self.attrs["crs"] != "EPSG:4326":
-            msg = "Only implemented for EPSG:4326 CRS."
-            raise NotImplementedError(msg)
-
         return np.nanmax(self.segment_length()).item()
 
     @overrides
@@ -400,7 +393,6 @@ def _validate_fl(
     *,
     fl_attrs: dict[str, Any],
     data_keys: set[str],
-    crs: str,
     fuel: Fuel,
     broadcast_numeric: bool,
 ) -> None:
@@ -419,8 +411,6 @@ def _validate_fl(
         Set of data keys expected in each flight.
     fuel : Fuel
         Fuel used all flights
-    crs : str
-        CRS to use all flights
     broadcast_numeric : bool
         If True, broadcast numeric attributes to data variables.
 
@@ -429,7 +419,7 @@ def _validate_fl(
     KeyError
         ``fl`` does not have a ``flight_id`` key in :attr:`attrs`.
     ValueError
-        If ``flight_id`` is duplicated or incompatible CRS found.
+        If ``flight_id`` is duplicated or if ``fuel`` or ``data_keys`` are inconsistent.
     """
     flight_id = _extract_flight_id(fl)
 
@@ -446,13 +436,6 @@ def _validate_fl(
             "The 'fuel' attributes must be consistent between flights in a Fleet."
         )
         raise ValueError(msg)
-    if fl.attrs["crs"] != crs:
-        msg = (
-            f"CRS on Flight {flight_id} ({fl.attrs['crs']}) "
-            f"is not inconsistent with previous flights ({crs}). "
-            "The 'crs' attributes must be consistent between flights in a Fleet."
-        )
-        raise ValueError(msg)
     if fl.data.keys() != data_keys:
         msg = (
             f"Data keys on Flight {flight_id} ({fl.data.keys()}) "

pycontrails/core/flight.py

@@ -75,9 +75,6 @@ class Flight(GeoVectorDataset):
     Expect altitude in [:math:`m`].
     Expect pressure level (`level`) in [:math:`hPa`].
 
-    Use the attribute :attr:`attrs["crs"]` to specify coordinate reference system
-    using `PROJ <https://proj.org/>`_ or `EPSG <https://epsg.org/home.html>`_ syntax.
-
     Parameters
     ----------
     data : dict[str, np.ndarray] | pd.DataFrame | VectorDataDict | VectorDataset | None
@@ -159,7 +156,7 @@ class Flight(GeoVectorDataset):
     ... })
     >>> fl = Flight(data=df, flight_id=123)  # specify a flight_id by keyword
     >>> fl
-    Flight [4 keys x 500 length, 2 attributes]
+    Flight [4 keys x 500 length, 1 attributes]
     Keys: longitude, latitude, altitude, time
     Attributes:
     time                [2021-01-01 10:00:00, 2021-01-01 15:00:00]
@@ -167,7 +164,6 @@ class Flight(GeoVectorDataset):
     latitude            [10.0, 40.0]
     altitude            [10500.0, 10500.0]
     flight_id           123
-    crs                 EPSG:4326
 
     >>> # Create `Flight` from keywords
     >>> fl = Flight(
@@ -177,14 +173,13 @@ class Flight(GeoVectorDataset):
     ...     time=pd.date_range('2021-01-01T12', '2021-01-01T14', periods=200),
     ... )
     >>> fl
-    Flight [4 keys x 200 length, 1 attributes]
+    Flight [4 keys x 200 length, 0 attributes]
         Keys: longitude, latitude, time, altitude
         Attributes:
         time                [2021-01-01 12:00:00, 2021-01-01 14:00:00]
         longitude           [20.0, 30.0]
         latitude            [30.0, 40.0]
         altitude            [11000.0, 11000.0]
-        crs                 EPSG:4326
 
     >>> # Access the underlying data as DataFrame
     >>> fl.dataframe.head()
@@ -369,11 +364,6 @@ class Flight(GeoVectorDataset):
         float
             Maximum distance between waypoints, [:math:`m`]
 
-        Raises
-        ------
-        NotImplementedError
-            Raises when attr:`attrs["crs"]` is not EPSG:4326
-
         Examples
         --------
         >>> import numpy as np
@@ -386,9 +376,6 @@ class Flight(GeoVectorDataset):
         >>> fl.max_distance_gap
         np.float64(7391.27...)
         """
-        if self.attrs["crs"] != "EPSG:4326":
-            raise NotImplementedError("Only implemented for EPSG:4326 CRS.")
-
         return self.segment_length()[:-1].max()
 
     @property
@@ -400,11 +387,6 @@ class Flight(GeoVectorDataset):
         float
             Total flight length, [:math:`m`]
 
-        Raises
-        ------
-        NotImplementedError
-            Raises when attr:`attrs["crs"]` is not EPSG:4326
-
         Examples
         --------
         >>> import numpy as np
@@ -417,9 +399,6 @@ class Flight(GeoVectorDataset):
         >>> fl.length
         np.float64(1436924.67...)
         """
-        if self.attrs["crs"] != "EPSG:4326":
-            raise NotImplementedError("Only implemented for EPSG:4326 CRS.")
-
         # drop off the nan
         return np.nansum(self.segment_length()[:-1])
 
@@ -461,11 +440,6 @@ class Flight(GeoVectorDataset):
         npt.NDArray[np.float64]
             Array of great circle distances in [:math:`m`] between waypoints
 
-        Raises
-        ------
-        NotImplementedError
-            Raises when attr:`attrs["crs"]` is not EPSG:4326
-
         Examples
         --------
         >>> from pycontrails import Flight
@@ -484,9 +458,6 @@ class Flight(GeoVectorDataset):
         :func:`segment_haversine`
         :meth:`segment_length`
         """
-        if self.attrs["crs"] != "EPSG:4326":
-            raise NotImplementedError("Only implemented for EPSG:4326 CRS.")
-
         return geo.segment_haversine(self["longitude"], self["latitude"])
 
     def segment_length(self) -> npt.NDArray[np.float64]:
@@ -500,11 +471,6 @@ class Flight(GeoVectorDataset):
         npt.NDArray[np.float64]
             Array of distances in [:math:`m`] between waypoints
 
-        Raises
-        ------
-        NotImplementedError
-            Raises when attr:`attrs["crs"]` is not EPSG:4326
-
         Examples
         --------
         >>> from pycontrails import Flight
@@ -522,9 +488,6 @@ class Flight(GeoVectorDataset):
         --------
         :func:`segment_length`
         """
-        if self.attrs["crs"] != "EPSG:4326":
-            raise NotImplementedError("Only implemented for EPSG:4326 CRS.")
-
         return geo.segment_length(self["longitude"], self["latitude"], self.altitude)
 
     def segment_angle(self) -> tuple[npt.NDArray[np.float64], npt.NDArray[np.float64]]:
@@ -1304,15 +1267,7 @@ class Flight(GeoVectorDataset):
         pd.DataFrame | None
             Generated waypoints to be merged into underlying :attr:`data`.
             Return `None` if no new waypoints are created.
-
-        Raises
-        ------
-        NotImplementedError
-            Raises when attr:`attrs["crs"]` is not EPSG:4326
         """
-        if self.attrs["crs"] != "EPSG:4326":
-            raise NotImplementedError("Only implemented for EPSG:4326 CRS.")
-
         # Omit the final nan and ensure index + 1 (below) is well defined
         segs = self.segment_haversine()[:-1]
 
@@ -1431,7 +1386,7 @@ class Flight(GeoVectorDataset):
         if key is not None and key not in self.dataframe.columns:
             raise KeyError(f"Column {key} does not exist in data.")
 
-        jump_indices = _antimeridian_index(pd.Series(self["longitude"]), self.attrs["crs"])
+        jump_indices = _antimeridian_index(pd.Series(self["longitude"]))
 
         def _group_to_feature(group: pd.DataFrame) -> dict[str, str | dict[str, Any]]:
             # assigns a different value to each group of consecutive indices
@@ -1515,8 +1470,6 @@ class Flight(GeoVectorDataset):
         ------
         KeyError
             :attr:`data` does not contain column ``key``
-        NotImplementedError
-            Raised when ``attrs["crs"]`` is not EPSG:4326
 
         Examples
         --------
@@ -1557,8 +1510,6 @@ class Flight(GeoVectorDataset):
         """
         if key not in self.data:
             raise KeyError(f"Column {key} does not exist in data.")
-        if self.attrs["crs"] != "EPSG:4326":
-            raise NotImplementedError("Only implemented for EPSG:4326 CRS.")
 
         # The column of interest may contain floating point values less than 1.
         # In this case, if the default threshold is not changed, warn the user that the behavior
@@ -1668,40 +1619,23 @@ def _return_linestring(data: dict[str, npt.NDArray[np.float64]]) -> list[list[fl
     return [list(p) for p in points]
 
 
-def _antimeridian_index(longitude: pd.Series, crs: str = "EPSG:4326") -> list[int]:
+def _antimeridian_index(longitude: pd.Series) -> list[int]:
     """Return indices after flight crosses antimeridian, or an empty list if flight does not cross.
 
+    This function assumes EPSG:4326 coordinates.
+
     Parameters
     ----------
     longitude : pd.Series
         longitude values with an integer index
-    crs : str, optional
-        Coordinate Reference system for longitude specified in EPSG format.
-        Currently only supports "EPSG:4326" and "EPSG:3857".
 
     Returns
     -------
     list[int]
         Indices after jump, or empty list of flight does not cross antimeridian.
-
-    Raises
-    ------
-    ValueError
-        CRS is not supported.
     """
-    # WGS84
-    if crs in ["EPSG:4326"]:
-        l1 = (-180.0, -90.0)
-        l2 = (90.0, 180.0)
-
-    # pseudo mercator
-    elif crs in ["EPSG:3857"]:
-        # values calculated through pyproj.Transformer
-        l1 = (-20037508.342789244, -10018754.171394622)
-        l2 = (10018754.171394622, 20037508.342789244)
-
-    else:
-        raise ValueError("CRS must be one of EPSG:4326 or EPSG:3857")
+    l1 = (-180.0, -90.0)
+    l2 = (90.0, 180.0)
 
     # TODO: When nans exist, this method *may* not find the meridian
     if np.any(np.isnan(longitude)):
@@ -1711,9 +1645,7 @@ def _antimeridian_index(longitude: pd.Series, crs: str = "EPSG:4326") -> list[in
     s2 = longitude.between(*l2)
     jump12 = longitude[s1 & s2.shift()]
     jump21 = longitude[s1.shift() & s2]
-    jump_index = pd.concat([jump12, jump21]).index.to_list()
-
-    return jump_index
+    return pd.concat([jump12, jump21]).index.to_list()
 
 
 def _sg_filter(

pycontrails/core/met.py

@@ -70,7 +70,7 @@ class MetBase(ABC, Generic[XArrayType]):
     cachestore: CacheStore | None
 
     #: Default dimension order for DataArray or Dataset (x, y, z, t)
-    dim_order: tuple[Hashable, Hashable, Hashable, Hashable] = (
+    dim_order = (
         "longitude",
         "latitude",
         "level",
@@ -97,17 +97,18 @@ class MetBase(ABC, Generic[XArrayType]):
         ValueError
             If data does not contain all four coordinates (longitude, latitude, level, time).
         """
-        for dim in self.dim_order:
-            if dim not in self.data.dims:
-                if dim == "level":
-                    msg = (
-                        f"Meteorology data must contain dimension '{dim}'. "
-                        "For single level data, set 'level' coordinate to constant -1 "
-                        "using `ds = ds.expand_dims({'level': [-1]})`"
-                    )
-                else:
-                    msg = f"Meteorology data must contain dimension '{dim}'."
-                raise ValueError(msg)
+        missing = set(self.dim_order).difference(self.data.dims)
+        if not missing:
+            return
+
+        dim = sorted(missing)
+        msg = f"Meteorology data must contain dimension(s): {dim}."
+        if "level" in dim:
+            msg += (
+                " For single level data, set 'level' coordinate to constant -1 "
+                "using `ds = ds.expand_dims({'level': [-1]})`"
+            )
+        raise ValueError(msg)
 
     def _validate_longitude(self) -> None:
         """Check longitude bounds.
@@ -123,8 +124,8 @@ class MetBase(ABC, Generic[XArrayType]):
         if longitude.dtype != COORD_DTYPE:
             raise ValueError(
                 "Longitude values must be of type float64. "
-                "Initiate with 'copy=True' to convert to float64. "
-                "Initiate with 'validate=False' to skip validation."
+                "Instantiate with 'copy=True' to convert to float64. "
+                "Instantiate with 'validate=False' to skip validation."
             )
 
         if self.is_wrapped:
@@ -167,8 +168,8 @@ class MetBase(ABC, Generic[XArrayType]):
         if latitude.dtype != COORD_DTYPE:
             raise ValueError(
                 "Latitude values must be of type float64. "
-                "Initiate with 'copy=True' to convert to float64. "
-                "Initiate with 'validate=False' to skip validation."
+                "Instantiate with 'copy=True' to convert to float64. "
+                "Instantiate with 'validate=False' to skip validation."
             )
 
         if latitude[0] < -90.0:
@@ -192,10 +193,10 @@ class MetBase(ABC, Generic[XArrayType]):
         """
         indexes = self.indexes
         if not np.all(np.diff(indexes["time"]) > np.timedelta64(0, "ns")):
-            raise ValueError("Coordinate `time` not sorted. Initiate with `copy=True`.")
+            raise ValueError("Coordinate 'time' not sorted. Instantiate with 'copy=True'.")
         for coord in self.dim_order[:3]:  # exclude time, the 4th dimension
             if not np.all(np.diff(indexes[coord]) > 0.0):
-                raise ValueError(f"Coordinate '{coord}' not sorted. Initiate with 'copy=True'.")
+                raise ValueError(f"Coordinate '{coord}' not sorted. Instantiate with 'copy=True'.")
 
     def _validate_transpose(self) -> None:
         """Check that data is transposed according to :attr:`dim_order`."""
@@ -204,11 +205,11 @@ class MetBase(ABC, Generic[XArrayType]):
             if da.dims != self.dim_order:
                 if key is not None:
                     msg = (
-                        f"Data dimension not transposed on variable '{key}'. Initiate with"
+                        f"Data dimension not transposed on variable '{key}'. Instantiate with"
                         " 'copy=True'."
                     )
                 else:
-                    msg = "Data dimension not transposed. Initiate with 'copy=True'."
+                    msg = "Data dimension not transposed. Instantiate with 'copy=True'."
                 raise ValueError(msg)
 
         data = self.data
@@ -228,6 +229,12 @@ class MetBase(ABC, Generic[XArrayType]):
         self._validate_longitude()
         self._validate_latitude()
         self._validate_transpose()
+        if self.data["level"].dtype != COORD_DTYPE:
+            raise ValueError(
+                "Level values must be of type float64. "
+                "Instantiate with 'copy=True' to convert to float64. "
+                "Instantiate with 'validate=False' to skip validation."
+            )
 
     def _preprocess_dims(self, wrap_longitude: bool) -> None:
         """Confirm DataArray or Dataset include required dimension in a consistent format.
@@ -363,16 +370,6 @@ class MetBase(ABC, Generic[XArrayType]):
             "time": variables["time"].to_numpy(),
         }
 
-    @property
-    def variables(self) -> dict[Hashable, pd.Index]:
-        """See :attr:`indexes`."""
-        warnings.warn(
-            "The 'variables' property is deprecated and will be removed in a future release. "
-            "Use 'indexes' instead.",
-            DeprecationWarning,
-        )
-        return self.indexes
-
     @property
     def indexes(self) -> dict[Hashable, pd.Index]:
         """Low level access to underlying :attr:`data` indexes.
@@ -745,8 +742,8 @@ class MetDataset(MetBase):
         except KeyError as e:
             raise KeyError(
                 f"Variable {key} not found. Available variables: {', '.join(self.data.data_vars)}. "
-                "To get items (e.g. `time` or `level`) from underlying `xr.Dataset` object, "
-                "use the `data` attribute."
+                "To get items (e.g. 'time' or 'level') from underlying xr.Dataset object, "
+                "use the 'data' attribute."
             ) from e
         return MetDataArray(da, copy=False, validate=False)
 
@@ -1057,14 +1054,13 @@ class MetDataset(MetBase):
         >>> era5 = ERA5(time=times, variables=variables, pressure_levels=levels)
         >>> met = era5.open_metdataset()
         >>> met.to_vector(transfer_attrs=False)
-        GeoVectorDataset [6 keys x 4152960 length, 1 attributes]
+        GeoVectorDataset [6 keys x 4152960 length, 0 attributes]
             Keys: longitude, latitude, level, time, air_temperature, ..., specific_humidity
             Attributes:
             time                [2022-03-01 00:00:00, 2022-03-01 01:00:00]
             longitude           [-180.0, 179.75]
             latitude            [-90.0, 90.0]
             altitude            [10362.8, 11783.9]
-            crs                 EPSG:4326
 
         """
         coords_keys = self.data.dims
@@ -1374,20 +1370,9 @@ class MetDataArray(MetBase):
         copy: bool = True,
         validate: bool = True,
         name: Hashable | None = None,
-        **kwargs: Any,
     ) -> None:
-        # init cache
         self.cachestore = cachestore
 
-        # try to create DataArray out of input data and **kwargs
-        if not isinstance(data, xr.DataArray):
-            warnings.warn(
-                "Input 'data' must be an xarray DataArray. "
-                "Passing arbitrary kwargs will be removed in future versions.",
-                DeprecationWarning,
-            )
-            data = xr.DataArray(data, **kwargs)
-
         if copy:
             self.data = data.copy()
             self._preprocess_dims(wrap_longitude)

pycontrails/core/vector.py

@@ -1044,7 +1044,6 @@ class VectorDataset:
         >>> pprint.pprint(fl.to_dict())
         {'aircraft_type': 'B737',
          'altitude_ft': [38661.0, 38661.0, 38661.0, 38661.0, 38661.0, 38661.0, 38661.0],
-         'crs': 'EPSG:4326',
          'latitude': [40.0, 41.724, 43.428, 45.111, 46.769, 48.399, 50.0],
          'longitude': [-100.0,
                        -101.441,
@@ -1215,9 +1214,6 @@ class GeoVectorDataset(VectorDataset):
     Each spatial variable is expected to have "float32" or "float64" ``dtype``.
     The time variable is expected to have "datetime64[ns]" ``dtype``.
 
-    Use the attribute :attr:`attr["crs"]` to specify coordinate reference system
-    using `PROJ <https://proj.org/>`_ or `EPSG <https://epsg.org/home.html>`_ syntax.
-
     Parameters
     ----------
     data : dict[str, npt.ArrayLike] | pd.DataFrame | VectorDataDict | VectorDataset | None, optional
@@ -1364,16 +1360,12 @@ class GeoVectorDataset(VectorDataset):
             if arr.dtype not in float_dtype:
                 self.update({coord: arr.astype(np.float64)})
 
-        # set CRS to "EPSG:4326" by default
-        crs = self.attrs.setdefault("crs", "EPSG:4326")
-
-        if crs == "EPSG:4326":
-            longitude = self["longitude"]
-            if np.any(longitude > 180.0) or np.any(longitude < -180.0):
-                raise ValueError("EPSG:4326 longitude coordinates should lie between [-180, 180).")
-            latitude = self["latitude"]
-            if np.any(latitude > 90.0) or np.any(latitude < -90.0):
-                raise ValueError("EPSG:4326 latitude coordinates should lie between [-90, 90].")
+        longitude = self["longitude"]
+        if np.any(longitude > 180.0) or np.any(longitude < -180.0):
+            raise ValueError("EPSG:4326 longitude coordinates should lie between [-180, 180).")
+        latitude = self["latitude"]
+        if np.any(latitude > 90.0) or np.any(latitude < -90.0):
+            raise ValueError("EPSG:4326 latitude coordinates should lie between [-90, 90].")
 
     @overrides
     def _display_attrs(self) -> dict[str, str]:
@@ -1530,24 +1522,21 @@ class GeoVectorDataset(VectorDataset):
     # Utilities
     # ------------
 
-    def transform_crs(
-        self: GeoVectorDatasetType, crs: str, copy: bool = True
-    ) -> GeoVectorDatasetType:
+    def transform_crs(self, crs: str) -> tuple[npt.NDArray[np.float64], npt.NDArray[np.float64]]:
         """Transform trajectory data from one coordinate reference system (CRS) to another.
 
         Parameters
         ----------
         crs : str
             Target CRS. Passed into to :class:`pyproj.Transformer`. The source CRS
-            is inferred from the :attr:`attrs["crs"]` attribute.
+            is assumed to be EPSG:4326.
         copy : bool, optional
             Copy data on transformation. Defaults to True.
 
         Returns
         -------
-        GeoVectorDatasetType
-            Converted dataset with new coordinate reference system.
-            :attr:`attrs["crs"]` reflects new crs.
+        tuple[npt.NDArray[np.float64], npt.NDArray[np.float64]]
+            New x and y coordinates in the target CRS.
         """
         try:
             import pyproj
@@ -1559,14 +1548,9 @@ class GeoVectorDataset(VectorDataset):
                 pycontrails_optional_package="pyproj",
             )
 
-        transformer = pyproj.Transformer.from_crs(self.attrs["crs"], crs, always_xy=True)
-        lon, lat = transformer.transform(self["longitude"], self["latitude"])
-
-        ret = self.copy() if copy else self
-
-        ret.update(longitude=lon, latitude=lat)
-        ret.attrs.update(crs=crs)
-        return ret
+        crs_from = "EPSG:4326"
+        transformer = pyproj.Transformer.from_crs(crs_from, crs, always_xy=True)
+        return transformer.transform(self["longitude"], self["latitude"])
 
     def T_isa(self) -> npt.NDArray[np.float64]:
         """Calculate the ICAO standard atmosphere temperature at each point.
@@ -1961,21 +1945,6 @@ class GeoVectorDataset(VectorDataset):
         """
         return json_utils.dataframe_to_geojson_points(self.dataframe)
 
-    def to_pseudo_mercator(self: GeoVectorDatasetType, copy: bool = True) -> GeoVectorDatasetType:
-        """Convert data from :attr:`attrs["crs"]` to Pseudo Mercator (EPSG:3857).
-
-        Parameters
-        ----------
-        copy : bool, optional
-            Copy data on transformation.
-            Defaults to True.
-
-        Returns
-        -------
-        GeoVectorDatasetType
-        """
-        return self.transform_crs("EPSG:3857", copy=copy)
-
     # ------------
     # Vector to grid
     # ------------

pycontrails/datalib/ecmwf/__init__.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from pycontrails.datalib.ecmwf.arco_era5 import (
-    ARCOERA5,
+    ERA5ARCO,
     open_arco_era5_model_level_data,
     open_arco_era5_single_level,
 )
@@ -40,7 +40,7 @@ from pycontrails.datalib.ecmwf.variables import (
 )
 
 __all__ = [
-    "ARCOERA5",
+    "ERA5ARCO",
     "CDSCredentialsNotFound",
     "ERA5",
     "ERA5ModelLevel",

pycontrails/datalib/ecmwf/arco_era5.py

@@ -197,7 +197,7 @@ def open_arco_era5_single_level(
     return MetDataset(ds).data
 
 
-class ARCOERA5(ecmwf_common.ECMWFAPI):
+class ERA5ARCO(ecmwf_common.ECMWFAPI):
     r"""ARCO ERA5 data accessed remotely through Google Cloud Storage.
 
     This is a high-level interface to access and cache

pycontrails/datalib/ecmwf/era5.py

@@ -34,7 +34,7 @@ class ERA5(ECMWFAPI):
     """Class to support ERA5 data access, download, and organization.
 
     Requires account with
-    `Copernicus Data Portal <https://cds.climate.copernicus.eu/cdsapp#!/home>`_
+    `Copernicus Data Portal <https://cds.climate.copernicus.eu/how-to-api>`_
     and local credentials.
 
     API credentials can be stored in a ``~/.cdsapirc`` file

pycontrails/datalib/ecmwf/era5_model_level.py

@@ -7,9 +7,9 @@ This module supports
 - Local caching of processed netCDF files.
 - Opening processed and cached files as a :class:`pycontrails.MetDataset` object.
 
-Consider using :class:`pycontrails.datalib.ecmwf.ARCOERA5`
+Consider using :class:`pycontrails.datalib.ecmwf.ERA5ARCO`
 to access model-level data from the nominal ERA5 reanalysis between 1959 and 2022.
-:class:`pycontrails.datalib.ecmwf.ARCOERA5` accesses data through Google's
+:class:`pycontrails.datalib.ecmwf.ERA5ARCO` accesses data through Google's
 `Analysis-Ready, Cloud Optimized ERA5 dataset <https://cloud.google.com/storage/docs/public-datasets/era5>`_
 and has lower latency than this module, which retrieves data from the
 `Copernicus Climate Data Store <https://cds.climate.copernicus.eu/#!/home>`_.
@@ -56,7 +56,7 @@ class ERA5ModelLevel(ECMWFAPI):
     pressure-level with much lower vertical resolution.
 
     Requires account with
-    `Copernicus Data Portal <https://cds.climate.copernicus.eu/cdsapp#!/home>`_
+    `Copernicus Data Portal <https://cds.climate.copernicus.eu/how-to-api>`_
     and local credentials.
 
     API credentials can be stored in a ``~/.cdsapirc`` file

pycontrails/datalib/ecmwf/model_levels.py

@@ -384,9 +384,10 @@ def ml_to_pl(
     lnsp : xr.DataArray
         Natural logarithm of surface pressure, [:math:`\ln(\text{Pa})`]. If provided,
         ``sp`` is ignored. At least one of ``lnsp`` or ``sp`` must be provided.
+        The chunking over dimensions in common with ``ds`` must be the same as ``ds``.
     sp : xr.DataArray
-        Surface pressure, [:math:`\text{Pa}`].
-        At least one of ``lnsp`` or ``sp`` must be provided.
+        Surface pressure, [:math:`\text{Pa}`]. At least one of ``lnsp`` or ``sp`` must be provided.
+        The chunking over dimensions in common with ``ds`` must be the same as ``ds``.
 
     Returns
     -------

pycontrails/models/cocipgrid/cocip_grid.py

@@ -1671,6 +1671,8 @@ def calc_evolve_one_step(
             segment_length_t1, segment_length_t2
         )
 
+    dt = next_contrail["time"] - curr_contrail["time"]
+
     sigma_yy_t2, sigma_zz_t2, sigma_yz_t2 = contrail_properties.plume_temporal_evolution(
         width_t1=width_t1,
         depth_t1=depth_t1,
@@ -1679,7 +1681,7 @@ def calc_evolve_one_step(
         diffuse_h_t1=diffuse_h_t1,
         diffuse_v_t1=diffuse_v_t1,
         seg_ratio=seg_ratio_t12,
-        dt=params["dt_integration"],
+        dt=dt,
         max_depth=params["max_depth"],
     )
 
@@ -1716,7 +1718,7 @@ def calc_evolve_one_step(
         dn_dt_agg=dn_dt_agg,
         dn_dt_turb=dn_dt_turb,
         seg_ratio=seg_ratio_t12,
-        dt=params["dt_integration"],
+        dt=dt,
     )
     next_contrail["n_ice_per_m"] = n_ice_per_m_t2
 
@@ -1737,7 +1739,7 @@ def calc_evolve_one_step(
         width_t1=width_t1,
         width_t2=width_t2,
         seg_length_t2=segment_length_t2,
-        dt=params["dt_integration"],
+        dt=dt,
     )
     # NOTE: This will get masked below if `persistent` is False
     # That is, we are taking a right Riemann sum of a decreasing function, so we are

pycontrails/models/ps_model/ps_model.py

@@ -20,6 +20,7 @@ from pycontrails.core.aircraft_performance import (
     AircraftPerformanceData,
     AircraftPerformanceParams,
 )
+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, NorthwardWind
@@ -115,6 +116,9 @@ class PSFlight(AircraftPerformance):
             raise KeyError(msg)
         return False
 
+    @overload
+    def eval(self, source: Fleet, **params: Any) -> Fleet: ...
+
     @overload
     def eval(self, source: Flight, **params: Any) -> Flight: ...
 
@@ -130,12 +134,20 @@ class PSFlight(AircraftPerformance):
         self.set_source_met()
 
         # Calculate true airspeed if not included on source
-        true_airspeed = self.ensure_true_airspeed_on_source().copy()
-        true_airspeed[true_airspeed == 0.0] = np.nan
+        self.ensure_true_airspeed_on_source()
+
+        if isinstance(self.source, Fleet):
+            fls = [self._eval_flight(fl) for fl in self.source.to_flight_list()]
+            self.source = Fleet.from_seq(fls, attrs=self.source.attrs, broadcast_numeric=False)
+            return self.source
+
+        self.source = self._eval_flight(self.source)
+        return self.source
 
+    def _eval_flight(self, fl: Flight) -> Flight:
         # Ensure aircraft type is available
         try:
-            aircraft_type = self.source.attrs["aircraft_type"]
+            aircraft_type = fl.attrs["aircraft_type"]
         except KeyError as exc:
             msg = "`aircraft_type` required on flight attrs"
             raise KeyError(msg) from exc
@@ -148,29 +160,32 @@ class PSFlight(AircraftPerformance):
             raise KeyError(msg) from exc
 
         # Set flight attributes based on engine, if they aren't already defined
-        self.source.attrs.setdefault("aircraft_performance_model", self.name)
-        self.source.attrs.setdefault("aircraft_type_ps", atyp_ps)
-        self.source.attrs.setdefault("n_engine", aircraft_params.n_engine)
-
-        self.source.attrs.setdefault("wingspan", aircraft_params.wing_span)
-        self.source.attrs.setdefault("max_mach", aircraft_params.max_mach_num)
-        self.source.attrs.setdefault("max_altitude", units.ft_to_m(aircraft_params.fl_max * 100.0))
-        self.source.attrs.setdefault("n_engine", aircraft_params.n_engine)
-
-        amass_oew = self.source.attrs.get("amass_oew", aircraft_params.amass_oew)
-        amass_mtow = self.source.attrs.get("amass_mtow", aircraft_params.amass_mtow)
-        amass_mpl = self.source.attrs.get("amass_mpl", aircraft_params.amass_mpl)
-        load_factor = self.source.attrs.get("load_factor", DEFAULT_LOAD_FACTOR)
-        takeoff_mass = self.source.attrs.get("takeoff_mass")
-        q_fuel = self.source.fuel.q_fuel
+        fl.attrs.setdefault("aircraft_performance_model", self.name)
+        fl.attrs.setdefault("aircraft_type_ps", atyp_ps)
+        fl.attrs.setdefault("n_engine", aircraft_params.n_engine)
+
+        fl.attrs.setdefault("wingspan", aircraft_params.wing_span)
+        fl.attrs.setdefault("max_mach", aircraft_params.max_mach_num)
+        fl.attrs.setdefault("max_altitude", units.ft_to_m(aircraft_params.fl_max * 100.0))
+        fl.attrs.setdefault("n_engine", aircraft_params.n_engine)
+
+        amass_oew = fl.attrs.get("amass_oew", aircraft_params.amass_oew)
+        amass_mtow = fl.attrs.get("amass_mtow", aircraft_params.amass_mtow)
+        amass_mpl = fl.attrs.get("amass_mpl", aircraft_params.amass_mpl)
+        load_factor = fl.attrs.get("load_factor", DEFAULT_LOAD_FACTOR)
+        takeoff_mass = fl.attrs.get("takeoff_mass")
+        q_fuel = fl.fuel.q_fuel
+
+        true_airspeed = fl["true_airspeed"]  # attached in PSFlight.eval
+        true_airspeed = np.where(true_airspeed == 0.0, np.nan, true_airspeed)
 
         # Run the simulation
         aircraft_performance = self.simulate_fuel_and_performance(
             aircraft_type=atyp_ps,
-            altitude_ft=self.source.altitude_ft,
-            time=self.source["time"],
+            altitude_ft=fl.altitude_ft,
+            time=fl["time"],
             true_airspeed=true_airspeed,
-            air_temperature=self.source["air_temperature"],
+            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),
@@ -194,13 +209,13 @@ class PSFlight(AircraftPerformance):
             "thrust",
             "rocd",
         ):
-            self.source.setdefault(var, getattr(aircraft_performance, var))
+            fl.setdefault(var, getattr(aircraft_performance, var))
 
         self._cleanup_indices()
 
-        self.source.attrs["total_fuel_burn"] = np.nansum(aircraft_performance.fuel_burn).item()
+        fl.attrs["total_fuel_burn"] = np.nansum(aircraft_performance.fuel_burn).item()
 
-        return self.source
+        return fl
 
     @overrides
     def calculate_aircraft_performance(

{pycontrails-0.54.0.dist-info → pycontrails-0.54.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycontrails
-Version: 0.54.0
+Version: 0.54.1
 Summary: Python library for modeling aviation climate impacts
 Author-email: Breakthrough Energy <py@contrails.org>
 License: Apache-2.0

{pycontrails-0.54.0.dist-info → pycontrails-0.54.1.dist-info}/RECORD

@@ -1,25 +1,25 @@
-pycontrails-0.54.0.dist-info/RECORD,,
-pycontrails-0.54.0.dist-info/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
-pycontrails-0.54.0.dist-info/WHEEL,sha256=pM6w_2-HMcmsJME874nrq5Wowbr_ttce_14nLq621Mg,110
-pycontrails-0.54.0.dist-info/NOTICE,sha256=gKI8DcN1WhiXB2SFRKDogcjONldGubTvBxiOYdC4CXU,1926
-pycontrails-0.54.0.dist-info/top_level.txt,sha256=dwaYXVcMhF92QWtAYcLvL0k02vyBqwhsv92lYs2V6zQ,23
-pycontrails-0.54.0.dist-info/METADATA,sha256=ZK_iyLfHqxvbeM92Lbzdhw0hSOqdE1NPpPn4m7IbkTE,9074
-pycontrails/_version.py,sha256=Cy6-7BAUUEvyIJZFLyqb_w3IXvuVEBdc837EO9ql3TM,413
+pycontrails-0.54.1.dist-info/RECORD,,
+pycontrails-0.54.1.dist-info/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
+pycontrails-0.54.1.dist-info/WHEEL,sha256=pM6w_2-HMcmsJME874nrq5Wowbr_ttce_14nLq621Mg,110
+pycontrails-0.54.1.dist-info/NOTICE,sha256=gKI8DcN1WhiXB2SFRKDogcjONldGubTvBxiOYdC4CXU,1926
+pycontrails-0.54.1.dist-info/top_level.txt,sha256=dwaYXVcMhF92QWtAYcLvL0k02vyBqwhsv92lYs2V6zQ,23
+pycontrails-0.54.1.dist-info/METADATA,sha256=nnFiKTAtEVMBl81BkYHnQ6HHanzpEFtonQgABT0R28E,9074
+pycontrails/_version.py,sha256=k6EdzGzEntY3_PJAluVNA2mhyXh37neOah9DFH4IwDw,413
 pycontrails/__init__.py,sha256=O2T9kXCMhcELcMZz7HEnwiBhh4Gfcj-yG1HtrotOKHQ,2001
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycontrails/core/vector.py,sha256=Y-YTk_dv_IguaThQFLFeZETNhsNu5lKcbo301cvHYgw,71540
+pycontrails/core/vector.py,sha256=6ESLZ_mzZiehzCrwyb1Ib5zLnp3Vf37wHDmnx-RKWZQ,70530
 pycontrails/core/models.py,sha256=mB3fhmBorFxt7uEhBFcuu0PIMWmBRB4KBRsPiFpPcvo,39282
 pycontrails/core/interpolation.py,sha256=yxVLO9lzNcNFeLwDyrQ7yfz4JEHLHTpgIRBrcOezsXg,25617
-pycontrails/core/fleet.py,sha256=wqYY_2xD9X-Og0_oxU8ZPqTHYDau9TOPLQcmEnB1kiQ,16140
-pycontrails/core/rgi_cython.cpython-310-darwin.so,sha256=ySvLDF85WHuTyPfg1P7p6ScIONZ8TuJoxjryQkOsG5w,295344
-pycontrails/core/flight.py,sha256=s_teDDqnoiX15pqJ_hmchKCjut1WiNtcrL2QXXMBNGc,85173
+pycontrails/core/fleet.py,sha256=u4Mw57KPePSycBRvhVSbhr-7hQ2rTiEWXNagXIQKOuY,15551
+pycontrails/core/rgi_cython.cpython-310-darwin.so,sha256=Swbb6LKVFjEZnZ9C5Cqrx0FOj-J2PP9-63BiFqbjQWM,295344
+pycontrails/core/flight.py,sha256=SbXO0w8je7v4YASoEHu4mGzLvyUyMJp720JniHJBz5c,82909
 pycontrails/core/fuel.py,sha256=kJZ3P1lPm1L6rdPREM55XQ-VfJ_pt35cP4sO2Nnvmjs,4332
 pycontrails/core/polygon.py,sha256=gosyZBX1XBKD2EcHycIZb7uM-xGs8rCfdpiSZlhc2Hc,18028
 pycontrails/core/cache.py,sha256=ly2Prq5CUxxc2pClZUXDeH-E8zkj3zZkLoKpdKUCyGs,27984
 pycontrails/core/__init__.py,sha256=x1z6x8w3sYmEqYcNWyWHuNkS9lPUPbHUoYJZs1K0q98,856
 pycontrails/core/flightplan.py,sha256=UO4vL087d5TZMlU984-FxfotGTxFbqK78w2fLDRiel4,7335
-pycontrails/core/met.py,sha256=0lGZqGu-_EnulU9Df05xo0I-IYX2MRQXvJ7PgCjU6p0,101342
-pycontrails/core/aircraft_performance.py,sha256=4KnLj0zK-mk8Oo3As1CXUkQWBQGMeDdrKi5TeOhOmUA,26107
+pycontrails/core/met.py,sha256=vWUR2qNGvYrP4I9KKmk6rQoRkPV2mbvkNfxf2b7HV4U,100726
+pycontrails/core/aircraft_performance.py,sha256=BsYMMK80lpVzSYS8sem4xgigLUpwlXglql2qztaHp0M,26325
 pycontrails/core/airports.py,sha256=aeyAXVkioIRomrP79UtNrxindL4f1DJyXFaojZCuBBw,6758
 pycontrails/core/met_var.py,sha256=GC5ijw4oGuIefmFOSz4vmxMEBj_SVs5Z75IMhDP56Cw,9183
 pycontrails/core/coordinates.py,sha256=0ySsHtqTon7GMbuwmmxMbI92j3ueMteJZh4xxNm5zto,5391
@@ -29,15 +29,15 @@ pycontrails/datalib/spire.py,sha256=66SnMdA8KOS69USjKmqrJmTKPK08Ehih9tnlsCt-AJw,
 pycontrails/datalib/__init__.py,sha256=hW9NWdFPC3y_2vHMteQ7GgQdop3917MkDaf5ZhU2RBY,369
 pycontrails/datalib/sentinel.py,sha256=pKB92KzKjvNOKnuxolXoz2ZnpXQ50iQ8g-EHDVMsnoA,17221
 pycontrails/datalib/_met_utils/metsource.py,sha256=BGActBGApWb4yI97nBS9ui5j-PzIQotFMUtbMEBkvm8,23966
-pycontrails/datalib/ecmwf/arco_era5.py,sha256=ZBN3ZMgoeUVMkVTdWlSMRpJ6Fpwzx2EtPGJXZqoJiog,12348
-pycontrails/datalib/ecmwf/era5.py,sha256=gWZaDydDq7Z-UzNM_41sY-zgOQbVBzQ9E9CnqVk3OqA,19017
-pycontrails/datalib/ecmwf/era5_model_level.py,sha256=tTE_aY90NtjP8HUl64CtbnUKsAOoPHgeDImDij_mVWM,19343
+pycontrails/datalib/ecmwf/arco_era5.py,sha256=gezuXJo2gNT7WVK4xVwL8bPSxnPm8SGdj8g6THC4nXg,12348
+pycontrails/datalib/ecmwf/era5.py,sha256=VV-t0WUCDSpNzAlerWNJMjtownjLX3MSzxRdVaTMn3M,19014
+pycontrails/datalib/ecmwf/era5_model_level.py,sha256=Aey0juIzL2ZIAuPhFlsjTky9i45vKTT9gIeGxIrtIqs,19340
 pycontrails/datalib/ecmwf/hres.py,sha256=p_l0ytCEEWGam7G7aVynpLmH4H4LQNeVe0Ay7Tw6fp8,28240
 pycontrails/datalib/ecmwf/variables.py,sha256=G6LlGTrlzdn819F-7kjEMXT-Ystp1gc79LOmQTZKrtQ,9865
 pycontrails/datalib/ecmwf/hres_model_level.py,sha256=DiMw1cgbON_pu9ADjC0NC_itHSVa9n9zICLs1_iDq7c,17568
-pycontrails/datalib/ecmwf/__init__.py,sha256=e2LXD2ebsu0tNKZHabI6-SvzYw6zdsci2B3z6cFgBZQ,2021
+pycontrails/datalib/ecmwf/__init__.py,sha256=7OovwVTCo2DVH10NioUAc18evZkgb9b7Tn42S7tsJfU,2021
 pycontrails/datalib/ecmwf/common.py,sha256=PIkEdYEmlmwxQ7v4TenW_BaHX7mslnmdJW3iZYXb7Kg,3904
-pycontrails/datalib/ecmwf/model_levels.py,sha256=Sf11onDST2YOF_1yRxCdlttDJNnR8pv26y2oU3jl9tY,16830
+pycontrails/datalib/ecmwf/model_levels.py,sha256=_kgpnogaS6MlfvTX9dB5ASTHFUlZuQ_DRb-VADwEa0k,16996
 pycontrails/datalib/ecmwf/ifs.py,sha256=2heema398PoEVCfiTZSBawN25PXAa_CpWm_pGLZ1GuY,10662
 pycontrails/datalib/ecmwf/static/model_level_dataframe_v20240418.csv,sha256=PmvGLRzn6uuCKSwiasSuVcehvvmSaqP7cnLuN6hhCQQ,9788
 pycontrails/datalib/_leo_utils/vis.py,sha256=-fLcm1D5cP6lThVHovV3MJSiadWyTUAvYDMvr4drMU4,1802
@@ -92,7 +92,7 @@ pycontrails/models/cocip/radiative_heating.py,sha256=YRpwfXgFnf89iuJiIM96q-jbdcM
 pycontrails/models/cocip/contrail_properties.py,sha256=tycCxKf8j9GvVYDQBPxjtp6xLll-r00C0XW-w1jGbMI,55594
 pycontrails/models/cocip/unterstrasser_wake_vortex.py,sha256=kDxFpAIkcqqhGmwXoxv3_cSESj1Ur45GbLJF56IACJs,14573
 pycontrails/models/ps_model/__init__.py,sha256=5L-HympF1gJaZ6xiNkIQJygJhkDxM3-ejS_T2z-83hQ,495
-pycontrails/models/ps_model/ps_model.py,sha256=Cj79eJxHfq6205zNPxrwSs_Cx337MU3qvc7ds8sHAjA,33013
+pycontrails/models/ps_model/ps_model.py,sha256=mhcSIq2ZGCScWpS2aVipvNKORv3QdspGme69Hm8LdvE,33411
 pycontrails/models/ps_model/ps_aircraft_params.py,sha256=-PfT2JC6RckVi_zTDVTqAMyaS-id6I2klUoXoEXreAc,13077
 pycontrails/models/ps_model/ps_operational_limits.py,sha256=_vFJiPqGuZJRzwuY10-z07-7eEyomnpxPm_Js1Cd5So,16832
 pycontrails/models/ps_model/ps_grid.py,sha256=AqZCEytWhrNbyujlJTufI4cxDonkPchGnrB3IvtRID4,18667
@@ -100,7 +100,7 @@ pycontrails/models/ps_model/static/ps-synonym-list-20240524.csv,sha256=ksrpQTHkx
 pycontrails/models/ps_model/static/ps-aircraft-params-20240524.csv,sha256=3eNhSwzut0gon04k2EYKKaXRvQSUlau3yBAbHS0EBao,25784
 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=B1-f3D62fg3OeLp7xnxANAsneg9JRiiRVMqs-REFaII,94347
+pycontrails/models/cocipgrid/cocip_grid.py,sha256=JV-arscdjzvUWbtaOoDuo_87VlKIwID7Vbw-KwCurzI,94337
 pycontrails/physics/geo.py,sha256=9ZWIXyEEgrBNqsoeBBlYLTA-8GUTgyc-jgeVgchxXa8,30288
 pycontrails/physics/units.py,sha256=j-G5AC9eWIvv2MTOq9lUOoOQKFNJJuHzWLanHRji2tE,12272
 pycontrails/physics/constants.py,sha256=pHQQmccMUwuNnY4hFtm3L8G2rnUQcfJnroyQr8HAVeM,3146