pycontrails 0.54.3__cp311-cp311-win_amd64.whl → 0.54.4__cp311-cp311-win_amd64.whl

pycontrails/core/polygon.py

@@ -42,7 +42,7 @@ except ModuleNotFoundError as exc:
 
 
 def buffer_and_clean(
-    contour: npt.NDArray[np.float64],
+    contour: npt.NDArray[np.floating],
     min_area: float,
     convex_hull: bool,
     epsilon: float,
@@ -54,7 +54,7 @@ def buffer_and_clean(
 
     Parameters
     ----------
-    contour : npt.NDArray[np.float64]
+    contour : npt.NDArray[np.floating]
         Contour to buffer and clean. A 2d array of shape (n, 2) where n is the number
         of vertices in the contour.
     min_area : float
@@ -157,13 +157,13 @@ def _round_polygon(polygon: shapely.Polygon, precision: int) -> shapely.Polygon:
 
 
 def _contours_to_polygons(
-    contours: Sequence[npt.NDArray[np.float64]],
+    contours: Sequence[npt.NDArray[np.floating]],
     hierarchy: npt.NDArray[np.int_],
     min_area: float,
     convex_hull: bool,
     epsilon: float,
-    longitude: npt.NDArray[np.float64] | None,
-    latitude: npt.NDArray[np.float64] | None,
+    longitude: npt.NDArray[np.floating] | None,
+    latitude: npt.NDArray[np.floating] | None,
     precision: int | None,
     buffer: float,
     i: int = 0,
@@ -172,7 +172,7 @@ def _contours_to_polygons(
 
     Parameters
     ----------
-    contours : Sequence[npt.NDArray[np.float64]]
+    contours : Sequence[npt.NDArray[np.floating]]
         The contours output from :func:`cv2.findContours`.
     hierarchy : npt.NDArray[np.int_]
         The hierarchy output from :func:`cv2.findContours`.
@@ -182,9 +182,9 @@ def _contours_to_polygons(
         Whether to take the convex hull of each polygon.
     epsilon : float
         Epsilon value to use when simplifying the polygons.
-    longitude : npt.NDArray[np.float64] | None
+    longitude : npt.NDArray[np.floating] | None
         Longitude values for the grid.
-    latitude : npt.NDArray[np.float64] | None
+    latitude : npt.NDArray[np.floating] | None
         Latitude values for the grid.
     precision : int | None
         Precision to use when rounding the coordinates.
@@ -254,7 +254,7 @@ def _contours_to_polygons(
 
 
 def determine_buffer(
-    longitude: npt.NDArray[np.float64], latitude: npt.NDArray[np.float64]
+    longitude: npt.NDArray[np.floating], latitude: npt.NDArray[np.floating]
 ) -> float:
     """Determine the proper buffer size to use when converting to polygons."""
 
@@ -279,22 +279,22 @@ def determine_buffer(
 
 
 def find_multipolygon(
-    arr: npt.NDArray[np.float64],
+    arr: npt.NDArray[np.floating],
     threshold: float,
     min_area: float,
     epsilon: float,
     lower_bound: bool = True,
     interiors: bool = True,
     convex_hull: bool = False,
-    longitude: npt.NDArray[np.float64] | None = None,
-    latitude: npt.NDArray[np.float64] | None = None,
+    longitude: npt.NDArray[np.floating] | None = None,
+    latitude: npt.NDArray[np.floating] | None = None,
     precision: int | None = None,
 ) -> shapely.MultiPolygon:
     """Compute a multipolygon from a 2d array.
 
     Parameters
     ----------
-    arr : npt.NDArray[np.float64]
+    arr : npt.NDArray[np.floating]
         Array to convert to a multipolygon. The array will be converted to a binary
         array by comparing each element to ``threshold``. This binary array is then
         passed into :func:`cv2.findContours` to find the contours.
@@ -312,11 +312,11 @@ def find_multipolygon(
         Whether to include interior polygons. By default, True.
     convex_hull : bool, optional
         Experimental. Whether to take the convex hull of each polygon. By default, False.
-    longitude : npt.NDArray[np.float64] | None, optional
+    longitude : npt.NDArray[np.floating] | None, optional
         If provided, the coordinates values corresponding to the longitude dimensions of ``arr``.
         The contour coordinates will be converted to longitude-latitude values by indexing
         into this array. Defaults to None.
-    latitude : npt.NDArray[np.float64] | None, optional
+    latitude : npt.NDArray[np.floating] | None, optional
         If provided, the coordinates values corresponding to the latitude dimensions of ``arr``.
     precision : int | None, optional
         If provided, the precision to use when rounding the coordinates. Defaults to None.

pycontrails/core/vector.py

@@ -260,7 +260,7 @@ class VectorDataset:
         If "time" variable cannot be converted to numpy array.
     """
 
-    __slots__ = ("data", "attrs")
+    __slots__ = ("attrs", "data")
 
     #: Vector data with labels as keys and :class:`numpy.ndarray` as values
     data: VectorDataDict
@@ -1392,7 +1392,7 @@ class GeoVectorDataset(VectorDataset):
         return attrs
 
     @property
-    def level(self) -> npt.NDArray[np.float64]:
+    def level(self) -> npt.NDArray[np.floating]:
         """Get pressure ``level`` values for points.
 
         Automatically calculates pressure level using :func:`units.m_to_pl` using ``altitude`` key.
@@ -1403,7 +1403,7 @@ class GeoVectorDataset(VectorDataset):
 
         Returns
         -------
-        npt.NDArray[np.float64]
+        npt.NDArray[np.floating]
             Point pressure level values, [:math:`hPa`]
         """
         try:
@@ -1412,7 +1412,7 @@ class GeoVectorDataset(VectorDataset):
             return units.m_to_pl(self.altitude)
 
     @property
-    def altitude(self) -> npt.NDArray[np.float64]:
+    def altitude(self) -> npt.NDArray[np.floating]:
         """Get altitude.
 
         Automatically calculates altitude using :func:`units.pl_to_m` using ``level`` key.
@@ -1423,7 +1423,7 @@ class GeoVectorDataset(VectorDataset):
 
         Returns
         -------
-        npt.NDArray[np.float64]
+        npt.NDArray[np.floating]
             Altitude, [:math:`m`]
         """
         try:
@@ -1437,12 +1437,12 @@ class GeoVectorDataset(VectorDataset):
             return units.ft_to_m(self["altitude_ft"])
 
     @property
-    def air_pressure(self) -> npt.NDArray[np.float64]:
+    def air_pressure(self) -> npt.NDArray[np.floating]:
         """Get ``air_pressure`` values for points.
 
         Returns
         -------
-        npt.NDArray[np.float64]
+        npt.NDArray[np.floating]
             Point air pressure values, [:math:`Pa`]
         """
         try:
@@ -1451,12 +1451,12 @@ class GeoVectorDataset(VectorDataset):
             return 100.0 * self.level
 
     @property
-    def altitude_ft(self) -> npt.NDArray[np.float64]:
+    def altitude_ft(self) -> npt.NDArray[np.floating]:
         """Get altitude in feet.
 
         Returns
         -------
-        npt.NDArray[np.float64]
+        npt.NDArray[np.floating]
             Altitude, [:math:`ft`]
         """
         try:
@@ -1522,7 +1522,7 @@ class GeoVectorDataset(VectorDataset):
     # Utilities
     # ------------
 
-    def transform_crs(self, crs: str) -> tuple[npt.NDArray[np.float64], npt.NDArray[np.float64]]:
+    def transform_crs(self, crs: str) -> tuple[npt.NDArray[np.floating], npt.NDArray[np.floating]]:
         """Transform trajectory data from one coordinate reference system (CRS) to another.
 
         Parameters
@@ -1535,7 +1535,7 @@ class GeoVectorDataset(VectorDataset):
 
         Returns
         -------
-        tuple[npt.NDArray[np.float64], npt.NDArray[np.float64]]
+        tuple[npt.NDArray[np.floating], npt.NDArray[np.floating]]
             New x and y coordinates in the target CRS.
         """
         try:
@@ -1552,12 +1552,12 @@ class GeoVectorDataset(VectorDataset):
         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]:
+    def T_isa(self) -> npt.NDArray[np.floating]:
         """Calculate the ICAO standard atmosphere temperature at each point.
 
         Returns
         -------
-        npt.NDArray[np.float64]
+        npt.NDArray[np.floating]
             ISA temperature, [:math:`K`]
 
         See Also
@@ -1610,24 +1610,24 @@ class GeoVectorDataset(VectorDataset):
         self,
         mda: met_module.MetDataArray,
         *,
-        longitude: npt.NDArray[np.float64] | None = None,
-        latitude: npt.NDArray[np.float64] | None = None,
-        level: npt.NDArray[np.float64] | None = None,
+        longitude: npt.NDArray[np.floating] | None = None,
+        latitude: npt.NDArray[np.floating] | None = None,
+        level: npt.NDArray[np.floating] | None = None,
         time: npt.NDArray[np.datetime64] | None = None,
         use_indices: bool = False,
         **interp_kwargs: Any,
-    ) -> npt.NDArray[np.float64]:
+    ) -> npt.NDArray[np.floating]:
         """Intersect waypoints with MetDataArray.
 
         Parameters
         ----------
         mda : MetDataArray
             MetDataArray containing a meteorological variable at spatio-temporal coordinates.
-        longitude : npt.NDArray[np.float64], optional
+        longitude : npt.NDArray[np.floating], optional
             Override existing coordinates for met interpolation
-        latitude : npt.NDArray[np.float64], optional
+        latitude : npt.NDArray[np.floating], optional
             Override existing coordinates for met interpolation
-        level : npt.NDArray[np.float64], optional
+        level : npt.NDArray[np.floating], optional
             Override existing coordinates for met interpolation
         time : npt.NDArray[np.datetime64], optional
             Override existing coordinates for met interpolation
@@ -1646,7 +1646,7 @@ class GeoVectorDataset(VectorDataset):
 
         Returns
         -------
-        npt.NDArray[np.float64]
+        npt.NDArray[np.floating]
             Interpolated values
 
         Examples
@@ -2019,7 +2019,7 @@ def vector_to_lon_lat_grid(
            ...,
            [1.97, 3.02, 1.84, ..., 2.37, 3.87, 2.09],
            [3.74, 1.6 , 4.01, ..., 4.6 , 4.27, 3.4 ],
-           [2.97, 0.12, 1.33, ..., 3.54, 0.74, 2.59]])
+           [2.97, 0.12, 1.33, ..., 3.54, 0.74, 2.59]], shape=(40, 40))
 
     >>> da.sum().item() == vector["foo"].sum()
     np.True_

pycontrails/datalib/_met_utils/metsource.py

@@ -175,13 +175,16 @@ def parse_pressure_levels(
 
     out = arr.tolist()
     if supported is None:
-        return out
+        return out  # type: ignore[return-value]
 
-    if missing := set(out).difference(supported):
-        msg = f"Pressure levels {sorted(missing)} are not supported. Supported levels: {supported}"
+    if missing := set(out).difference(supported):  # type: ignore[arg-type]
+        msg = (
+            f"Pressure levels {sorted(missing)} are not supported. "  # type: ignore[type-var]
+            f"Supported levels: {supported}"
+        )
         raise ValueError(msg)
 
-    return out
+    return out  # type: ignore[return-value]
 
 
 def parse_variables(variables: VariableInput, supported: list[MetVariable]) -> list[MetVariable]:
@@ -347,7 +350,7 @@ def round_hour(time: datetime, hour: int) -> datetime:
 class MetDataSource(abc.ABC):
     """Abstract class for wrapping meteorology data sources."""
 
-    __slots__ = ("timesteps", "variables", "pressure_levels", "grid", "paths")
+    __slots__ = ("grid", "paths", "pressure_levels", "timesteps", "variables")
 
     #: List of individual timesteps from data source derived from :attr:`time`
     #: Use :func:`parse_time` to handle :class:`TimeInput`.

pycontrails/datalib/ecmwf/__init__.py

@@ -40,21 +40,21 @@ from pycontrails.datalib.ecmwf.variables import (
 )
 
 __all__ = [
-    "ERA5ARCO",
-    "CDSCredentialsNotFound",
+    "ECMWF_VARIABLES",
     "ERA5",
-    "ERA5ModelLevel",
+    "ERA5ARCO",
     "HRES",
-    "HRESModelLevel",
     "IFS",
-    "model_level_reference_pressure",
-    "model_level_pressure",
-    "ml_to_pl",
-    "open_arco_era5_model_level_data",
-    "open_arco_era5_single_level",
+    "MODEL_LEVELS_PATH",
+    "MODEL_LEVEL_VARIABLES",
+    "PRESSURE_LEVEL_VARIABLES",
+    "SURFACE_VARIABLES",
+    "CDSCredentialsNotFound",
     "CloudAreaFraction",
     "CloudAreaFractionInLayer",
     "Divergence",
+    "ERA5ModelLevel",
+    "HRESModelLevel",
     "OzoneMassMixingRatio",
     "PotentialVorticity",
     "RelativeHumidity",
@@ -65,9 +65,9 @@ __all__ = [
     "TOAIncidentSolarRadiation",
     "TopNetSolarRadiation",
     "TopNetThermalRadiation",
-    "ECMWF_VARIABLES",
-    "MODEL_LEVELS_PATH",
-    "MODEL_LEVEL_VARIABLES",
-    "PRESSURE_LEVEL_VARIABLES",
-    "SURFACE_VARIABLES",
+    "ml_to_pl",
+    "model_level_pressure",
+    "model_level_reference_pressure",
+    "open_arco_era5_model_level_data",
+    "open_arco_era5_single_level",
 ]

pycontrails/datalib/ecmwf/common.py

@@ -61,7 +61,7 @@ class ECMWFAPI(metsource.MetDataSource):
 
         # downselect times
         if not self.timesteps:
-            self.timesteps = ds["time"].values.astype("datetime64[ns]").tolist()
+            self.timesteps = ds["time"].values.astype("datetime64[ns]").tolist()  # type: ignore[assignment]
         else:
             try:
                 ds = ds.sel(time=self.timesteps)

pycontrails/datalib/ecmwf/era5.py

@@ -137,10 +137,10 @@ class ERA5(ECMWFAPI):
     """
 
     __slots__ = (
-        "product_type",
         "cds",
-        "url",
         "key",
+        "product_type",
+        "url",
     )
 
     #: Product type, one of "reanalysis", "ensemble_mean", "ensemble_members", "ensemble_spread"
@@ -319,9 +319,9 @@ class ERA5(ECMWFAPI):
         str
             ERA5 dataset name in CDS
         """
-        if self.pressure_levels != [-1]:
-            return "reanalysis-era5-pressure-levels"
-        return "reanalysis-era5-single-levels"
+        if self.is_single_level:
+            return "reanalysis-era5-single-levels"
+        return "reanalysis-era5-pressure-levels"
 
     def create_cachepath(self, t: datetime | pd.Timestamp) -> str:
         """Return cachepath to local ERA5 data file based on datetime.
@@ -539,9 +539,9 @@ class ERA5(ECMWFAPI):
             LOG.debug("Input dataset processed with pycontrails > 0.29")
             return ds
 
-        # For "reanalysis-era5-single-levels" or if self.pressure_levels length == 1,
+        # For "reanalysis-era5-single-levels"
         # then the netcdf file does not contain the dimension "level"
-        if len(self.pressure_levels) == 1:
+        if self.is_single_level:
             ds = ds.expand_dims(level=self.pressure_levels)
 
         # New CDS-Beta gives "valid_time" instead of "time"

pycontrails/datalib/ecmwf/hres.py

@@ -228,7 +228,7 @@ class HRES(ECMWFAPI):
     ... )
     """
 
-    __slots__ = ("server", "stream", "field_type", "forecast_time", "url", "key", "email")
+    __slots__ = ("email", "field_type", "forecast_time", "key", "server", "stream", "url")
 
     #: stream type, "oper" = atmospheric model/HRES, "enfo" = ensemble forecast.
     stream: str
@@ -691,7 +691,7 @@ class HRES(ECMWFAPI):
 
         # set forecast time if its not already defined
         if not getattr(self, "forecast_time", None):
-            self.forecast_time = ds["time"].values.astype("datetime64[s]").tolist()
+            self.forecast_time = ds["time"].values.astype("datetime64[s]").tolist()  # type: ignore[assignment]
 
         # check that forecast_time is correct if defined
         # note the "time" coordinate here is the HRES forecast_time
@@ -706,7 +706,7 @@ class HRES(ECMWFAPI):
         # set timesteps if not defined
         # note that "time" is now the actual timestep coordinates
         if not self.timesteps:
-            self.timesteps = ds["time"].values.astype("datetime64[s]").tolist()
+            self.timesteps = ds["time"].values.astype("datetime64[s]").tolist()  # type: ignore[assignment]
 
         self.cache_dataset(ds)
 

pycontrails/datalib/ecmwf/ifs.py

@@ -149,7 +149,7 @@ class IFS(metsource.MetDataSource):
         else:
             # set timesteps from dataset "time" coordinates
             # np.datetime64 doesn't covert to list[datetime] unless its unit is us
-            self.timesteps = ds["time"].values.astype("datetime64[us]").tolist()
+            self.timesteps = ds["time"].values.astype("datetime64[us]").tolist()  # type: ignore[assignment]
 
         # downselect hyam/hybm coefficients by the "lev" coordinate
         # (this is a 1-indexed verison of nhym)

pycontrails/datalib/gfs/__init__.py

@@ -16,13 +16,13 @@ from pycontrails.datalib.gfs.variables import (
 
 __all__ = [
     "GFS_FORECAST_BUCKET",
-    "GFSForecast",
-    "CloudIceWaterMixingRatio",
-    "TotalCloudCoverIsobaric",
-    "Visibility",
-    "TOAUpwardShortwaveRadiation",
-    "TOAUpwardLongwaveRadiation",
     "GFS_VARIABLES",
     "PRESSURE_LEVEL_VARIABLES",
     "SURFACE_VARIABLES",
+    "CloudIceWaterMixingRatio",
+    "GFSForecast",
+    "TOAUpwardLongwaveRadiation",
+    "TOAUpwardShortwaveRadiation",
+    "TotalCloudCoverIsobaric",
+    "Visibility",
 ]

pycontrails/datalib/gfs/gfs.py

@@ -125,7 +125,7 @@ class GFSForecast(metsource.MetDataSource):
     - `GFS Documentation <https://www.emc.ncep.noaa.gov/emc/pages/numerical_forecast_systems/gfs/documentation.php>`_
     """
 
-    __slots__ = ("client", "grid", "cachestore", "show_progress", "forecast_time", "cache_download")
+    __slots__ = ("cache_download", "cachestore", "client", "forecast_time", "grid", "show_progress")
 
     #: S3 client for accessing GFS bucket
     client: botocore.client.S3
@@ -597,7 +597,7 @@ class GFSForecast(metsource.MetDataSource):
         else:
             # set timesteps from dataset "time" coordinates
             # np.datetime64 doesn't covert to list[datetime] unless its unit is us
-            self.timesteps = ds["time"].values.astype("datetime64[us]").tolist()
+            self.timesteps = ds["time"].values.astype("datetime64[us]").tolist()  # type: ignore[assignment]
 
         # if "level" is not in dims and
         # length of the requested pressure levels is 1

pycontrails/datalib/goes.py

@@ -384,7 +384,7 @@ class GOES:
            [277.24512, 277.45377, 278.18408, ..., 274.6369 , 274.01093,
             274.06308],
            [276.8278 , 277.14078, 277.7146 , ..., 274.6369 , 273.9066 ,
-            274.16742]], dtype=float32)
+            274.16742]], shape=(500, 500), dtype=float32)
 
     """
 
@@ -745,8 +745,8 @@ def to_ash(da: xr.DataArray, convention: str = "SEVIRI") -> npt.NDArray[np.float
 
 
 def _clip_and_scale(
-    arr: npt.NDArray[np.float64], low: float, high: float
-) -> npt.NDArray[np.float64]:
+    arr: npt.NDArray[np.floating], low: float, high: float
+) -> npt.NDArray[np.floating]:
     """Clip array and rescale to the interval [0, 1].
 
     Array is first clipped to the interval [low, high] and then linearly rescaled
@@ -757,7 +757,7 @@ def _clip_and_scale(
 
     Parameters
     ----------
-    arr : npt.NDArray[np.float64]
+    arr : npt.NDArray[np.floating]
         Array to clip and scale.
     low : float
         Lower clipping bound.
@@ -766,7 +766,7 @@ def _clip_and_scale(
 
     Returns
     -------
-    npt.NDArray[np.float64]
+    npt.NDArray[np.floating]
         Clipped and scaled array.
     """
     return (arr.clip(low, high) - low) / (high - low)

pycontrails/ext/empirical_grid.py

@@ -118,7 +118,7 @@ class EmpiricalGrid(AircraftPerformanceGrid):
 
         return data[["altitude_ft", *columns]].drop(columns=["aircraft_type"])
 
-    def _sample(self, altitude_ft: npt.NDArray[np.float64]) -> None:
+    def _sample(self, altitude_ft: npt.NDArray[np.floating]) -> None:
         """Sample the data and update the source."""
 
         df = self._query_data()

pycontrails/models/apcemm/apcemm.py

@@ -277,13 +277,13 @@ class APCEMM(models.Model):
     """
 
     __slots__ = (
-        "apcemm_path",
+        "_trajectory_downsampling",
         "apcemm_input_params",
+        "apcemm_path",
         "cachestore",
+        "contrail",
         "trajectories",
         "vortex",
-        "contrail",
-        "_trajectory_downsampling",
     )
 
     name = "apcemm"

pycontrails/models/cocip/__init__.py

@@ -15,9 +15,10 @@ from pycontrails.models.cocip.output_formats import (
 
 __all__ = [
     "Cocip",
+    "CocipFlightParams",
     "CocipParams",
     "CocipUncertaintyParams",
-    "CocipFlightParams",
+    "compare_cocip_with_goes",
     "contrail_flight_summary_statistics",
     "contrails_to_hi_res_grid",
     "flight_waypoint_summary_statistics",
@@ -25,5 +26,4 @@ __all__ = [
     "longitude_latitude_grid",
     "natural_cirrus_properties_to_hi_res_grid",
     "time_slice_statistics",
-    "compare_cocip_with_goes",
 ]

pycontrails/models/cocip/cocip.py

@@ -195,14 +195,14 @@ class Cocip(Model):
     """
 
     __slots__ = (
-        "rad",
+        "_downwash_contrail",
+        "_downwash_flight",
+        "_sac_flight",
         "contrail",
         "contrail_dataset",
         "contrail_list",
+        "rad",
         "timesteps",
-        "_sac_flight",
-        "_downwash_flight",
-        "_downwash_contrail",
     )
 
     name = "cocip"
@@ -660,7 +660,7 @@ class Cocip(Model):
             attrs = self.source.attrs
             attrs.pop("fl_attrs", None)
             attrs.pop("data_keys", None)
-            self.source = Fleet.from_seq(fls, broadcast_numeric=False, copy=False, attrs=attrs)
+            self.source = Fleet.from_seq(fls, broadcast_numeric=False, attrs=attrs)
 
         # Single flight
         else:
@@ -2055,9 +2055,9 @@ def calc_radiative_properties(contrail: GeoVectorDataset, params: dict[str, Any]
 
 def calc_contrail_properties(
     contrail: GeoVectorDataset,
-    effective_vertical_resolution: float | npt.NDArray[np.float64],
-    wind_shear_enhancement_exponent: float | npt.NDArray[np.float64],
-    sedimentation_impact_factor: float | npt.NDArray[np.float64],
+    effective_vertical_resolution: float | npt.NDArray[np.floating],
+    wind_shear_enhancement_exponent: float | npt.NDArray[np.floating],
+    sedimentation_impact_factor: float | npt.NDArray[np.floating],
     radiative_heating_effects: bool,
 ) -> None:
     """Calculate geometric and ice-related properties of contrail.
@@ -2084,11 +2084,11 @@ def calc_contrail_properties(
     ----------
     contrail : GeoVectorDataset
         Grid points with many precomputed keys.
-    effective_vertical_resolution : float | npt.NDArray[np.float64]
+    effective_vertical_resolution : float | npt.NDArray[np.floating]
         Passed into :func:`wind_shear.wind_shear_enhancement_factor`.
-    wind_shear_enhancement_exponent : float | npt.NDArray[np.float64]
+    wind_shear_enhancement_exponent : float | npt.NDArray[np.floating]
         Passed into :func:`wind_shear.wind_shear_enhancement_factor`.
-    sedimentation_impact_factor: float | npt.NDArray[np.float64]
+    sedimentation_impact_factor: float | npt.NDArray[np.floating]
         Passed into `contrail_properties.vertical_diffusivity`.
     radiative_heating_effects: bool
         Include radiative heating effects on contrail cirrus properties.
@@ -2525,8 +2525,8 @@ def calc_timestep_contrail_evolution(
 def _rad_accumulation_to_average_instantaneous(
     rad: MetDataset,
     name: str,
-    arr: npt.NDArray[np.float64],
-) -> npt.NDArray[np.float64]:
+    arr: npt.NDArray[np.floating],
+) -> npt.NDArray[np.floating]:
     """Convert from radiation accumulation to average instantaneous values.
 
     .. versionadded:: 0.48.0
@@ -2537,12 +2537,12 @@ def _rad_accumulation_to_average_instantaneous(
         Radiation data
     name : str
         Variable name
-    arr : npt.NDArray[np.float64]
+    arr : npt.NDArray[np.floating]
         Array of values already interpolated from ``rad``
 
     Returns
     -------
-    npt.NDArray[np.float64]
+    npt.NDArray[np.floating]
         Array of values converted from accumulation to average instantaneous values
 
     Raises

pycontrails/models/cocip/cocip_params.py

@@ -11,7 +11,7 @@ import numpy as np
 import numpy.typing as npt
 
 from pycontrails.core.aircraft_performance import AircraftPerformance
-from pycontrails.core.models import ModelParams
+from pycontrails.core.models import AdvectionBuffers
 from pycontrails.models.emissions.emissions import EmissionsParams
 from pycontrails.models.humidity_scaling import HumidityScaling
 
@@ -50,7 +50,7 @@ def _habits() -> npt.NDArray[np.str_]:
 
 
 @dataclasses.dataclass
-class CocipParams(ModelParams):
+class CocipParams(AdvectionBuffers):
     """Model parameters required by the CoCiP models."""
 
     # -------------------------
@@ -116,15 +116,6 @@ class CocipParams(ModelParams):
     #: evaluation after the met data is downselected.
     compute_tau_cirrus_in_model_init: bool | str = "auto"
 
-    #: Met longitude [WGS84] buffer for Cocip evolution.
-    met_longitude_buffer: tuple[float, float] = (10.0, 10.0)
-
-    #: Met latitude buffer [WGS84] for Cocip evolution.
-    met_latitude_buffer: tuple[float, float] = (10.0, 10.0)
-
-    #: Met level buffer [:math:`hPa`] for Cocip initialization and evolution.
-    met_level_buffer: tuple[float, float] = (40.0, 40.0)
-
     # ---------
     # Filtering
     # ---------