pycontrails 0.47.3__cp310-cp310-macosx_11_0_arm64.whl → 0.48.1__cp310-cp310-macosx_11_0_arm64.whl

pycontrails/models/issr.py

@@ -9,7 +9,7 @@ import numpy as np
 
 import pycontrails
 from pycontrails.core.flight import Flight
-from pycontrails.core.met import MetDataArray, MetDataset
+from pycontrails.core.met import MetDataset
 from pycontrails.core.met_var import AirTemperature, SpecificHumidity
 from pycontrails.core.models import Model, ModelParams
 from pycontrails.core.vector import GeoVectorDataset
@@ -56,12 +56,14 @@ class ISSR(Model):
     >>> # Instantiate and run model
     >>> scaling = ConstantHumidityScaling(rhi_adj=0.98)
     >>> model = ISSR(met, humidity_scaling=scaling)
-    >>> issr = model.eval()
-    >>> issr.proportion  # Get proportion of values with ice supersaturation
-    0.114140917963
+    >>> out1 = model.eval()
+    >>> issr1 = out1["issr"]
+    >>> issr1.proportion  # Get proportion of values with ice supersaturation
+    0.114140
 
     >>> # Run with a lower threshold
-    >>> issr2 = ISSR(met, rhi_threshold=0.95, humidity_scaling=scaling).eval()
+    >>> out2 = model.eval(rhi_threshold=0.95)
+    >>> issr2 = out2["issr"]
     >>> issr2.proportion
     0.146647
     """
@@ -78,11 +80,11 @@ class ISSR(Model):
     def eval(self, source: GeoVectorDataset, **params: Any) -> GeoVectorDataset: ...
 
     @overload
-    def eval(self, source: MetDataset | None = ..., **params: Any) -> MetDataArray: ...
+    def eval(self, source: MetDataset | None = ..., **params: Any) -> MetDataset: ...
 
     def eval(
         self, source: GeoVectorDataset | Flight | MetDataset | None = None, **params: Any
-    ) -> GeoVectorDataset | Flight | MetDataArray:
+    ) -> GeoVectorDataset | Flight | MetDataset:
         """Evaluate ice super-saturated regions along flight trajectory or on meteorology grid.
 
         .. versionchanged:: 0.27.0
@@ -90,6 +92,12 @@ class ISSR(Model):
             Humidity scaling now handled automatically. This is controlled by
             model parameter ``humidity_scaling``.
 
+        .. versionchanged:: 0.48.0
+
+            If the ``source`` is a :class:`MetDataset`, the returned object will
+            also be a :class:`MetDataset`. Previous the "issr" :class:`MetDataArray`
+            was returned.
+
         Parameters
         ----------
         source : GeoVectorDataset | Flight | MetDataset | None, optional
@@ -100,7 +108,7 @@ class ISSR(Model):
 
         Returns
         -------
-        GeoVectorDataset | Flight | MetDataArray
+        GeoVectorDataset | Flight | MetDataset
             Returns 1 in ISSR, 0 everywhere else.
             Returns `np.nan` if interpolating outside meteorology grid.
 
@@ -117,40 +125,30 @@ class ISSR(Model):
             self.downselect_met()
             self.source.setdefault("air_pressure", self.source.air_pressure)
 
-        scale_humidity = (self.params["humidity_scaling"] is not None) and (
-            "specific_humidity" not in self.source
-        )
+        humidity_scaling = self.params["humidity_scaling"]
+        scale_humidity = humidity_scaling is not None and "specific_humidity" not in self.source
+
         self.set_source_met()
 
         # apply humidity scaling, warn if no scaling is provided for ECMWF data
         if scale_humidity:
-            self.params["humidity_scaling"].eval(self.source, copy_source=False)
+            humidity_scaling.eval(self.source, copy_source=False)
 
-        issr_ = issr(
+        self.source["issr"] = issr(
             air_temperature=self.source.data["air_temperature"],
             specific_humidity=self.source.data["specific_humidity"],
             air_pressure=self.source.data["air_pressure"],
             rhi=self.source.data.get("rhi", None),  # if rhi already known, pass it in
             rhi_threshold=self.params["rhi_threshold"],
         )
-        self.source["issr"] = issr_
-
-        # Tag output with additional attrs when source is MetDataset
-        if isinstance(self.source, MetDataset):
-            attrs: dict[str, Any] = {
-                "description": self.long_name,
-                "pycontrails_version": pycontrails.__version__,
-            }
-            if scale_humidity:
-                for k, v in self.params["humidity_scaling"].description.items():
-                    attrs[f"humidity_scaling_{k}"] = v
-            if self.met is not None:
-                attrs["met_source"] = self.met.attrs.get("met_source", "unknown")
-
-            self.source["issr"].data.attrs.update(attrs)
-            return self.source["issr"]
-
-        # In GeoVectorDataset case, return source
+
+        # Tag output with additional metadata attrs
+        self.transfer_met_source_attrs()
+        self.source.attrs["pycontrails_version"] = pycontrails.__version__
+        if scale_humidity:
+            for k, v in humidity_scaling.description.items():
+                self.source.attrs[f"humidity_scaling_{k}"] = v
+
         return self.source
 
 

pycontrails/models/pcr.py

@@ -12,7 +12,7 @@ from typing import Any, overload
 import numpy as np
 
 from pycontrails.core.flight import Flight
-from pycontrails.core.met import MetDataArray, MetDataset
+from pycontrails.core.met import MetDataset
 from pycontrails.core.met_var import AirTemperature, SpecificHumidity
 from pycontrails.core.models import Model
 from pycontrails.core.vector import GeoVectorDataset
@@ -56,11 +56,11 @@ class PCR(Model):
     def eval(self, source: GeoVectorDataset, **params: Any) -> GeoVectorDataset: ...
 
     @overload
-    def eval(self, source: MetDataset | None = ..., **params: Any) -> MetDataArray: ...
+    def eval(self, source: MetDataset | None = ..., **params: Any) -> MetDataset: ...
 
     def eval(
         self, source: GeoVectorDataset | Flight | MetDataset | None = None, **params: Any
-    ) -> GeoVectorDataset | Flight | MetDataArray:
+    ) -> GeoVectorDataset | Flight | MetDataset:
         """Evaluate potential contrails regions of the :attr:`met` grid.
 
         Parameters
@@ -71,7 +71,7 @@ class PCR(Model):
 
         Returns
         -------
-        GeoVectorDataset | Flight | MetDataArray
+        GeoVectorDataset | Flight | MetDataset
             Returns 1 in potential contrail regions, 0 everywhere else.
             Returns ``np.nan`` if interpolating outside meteorology grid.
         **params : Any
@@ -96,14 +96,7 @@ class PCR(Model):
 
         pcr_ = _pcr_from_issr_and_sac(self.source.data["issr"], self.source.data["sac"])
         self.source["pcr"] = pcr_
-        # Tag output with additional attrs when source is MetDataset
-        if isinstance(self.source, MetDataset):
-            attrs = {**self.source["issr"].attrs, **self.source["sac"].attrs}
-            attrs["description"] = self.long_name
-            self.source["pcr"].attrs.update(attrs)
-            return self.source["pcr"]
-
-        # In GeoVectorDataset case, return source
+
         return self.source
 
 

pycontrails/models/sac.py

@@ -11,7 +11,7 @@ import scipy.optimize
 import pycontrails
 from pycontrails.core.flight import Flight
 from pycontrails.core.fuel import Fuel, JetA
-from pycontrails.core.met import MetDataArray, MetDataset
+from pycontrails.core.met import MetDataset
 from pycontrails.core.met_var import AirTemperature, SpecificHumidity
 from pycontrails.core.models import Model, ModelParams
 from pycontrails.core.vector import GeoVectorDataset
@@ -64,11 +64,11 @@ class SAC(Model):
     def eval(self, source: GeoVectorDataset, **params: Any) -> GeoVectorDataset: ...
 
     @overload
-    def eval(self, source: MetDataset | None = ..., **params: Any) -> MetDataArray: ...
+    def eval(self, source: MetDataset | None = ..., **params: Any) -> MetDataset: ...
 
     def eval(
         self, source: GeoVectorDataset | Flight | MetDataset | None = None, **params: Any
-    ) -> GeoVectorDataset | Flight | MetDataArray:
+    ) -> GeoVectorDataset | Flight | MetDataset:
         """Evaluate the Schmidt-Appleman criteria along flight trajectory or on meteorology grid.
 
         .. versionchanged:: 0.27.0
@@ -76,6 +76,12 @@ class SAC(Model):
             Humidity scaling now handled automatically. This is controlled by
             model parameter ``humidity_scaling``.
 
+        .. versionchanged:: 0.48.0
+
+            If the ``source`` is a :class:`MetDataset`, the returned object will
+            also be a :class:`MetDataset`. Previous the "sac" :class:`MetDataArray`
+            was returned.
+
         Parameters
         ----------
         source : GeoVectorDataset | Flight | MetDataset | None, optional
@@ -86,7 +92,7 @@ class SAC(Model):
 
         Returns
         -------
-        GeoVectorDataset | Flight | MetDataArray
+        GeoVectorDataset | Flight | MetDataset
             Returns 1 where SAC is satisfied, 0 everywhere else.
             Returns `np.nan` if interpolating outside meteorology grid.
 
@@ -104,14 +110,13 @@ class SAC(Model):
             self.downselect_met()
             self.source.setdefault("air_pressure", self.source.air_pressure)
 
-        scale_humidity = (self.params["humidity_scaling"] is not None) and (
-            "specific_humidity" not in self.source
-        )
+        humidity_scaling = self.params["humidity_scaling"]
+        scale_humidity = humidity_scaling is not None and "specific_humidity" not in self.source
         self.set_source_met()
 
         # apply humidity scaling, warn if no scaling is provided for ECMWF data
         if scale_humidity:
-            self.params["humidity_scaling"].eval(self.source, copy_source=False)
+            humidity_scaling.eval(self.source, copy_source=False)
 
         # Extract source data
         air_temperature = self.source.data["air_temperature"]
@@ -123,7 +128,8 @@ class SAC(Model):
         if isinstance(self.source, Flight):
             fuel = self.source.fuel
         else:
-            fuel = self.get_source_param("fuel")
+            # NOTE: Not setting fuel on MetDataset source
+            fuel = self.get_source_param("fuel", set_attr=False)
         assert isinstance(fuel, Fuel), "The fuel attribute must be of type Fuel"
 
         ei_h2o = fuel.ei_h2o
@@ -142,24 +148,15 @@ class SAC(Model):
         self.source["rh_critical_sac"] = rh_crit_sac
         self.source["sac"] = sac_
 
-        # Tag output with additional attrs when source is MetDataset
-        if isinstance(self.source, MetDataset):
-            attrs: dict[str, Any] = {
-                "description": self.long_name,
-                "pycontrails_version": pycontrails.__version__,
-            }
-            if scale_humidity:
-                for k, v in self.params["humidity_scaling"].description.items():
-                    attrs[f"humidity_scaling_{k}"] = v
-            if self.met is not None:
-                attrs["met_source"] = self.met.attrs.get("met_source", "unknown")
-            if isinstance(engine_efficiency, (int, float)):
-                attrs["engine_efficiency"] = engine_efficiency
-
-            self.source["sac"].data.attrs.update(attrs)
-            return self.source["sac"]
-
-        # In GeoVectorDataset case, return source
+        # Tag output with additional metadata attrs
+        self.transfer_met_source_attrs()
+        self.source.attrs["pycontrails_version"] = pycontrails.__version__
+        if scale_humidity:
+            for k, v in humidity_scaling.description.items():
+                self.source.attrs[f"humidity_scaling_{k}"] = v
+        if isinstance(engine_efficiency, (int, float)):
+            self.source.attrs["engine_efficiency"] = engine_efficiency
+
         return self.source
 
 

pycontrails/models/tau_cirrus.py

@@ -16,6 +16,27 @@ TauCirrus = MetVariable(
 )
 
 
+def _geopotential_height(met: MetDataset) -> xr.DataArray:
+    """Extract geopotential height from MetDataset."""
+
+    # Attempt 1: Use geopotential height if available
+    try:
+        return met.data["geopotential_height"]
+    except KeyError:
+        pass
+
+    # Attempt 2: Use geopotential if available
+    try:
+        return met.data["geopotential"] / constants.g
+    except KeyError:
+        pass
+
+    # Attempt 3: Approximate geopotential height from altitude
+    # https://unidata.github.io/MetPy/latest/api/generated/metpy.calc.height_to_geopotential.html
+    altitude = met.data["altitude"]
+    return altitude * constants.radius_earth / (constants.radius_earth + altitude)
+
+
 def tau_cirrus(met: MetDataset) -> xr.DataArray:
     """Calculate the optical depth of NWP cirrus around each pressure level.
 
@@ -25,7 +46,6 @@ def tau_cirrus(met: MetDataset) -> xr.DataArray:
         A MetDataset with the following variables:
         - "air_temperature"
         - "specific_cloud_ice_water_content" or "ice_water_mixing_ratio"
-        - "geopotential_height" or "geopotential"
 
     Returns
     -------
@@ -41,10 +61,7 @@ def tau_cirrus(met: MetDataset) -> xr.DataArray:
     of the derivative.
     """
 
-    try:
-        geopotential_height = met.data["geopotential_height"]
-    except KeyError:
-        geopotential_height = met.data["geopotential"] / constants.g
+    geopotential_height = _geopotential_height(met)
 
     # TODO: these are not *quite* the same, though we treat them the same for now
     # ECMWF "specific_cloud_ice_water_content" is mass ice per mass of *moist* air

pycontrails/utils/types.py

@@ -29,7 +29,7 @@ ArrayScalarLike = TypeVar(
 )
 
 #: Datetime like input (datetime, pd.Timestamp, np.datetime64)
-DatetimeLike = TypeVar("DatetimeLike", datetime, pd.Timestamp, np.datetime64)
+DatetimeLike = TypeVar("DatetimeLike", datetime, pd.Timestamp, np.datetime64, str)
 
 
 def support_arraylike(

{pycontrails-0.47.3.dist-info → pycontrails-0.48.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycontrails
-Version: 0.47.3
+Version: 0.48.1
 Summary: Python library for modeling aviation climate impacts
 Author-email: Breakthrough Energy <py@contrails.org>
 License: Apache-2.0
@@ -68,7 +68,6 @@ Provides-Extra: ecmwf
 Requires-Dist: cdsapi >=0.4 ; extra == 'ecmwf'
 Requires-Dist: cfgrib >=0.9 ; extra == 'ecmwf'
 Requires-Dist: eccodes >=1.4 ; extra == 'ecmwf'
-Requires-Dist: ecmwflibs >=0.4 ; extra == 'ecmwf'
 Requires-Dist: ecmwf-api-client >=1.6 ; extra == 'ecmwf'
 Requires-Dist: netcdf4 >=1.6.1 ; extra == 'ecmwf'
 Requires-Dist: platformdirs >=3.0 ; extra == 'ecmwf'
@@ -87,6 +86,7 @@ Provides-Extra: goes
 Requires-Dist: cartopy >=0.22 ; extra == 'goes'
 Requires-Dist: gcsfs >=2022.3 ; extra == 'goes'
 Requires-Dist: h5netcdf >=1.2 ; extra == 'goes'
+Requires-Dist: aiohttp >=3.9.0b0 ; (python_version >= "3.12") and extra == 'goes'
 Provides-Extra: jupyter
 Requires-Dist: ipywidgets >=7.6 ; extra == 'jupyter'
 Requires-Dist: jupyterlab >=2.2 ; extra == 'jupyter'

{pycontrails-0.47.3.dist-info → pycontrails-0.48.1.dist-info}/RECORD

@@ -1,38 +1,38 @@
-pycontrails-0.47.3.dist-info/RECORD,,
-pycontrails-0.47.3.dist-info/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
-pycontrails-0.47.3.dist-info/WHEEL,sha256=ReeDLt7JoWNv8uQs9jcofmiBOX-MvocIgD8kJPMfr7M,110
-pycontrails-0.47.3.dist-info/NOTICE,sha256=gKI8DcN1WhiXB2SFRKDogcjONldGubTvBxiOYdC4CXU,1926
-pycontrails-0.47.3.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
-pycontrails-0.47.3.dist-info/METADATA,sha256=iaCOZze4xO5_ybVLLge25rWnUSO6pkMOG-pQKj2am2A,8391
-pycontrails/_version.py,sha256=qqnDrZB1EC8teGOBVANzHbFsAEVIn95eyJSqP3H52AU,413
-pycontrails/__init__.py,sha256=taA3bH-g7TcepRc88uS3ROyxi4O1hxXb3xat-gY1-m4,1963
+pycontrails-0.48.1.dist-info/RECORD,,
+pycontrails-0.48.1.dist-info/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
+pycontrails-0.48.1.dist-info/WHEEL,sha256=kDvY48Xu21LeV5YFIta_-l-0Q5d2H2VsRtRGyEH1GYU,110
+pycontrails-0.48.1.dist-info/NOTICE,sha256=gKI8DcN1WhiXB2SFRKDogcjONldGubTvBxiOYdC4CXU,1926
+pycontrails-0.48.1.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
+pycontrails-0.48.1.dist-info/METADATA,sha256=-DmCMG3RmYaxq1sX_lfwfKAv8gV7naDqpKTadgpTCcI,8423
+pycontrails/_version.py,sha256=SmV-QgndmfqQSl3EnRtXH5ks2pvcWLjNDwIDauQbrGk,413
+pycontrails/__init__.py,sha256=jQlqY1c5d9cKwN5ItqaQdJdhAWnQbHIk4TX6QI-CYww,1962
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pycontrails/core/vector.py,sha256=kICxXhgsSAi64R99_SYlzGuQQnjexa5Slv464YGB5kM,63979
-pycontrails/core/models.py,sha256=PJI86kj4cMfEZ6VZ87mvohx0YTRgTOEImGWxxecWCws,37533
+pycontrails/core/vector.py,sha256=dHWUnsJasIHldRUtHy00zhONJH1pV8fgJ6sKJHIJrNk,70400
+pycontrails/core/models.py,sha256=MtaujNXbUd0fWINWPqCIqOoWD6jv_sU649D7COavHpc,38306
 pycontrails/core/interpolation.py,sha256=C275gTrX-GJWfMm6gd2LiD-fKSHmMmDFrq--Pn5w_x4,23703
 pycontrails/core/fleet.py,sha256=Zxp23KPV2yugiY210wOLelI66HJLrjEDYa2y8JP1CmY,13278
-pycontrails/core/rgi_cython.cpython-310-darwin.so,sha256=aRJERuBoxNUpAw7v5bmb3iERkxKGlLmAkMJWdmI6iek,316125
-pycontrails/core/flight.py,sha256=vUMHyi6ysC9mx51s3AAdRY94nZYvKUjowKhQlPL8gF0,71261
+pycontrails/core/rgi_cython.cpython-310-darwin.so,sha256=_7-AtgF4pnD7X-khqsWPjyvSGUqOuxUvqvaXdmsol7Y,316125
+pycontrails/core/flight.py,sha256=QJCbVvY5P0JncjfxOHMme1uU3SPXAbs8hXHSRJKJCM4,71895
 pycontrails/core/fuel.py,sha256=u6u12Hatq81yvCF1Y1hEEu-Bp-cMi-Vsl7-5jTGXUks,4050
 pycontrails/core/polygon.py,sha256=RfiurNFrJWcJZuqIHRFCUncQEwIg0hutQrW9RLJVMY8,17315
-pycontrails/core/datalib.py,sha256=M7XxjGyJ3MkbL7WMX_Ph5QSLe1QQb-8VvAZbb3e6hRc,21715
+pycontrails/core/datalib.py,sha256=L_n0ns2Yspy2NswBJ5fIa5x8vJKdBxknsdWTYL14Jew,22495
 pycontrails/core/cache.py,sha256=FvE50YK8dddydozpQHe-XxE1tj8xT5SWcb2LtLj-dC0,28453
 pycontrails/core/__init__.py,sha256=4ZE7x1gMa_Q7GcgcWpPP9fQ-sTulCXWmMjsCJ0odakY,840
 pycontrails/core/flightplan.py,sha256=7BwYPPo4QfqCIWzBwXD848xg34Ggza4ldi4VUogWVYQ,7643
-pycontrails/core/met.py,sha256=UAGlRE5VLfT4uc4Ellw7BAQoYGGNJGsoxVVv_-2A4fc,84984
+pycontrails/core/met.py,sha256=q1ZyinJ5pzin111ALRqruJV8b1TfoLKq5C5MZTrGDJc,89239
 pycontrails/core/aircraft_performance.py,sha256=8Ig0vWMIe_EDOK4KUhOlzzjkmbvpXz6z0_0f_xZCacI,22149
 pycontrails/core/airports.py,sha256=5D0VF9DxleQlVOmMW-P8_fVVkob-aB3doO1Co2XNFss,6766
-pycontrails/core/met_var.py,sha256=a6LBiX_W04q1xWNumYmDiSbZftfbtP9FPJl2jLpmZGs,9193
-pycontrails/core/coordinates.py,sha256=b7D2lknnnwh8rBSla9M3ojqRYiASAOrVv0OAFD8xpDw,5078
+pycontrails/core/met_var.py,sha256=zyXWI_9dRS4FfH1Io_k0YcIxZIsp8y4YPiC_Oayi_gs,9195
+pycontrails/core/coordinates.py,sha256=ALGzFXjr4poFsqflg8D0kzUTC5bBjsVcXwiHfEsw7vs,5098
 pycontrails/datalib/goes.py,sha256=2JQ8C3iUtSl6hDjVivv4VB3oCRXxuT3ciB0OCFF2lIE,26150
 pycontrails/datalib/__init__.py,sha256=s5b8W6scXgespKZjPcaC-8jyLd3FqZqN0BZccLxaGuE,237
-pycontrails/datalib/ecmwf/era5.py,sha256=_SLdr6WsH9RaAgflwPnYaYvK8N36uWmmjiC8AX0QhoY,18612
-pycontrails/datalib/ecmwf/hres.py,sha256=vPKGHU1ePe1KdDjvNdiY6qJ-7NOBJ_-HpizGNujAlxA,29844
+pycontrails/datalib/ecmwf/era5.py,sha256=OteEGx3oGrYeqHwtZc-3JtJz1Bz0dzh6uT4GHEQfabM,18318
+pycontrails/datalib/ecmwf/hres.py,sha256=lGp75SmS4GfLkppj7LiCcU1OXNA0_cP5mbun-AkdMok,28187
 pycontrails/datalib/ecmwf/variables.py,sha256=akqjUS3WKnSzV1Y0KkHLylH7QByvitc3wo8NBFeSNew,8714
 pycontrails/datalib/ecmwf/__init__.py,sha256=F9a-iRz27nmVuQpMUwx5hjSCW95KnRmsHsa7m1_T86Y,1108
-pycontrails/datalib/ecmwf/common.py,sha256=PutZoa3cmY8CZ8T4vCArx4xHLOYWwJt_L06cHs0NssU,5671
-pycontrails/datalib/ecmwf/ifs.py,sha256=ldffFiM7cDZGe5Llc4IHLFqy5sSZJrmCpJspbt_Rnj4,10404
-pycontrails/datalib/gfs/gfs.py,sha256=hIpMX2GBX3y3SXyodwDN3u-vx0mK9Ig7FTWOtWyy_yA,23236
+pycontrails/datalib/ecmwf/common.py,sha256=UMlmsGn_54RNNRezwRbqP9zqiBPHhYp-gBHDCn-9Ofc,3549
+pycontrails/datalib/ecmwf/ifs.py,sha256=t8MAZNGIe02T19A7ggeXUpxBiYjm-VPoeneoaRVtjBw,10594
+pycontrails/datalib/gfs/gfs.py,sha256=PL1ExmhKK3eKwQ4HZgdXMFKRidpg-JBDQuaSPfZeXn4,21571
 pycontrails/datalib/gfs/variables.py,sha256=s6rKyFdDA8E0Jz8X4twM7mgq5zhRGlk5qTedItyqoY8,2860
 pycontrails/datalib/gfs/__init__.py,sha256=tWxgqmlW8Uo07J-3fBTXPrteatzTka9mSXomhWy3NVA,684
 pycontrails/datalib/spire/spire.py,sha256=dmtynQjeAk1b-3mgdPGEyon770oBcEm-_jLBoaBDiH8,25321
@@ -43,18 +43,18 @@ pycontrails/ext/empirical_grid.py,sha256=pAa-YvbP0OCnE--2WvPbqhQo8B6NWeSFGgcFXsY
 pycontrails/ext/bada.py,sha256=j4Tj7oWSV_6UxYYa9_OjC1yTVzJMQdNRDI4aUQam_xM,1063
 pycontrails/utils/iteration.py,sha256=UjMn2FRDyC0A7q_MqKNpqqeNZm-lA23Ws-KV7zFzAl4,292
 pycontrails/utils/__init__.py,sha256=Gt_57sBgfliFSxx9sDpuchykFDxmM11Wg9xAeSqPcnI,32
-pycontrails/utils/types.py,sha256=lWte6uf_nnmxJPqNK3n9Ve8AK_8TLorbX0f3DLCw3ZM,4564
+pycontrails/utils/types.py,sha256=UuPBCLeXCGYCde5q4AvUGysDBGi2jRiPWUKbMRTbs_E,4569
 pycontrails/utils/temp.py,sha256=6BlJ5NaQpACyL-n3FuqfscFb9Mfbgvs72BwWfSzBfmU,1100
 pycontrails/utils/json.py,sha256=zB_23_mqE39G231sQ_XXmxpQQ9pGjIGQCPJ2JaknRrY,5990
 pycontrails/utils/dependencies.py,sha256=LBKnhlZHTKDOGFr3J17cnfbQbBtO3uGkKBVoOIhW01s,2488
 pycontrails/models/pcc.py,sha256=yWi0TochaCWCgrb68dUad9xPMqysIRa2hr6VT8PvxL4,11286
-pycontrails/models/tau_cirrus.py,sha256=DZABYvUFxBZxWS8EZTXCYu4hdgPX3TLSQ1JSrSsIrjg,4498
+pycontrails/models/tau_cirrus.py,sha256=yNYw4ukT68w2ATGFZr3p8AZxB6A2xufXQq7XP2U51y0,5026
 pycontrails/models/__init__.py,sha256=dQTOLQb7RdUdUwslt5se__5y_ymbInBexQmNrmAeOdE,33
-pycontrails/models/issr.py,sha256=Uly0b8seOuWxYxDmnZehdeiggGKho_TxL4cTA56VYFQ,7522
-pycontrails/models/sac.py,sha256=YQJE9lo0dheodLJbdQRZinrUZSm7_0lvQ5Hm55w1sX0,16177
-pycontrails/models/accf.py,sha256=6CVluLj1qOPe_N6uYAWa_28MIA4EQk6sbJyP9Y88gSY,12567
+pycontrails/models/issr.py,sha256=nfNJHKGyVEwkBun3u1kjR0WVPLK2zrdPjLGBnK5MWMs,7340
+pycontrails/models/sac.py,sha256=uaupJine1s9ad5YyTCHpK6ixk6IZYtxDHhxHviMj2Y8,16075
+pycontrails/models/accf.py,sha256=20XWID_6aoFLDOfanf5ncay_azPbZSA2NoowJSZbM20,12559
 pycontrails/models/dry_advection.py,sha256=_HJA02GPjlJH2OKhX3BAvQWJX0iV-bOu57hWPl2Ue60,16145
-pycontrails/models/pcr.py,sha256=8xddW6jgR3hmM43nl5hWAl22rRXUQZbuLQKSLwzMH-E,5867
+pycontrails/models/pcr.py,sha256=veI1gtcYLZB9EUmp8siAI-WOIhxPuftsNMIPKrM-7gI,5463
 pycontrails/models/emissions/__init__.py,sha256=N_EE768TNRDbdmXaxly2Pwun7UmVBTVPc4k89VBz5ys,478
 pycontrails/models/emissions/ffm2.py,sha256=8JOW0tx9X5SmyEmW-b_9Xhg-OwGmKDfKbCj1_SDPCmY,11996
 pycontrails/models/emissions/emissions.py,sha256=JTdL2BXU3xekU3U5uc2Kg99F7xeQ57hyHv_1PxlX17A,47264
@@ -67,11 +67,11 @@ pycontrails/models/humidity_scaling/__init__.py,sha256=nqsab_j9BCwMbTfCn4BjXMdhI
 pycontrails/models/humidity_scaling/quantiles/era5-quantiles.pq,sha256=tfYhbafF9Z-gGCg6VQ1YBlOaK_01e65Dc6s9b-hQ6Zo,286375
 pycontrails/models/cocip/radiative_forcing.py,sha256=_dJ6_OM4fBvmhgL6MoDObhfTAUEXx-JzKqb5htYe1H8,44799
 pycontrails/models/cocip/wind_shear.py,sha256=Pr6ZBMnuWK380uzX2mSx0wkNXnufuCjOmV5vpUStRv0,3852
-pycontrails/models/cocip/cocip.py,sha256=X7aroA1ijOvY4Wz53XJW3L0D4_L0Sssvi4pxcqirxQU,88836
+pycontrails/models/cocip/cocip.py,sha256=AMA5I_eR3m959Gfh7VXDy1L9laernIQ_PTV2Kdp3HCc,91752
 pycontrails/models/cocip/output_formats.py,sha256=UKzVc2R4Ij8uAsJbOFz1O9SZo9N5-mG0YfBLI6e_SZA,77118
 pycontrails/models/cocip/__init__.py,sha256=7Wy_CnmVqg_Gpg2UhIlisJOJ3naL6c5BBzTSJqdbiM4,902
-pycontrails/models/cocip/cocip_params.py,sha256=Dt5UJNd9yo0Pe_qLyQRpd2_1npA9ORZHK6tpmfy73lo,10531
-pycontrails/models/cocip/wake_vortex.py,sha256=6_JJvH01988nSJPSpUyg1TyDKr8qWKy6hlbU3iBpMsU,13319
+pycontrails/models/cocip/cocip_params.py,sha256=rvOvE028yEs4H0WEPRyYx2kk8PDjvPmNkk43wUu-YRM,10295
+pycontrails/models/cocip/wake_vortex.py,sha256=HclCU7CuNK_OkkhinWvZB5ipucyGnEsJ3q-_4E6bC5c,13314
 pycontrails/models/cocip/cocip_uncertainty.py,sha256=wJ43NJr3YZX92GiMhY6LUVni9qbsqKg0duCRSS_r_mw,11782
 pycontrails/models/cocip/radiative_heating.py,sha256=PngrHriQDSX1iDKu1v2g9NPRe4w6eGi6123xJD6itz8,18712
 pycontrails/models/cocip/contrail_properties.py,sha256=yMqDbAg751orkqPSKlUlnItsoa9JC8lcfxzeoGc8yEk,56007
@@ -83,7 +83,7 @@ pycontrails/models/ps_model/static/ps-aircraft-params-20230517.csv,sha256=sh6uNM
 pycontrails/models/cocipgrid/cocip_grid_params.py,sha256=DiKWJIDkYmitg0aW0hZqOe-8eftXsE2PrxdpS9tMnOo,6233
 pycontrails/models/cocipgrid/__init__.py,sha256=ar6bF_8Pusbb-myujz_q5ntFylQTNH8yiM8fxP7Zk30,262
 pycontrails/models/cocipgrid/cocip_time_handling.py,sha256=TSuMU06F09EaY9DYDJVpuGiqDVlV6tteGajjfPUb1oE,13869
-pycontrails/models/cocipgrid/cocip_grid.py,sha256=6RBe8YadOUpTgGQNT6zNdrIdTyfseW0joMUqmxtY0IQ,84060
+pycontrails/models/cocipgrid/cocip_grid.py,sha256=HpUFNxlAJFMU58xgA0bnGoAqHVWXRBWIoIcKlfmG9HM,83904
 pycontrails/physics/geo.py,sha256=zc5D35pNQJ2UDTOJLTGTcf2mJRnNjzg4NJm1BzQoW2U,30160
 pycontrails/physics/units.py,sha256=7aFb4NVc0EIOyIU-fOmVHAIWMM3_AfqmEliUPWW0T64,12235
 pycontrails/physics/constants.py,sha256=fFDMpXMlldE6c5RbjaIn4UqGpXvX32mLuCG0RnxmtHE,2990

{pycontrails-0.47.3.dist-info → pycontrails-0.48.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.41.2)
+Generator: bdist_wheel (0.41.3)
 Root-Is-Purelib: false
 Tag: cp310-cp310-macosx_11_0_arm64