pycontrails 0.54.4__cp310-cp310-win_amd64.whl → 0.54.6__cp310-cp310-win_amd64.whl

pycontrails/models/emissions/emissions.py

@@ -19,7 +19,7 @@ from pycontrails.core.flight import Flight
 from pycontrails.core.fuel import Fuel, SAFBlend
 from pycontrails.core.interpolation import EmissionsProfileInterpolator
 from pycontrails.core.met import MetDataset
-from pycontrails.core.met_var import AirTemperature, SpecificHumidity
+from pycontrails.core.met_var import AirTemperature, MetVariable, SpecificHumidity
 from pycontrails.core.models import Model, ModelParams
 from pycontrails.core.vector import GeoVectorDataset
 from pycontrails.models.emissions import black_carbon, ffm2
@@ -75,7 +75,7 @@ class Emissions(Model):
 
     name = "emissions"
     long_name = "ICAO Emissions Databank (EDB)"
-    met_variables = AirTemperature, SpecificHumidity
+    met_variables: tuple[MetVariable, ...] = AirTemperature, SpecificHumidity
     default_params = EmissionsParams
 
     source: GeoVectorDataset

pycontrails/models/humidity_scaling/humidity_scaling.py

@@ -654,7 +654,7 @@ def histogram_matching(
         as a numpy array with the same shape and dtype as ``era5_rhi``.
     """
     if level_type not in ["pressure", "model"]:
-        msg = f"Invalid 'level_type' value '{level_type}'. " "Must be one of ['pressure', 'model']."
+        msg = f"Invalid 'level_type' value '{level_type}'. Must be one of ['pressure', 'model']."
         raise ValueError(msg)
     df = _load_quantiles(level_type)
     iagos_quantiles = df[("iagos", "iagos")]

pycontrails/models/issr.py

@@ -10,7 +10,7 @@ import numpy as np
 import pycontrails
 from pycontrails.core.flight import Flight
 from pycontrails.core.met import MetDataset
-from pycontrails.core.met_var import AirTemperature, SpecificHumidity
+from pycontrails.core.met_var import AirTemperature, MetVariable, SpecificHumidity
 from pycontrails.core.models import Model, ModelParams
 from pycontrails.core.vector import GeoVectorDataset
 from pycontrails.models.humidity_scaling import HumidityScaling
@@ -70,7 +70,7 @@ class ISSR(Model):
 
     name = "issr"
     long_name = "Ice super-saturated regions"
-    met_variables = AirTemperature, SpecificHumidity
+    met_variables: tuple[MetVariable, ...] = AirTemperature, SpecificHumidity
     default_params = ISSRParams
 
     @overload

pycontrails/models/pcc.py

@@ -186,8 +186,7 @@ class PCC(Model):
 
             # issue recombining groups arises if "level" is in dims
             # convert "level" dimension to coordinate
-            b_crit_potential = b_crit_potential.squeeze("level")
-            return b_crit_potential
+            return b_crit_potential.squeeze("level")
 
         # apply calculation per pressure level
         return (

pycontrails/models/ps_model/ps_grid.py

@@ -19,7 +19,7 @@ from pycontrails.core.aircraft_performance import (
 from pycontrails.core.flight import Flight
 from pycontrails.core.fuel import JetA
 from pycontrails.core.met import MetDataset
-from pycontrails.core.met_var import AirTemperature
+from pycontrails.core.met_var import AirTemperature, MetVariable
 from pycontrails.core.vector import GeoVectorDataset
 from pycontrails.models.ps_model import ps_model, ps_operational_limits
 from pycontrails.models.ps_model.ps_aircraft_params import PSAircraftEngineParams
@@ -58,7 +58,7 @@ class PSGrid(AircraftPerformanceGrid):
 
     name = "PSGrid"
     long_name = "Poll-Schumann Aircraft Performance evaluated at arbitrary points"
-    met_variables = (AirTemperature,)
+    met_variables: tuple[MetVariable, ...] = (AirTemperature,)
     default_params = PSGridParams
 
     met: MetDataset

pycontrails/models/ps_model/ps_model.py

@@ -7,7 +7,7 @@ import functools
 import pathlib
 import sys
 from collections.abc import Mapping
-from typing import Any, NoReturn, overload
+from typing import Any
 
 if sys.version_info >= (3, 12):
     from typing import override
@@ -25,10 +25,9 @@ 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
+from pycontrails.core.met_var import AirTemperature, EastwardWind, MetVariable, NorthwardWind
 from pycontrails.models.ps_model import ps_operational_limits as ps_lims
 from pycontrails.models.ps_model.ps_aircraft_params import (
     PSAircraftEngineParams,
@@ -71,7 +70,7 @@ class PSFlight(AircraftPerformance):
 
     name = "PSFlight"
     long_name = "Poll-Schumann Aircraft Performance Model"
-    met_variables = (AirTemperature,)
+    met_variables: tuple[MetVariable, ...] = (AirTemperature,)
     optional_met_variables = EastwardWind, NorthwardWind
     default_params = PSFlightParams
 
@@ -118,35 +117,8 @@ 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: ...
-
-    @overload
-    def eval(self, source: None = ..., **params: Any) -> NoReturn: ...
-
     @override
-    def eval(self, source: Flight | None = None, **params: Any) -> Flight:
-        self.update_params(params)
-        self.set_source(source)
-        self.source = self.require_source_type(Flight)
-        self.downselect_met()
-        self.set_source_met()
-
-        # Calculate true airspeed if not included on source
-        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:
+    def eval_flight(self, fl: Flight) -> Flight:
         # Ensure aircraft type is available
         try:
             aircraft_type = fl.attrs["aircraft_type"]

pycontrails/models/ps_model/ps_operational_limits.py

@@ -390,7 +390,7 @@ def minimum_mach_num(
         )
         return amass_max - aircraft_mass
 
-    m = scipy.optimize.newton(
+    return scipy.optimize.newton(
         excess_mass,
         args=(
             air_pressure,
@@ -404,8 +404,6 @@ def minimum_mach_num(
         tol=1e-4,
     )
 
-    return m
-
 
 def maximum_mach_num(
     altitude_ft: ArrayOrFloat,
@@ -450,7 +448,7 @@ def maximum_mach_num(
         atyp_param.p_inf_co,
     )
 
-    max_mach = scipy.optimize.newton(
+    return scipy.optimize.newton(
         func=get_excess_thrust_available,
         args=(air_temperature, air_pressure, aircraft_mass, theta, atyp_param),
         x0=mach_num_op_lim,
@@ -458,8 +456,6 @@ def maximum_mach_num(
         tol=1e-4,
     ).clip(max=mach_num_op_lim)
 
-    return max_mach
-
 
 # ----------------
 # Fuel flow limits

pycontrails/models/tau_cirrus.py

@@ -45,7 +45,8 @@ def tau_cirrus(met: MetDataset) -> xr.DataArray:
     met : MetDataset
         A MetDataset with the following variables:
         - "air_temperature"
-        - "specific_cloud_ice_water_content" or "ice_water_mixing_ratio"
+        - "mass_fraction_of_cloud_ice_in_air", "specific_cloud_ice_water_content",
+          or "ice_water_mixing_ratio"
 
     Returns
     -------
@@ -64,15 +65,21 @@ def tau_cirrus(met: MetDataset) -> xr.DataArray:
     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
-    # GFS "ice_water_mixing_ratio" is mass ice per mass of *dry* air
+    # The generic "mass_fraction_of_cloud_ice_in_air" and ECMWF "specific_cloud_ice_water_content"
+    # are mass ice per mass of *moist* air,
+    # whereas GFS "ice_water_mixing_ratio" is mass ice per mass of *dry* air
     #
     # The method `cirrus_effective_extinction_coef` uses input of mass ice per mass of *dry* air,
-    # so the ECMWF data is not quite right.
-    try:
+    # so only the GFS data is exactly right.
+    if "mass_fraction_of_cloud_ice_in_air" in met.data:
+        ciwc = met.data["mass_fraction_of_cloud_ice_in_air"]
+    elif "specific_cloud_ice_water_content" in met.data:
         ciwc = met.data["specific_cloud_ice_water_content"]
-    except KeyError:
+    elif "ice_water_mixing_ratio" in met.data:
         ciwc = met.data["ice_water_mixing_ratio"]
+    else:
+        msg = "Could not find cloud ice variable"
+        raise KeyError(msg)
 
     beta_e = cirrus_effective_extinction_coef(
         ciwc,

pycontrails/physics/geo.py

@@ -516,7 +516,7 @@ def solar_constant(theta_rad: ArrayLike) -> ArrayLike:
         + (0.000077 * np.sin(theta_rad * 2))
     )
 
-    return constants.solar_constant * orbital_effect
+    return constants.solar_constant * orbital_effect  # type: ignore[return-value]
 
 
 def cosine_solar_zenith_angle(
@@ -662,7 +662,7 @@ def solar_declination_angle(theta_rad: ArrayLike) -> ArrayLike:
     :func:`cosine_solar_zenith_angle`
     """
     return (
-        0.396372
+        0.396372  # type: ignore[return-value]
         - (22.91327 * np.cos(theta_rad))
         + (4.02543 * np.sin(theta_rad))
         - (0.387205 * np.cos(2 * theta_rad))
@@ -729,7 +729,7 @@ def orbital_correction_for_solar_hour_angle(theta_rad: ArrayLike) -> ArrayLike:
     Tested against :cite:`noaaSolarCalculationDetails`
     """
     return (
-        0.004297
+        0.004297  # type: ignore[return-value]
         + (0.107029 * np.cos(theta_rad))
         - (1.837877 * np.sin(theta_rad))
         - (0.837378 * np.cos(2 * theta_rad))

{pycontrails-0.54.4.dist-info → pycontrails-0.54.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pycontrails
-Version: 0.54.4
+Version: 0.54.6
 Summary: Python library for modeling aviation climate impacts
 Author-email: Breakthrough Energy <py@contrails.org>
 License: Apache-2.0
@@ -49,8 +49,7 @@ Requires-Dist: pyarrow>=5.0; extra == "dev"
 Requires-Dist: pytest>=8.2; extra == "dev"
 Requires-Dist: pytest-cov>=2.11; extra == "dev"
 Requires-Dist: requests>=2.25; extra == "dev"
-Requires-Dist: ruff==0.8.0; extra == "dev"
-Requires-Dist: setuptools; extra == "dev"
+Requires-Dist: ruff>=0.9.0; extra == "dev"
 Provides-Extra: docs
 Requires-Dist: doc8>=1.1; extra == "docs"
 Requires-Dist: furo>=2023.3; extra == "docs"

{pycontrails-0.54.4.dist-info → pycontrails-0.54.6.dist-info}/RECORD

@@ -1,22 +1,22 @@
 pycontrails/__init__.py,sha256=NOLObVatChUoklxD_qM8rjDtzrYu1gpmurNWqBhPpUM,2074
-pycontrails/_version.py,sha256=xKxgcTEdq0NjYH6Hbq4pY-EOXx3T98XpNxO1vgFDJqU,429
+pycontrails/_version.py,sha256=fpB6PGg0QTJniUGkjeIPxIbiS3yN4-9wDXf5Ml7KyLE,429
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycontrails/core/__init__.py,sha256=kOAehIZBbvksSW3MuU2DfzsyeE4PaFnOTpYMeq2ZDPE,886
-pycontrails/core/aircraft_performance.py,sha256=nSIrsWsrP5muWtI805kR_shv6Um8QJMHVLCAMa1ycvk,27902
-pycontrails/core/airports.py,sha256=nGKXN3jOtzsDCaJZVFNO3e3w-U3lqMTz5Ww5jALiRJY,6984
+pycontrails/core/aircraft_performance.py,sha256=lXw-RRg96yfXnsWPR5q3ARV_RGp1c32ozfx0mkHlb1k,28688
+pycontrails/core/airports.py,sha256=b0ujvU1nyWr4a-qtNSigPo3s4K02xAeGcyTeeHFK4KU,6963
 pycontrails/core/cache.py,sha256=NnlElV4ejshgyU2LMf5BtZGqmr1kZOxwz1hAT2Lq1ok,28953
 pycontrails/core/coordinates.py,sha256=J5qjGuXgbLUw_U9_qREdgOaHl0ngK6Hbbjj3uw7FwNE,5565
-pycontrails/core/fleet.py,sha256=FHvyikLV0o4d0OXw4AQGXNK24v4ybS1gYSBae4FF_cg,16431
-pycontrails/core/flight.py,sha256=pZJy0N1EJZCqXFjZLfCMuFqGaA9mK4IUtaC-JvodS8I,82540
-pycontrails/core/flightplan.py,sha256=0ozSt3jqa62PZBjXnEDQLbZO1YORg3r2552RpRtkKZA,7555
+pycontrails/core/fleet.py,sha256=ddujPC79K975gWVk8NDskE79OZaUam8tPR9rONaT918,17192
+pycontrails/core/flight.py,sha256=dJ8t2BvM9C4fdmNZFQ9fHxRbcrhOP4KIJ6l0pYQZrsU,82830
+pycontrails/core/flightplan.py,sha256=bcDjmJ-UR1gtuOLgAkCsRnwjJrz_l3n0nVRuj4_d9EU,7555
 pycontrails/core/fuel.py,sha256=06YUDhvC8Rx6KbUXRB9qLTsJX2V7tLbzjwAfDH0R6l8,4472
-pycontrails/core/interpolation.py,sha256=CDuOi1wXUT0L_LhPthiptoPsTAcXV7OuQW9FHsWXutQ,26400
-pycontrails/core/met.py,sha256=9xAqkEGg4wKn6lBisvBl0AnMzr_xjG2Jx7-WMaTb0DQ,104252
-pycontrails/core/met_var.py,sha256=iLk8R2Yq2MCnc7_XJLUULqojBwe1seFp3jdaTm8T-BY,9490
-pycontrails/core/models.py,sha256=BVNsBL5vSKzJPZCN57v7BOfLtXufVlIBN8jFJHCuwM4,40984
+pycontrails/core/interpolation.py,sha256=-GC3T6yh3nMtt7JCawoYeCUnDNRY9GHhxhkRhhnntxE,26437
+pycontrails/core/met.py,sha256=JeTLNbFMv19MJk8N3kihLgt5vXlMHOj0AetO8rHtPgU,106497
+pycontrails/core/met_var.py,sha256=kBwk0twIfo4jWNo_L1vxwdB40YzuSjXhbLFxGUFSpfM,11913
+pycontrails/core/models.py,sha256=odpHsazdvF_tKNwNS3y1qU9L3dC0dGV2RA5XqU4BeYw,41004
 pycontrails/core/polygon.py,sha256=NZ4YBhdALidXYOPsSX1cwGQ022j-AXgbWIQg7LA-f-I,18593
-pycontrails/core/rgi_cython.cp310-win_amd64.pyd,sha256=XvWkW6tGK0APEng_hkHO183kPsyLlvu4diC0ygzaJvg,256000
-pycontrails/core/vector.py,sha256=SPG96XDzm3WLUsL-pbQFx3w8YPo-CVp6IgGIWgy5sl8,72239
+pycontrails/core/rgi_cython.cp310-win_amd64.pyd,sha256=smC_WpTwpbC8tvQiOWHF7nWfxxBSwFpl1XDAr01Sb_U,256000
+pycontrails/core/vector.py,sha256=T8YMtylYPmeHo3sanfgmZVSCPckoJTFg3Iq8apGBNIA,73445
 pycontrails/datalib/__init__.py,sha256=Q2RrnjwtFzfsmJ2tEojDCzDMkd8R0MYw4mQz3YwUsqI,381
 pycontrails/datalib/goes.py,sha256=eMo_A_Kxii3dTItp6_j6obvyT1NiGAr06RyYMuHZzd0,27327
 pycontrails/datalib/landsat.py,sha256=YrDpngF5HtvWFVwxN0FLFxCfZIEmeBMiifdkbH7fQTk,20263
@@ -25,20 +25,20 @@ pycontrails/datalib/spire.py,sha256=aW0wh5GDrszFb20ZMzmWKQ4uHbOCmHvVt9Sf4U3AyTI,
 pycontrails/datalib/_leo_utils/search.py,sha256=8JzT56ps3SH1W-5rwL8BWuxLLljwxa_5fjLAuZdL_Vg,8937
 pycontrails/datalib/_leo_utils/vis.py,sha256=0UDVcqMRqHmAORDV4Xyk-HVnTAjbOCf7KCpWm2ilTLE,1861
 pycontrails/datalib/_leo_utils/static/bq_roi_query.sql,sha256=r_gVjpoEvCcAJP56QlXaXzgfWPZdf-kYo3D316glJLU,266
-pycontrails/datalib/_met_utils/metsource.py,sha256=-Jhv02bUtqaB52Fy5w1O3AGStils1Qa9aDxRG57qwTQ,24867
+pycontrails/datalib/_met_utils/metsource.py,sha256=7QGqAt3FXmXnU7AfN-w6wkXzZKgpCS1WYfoTg5uhtZA,24865
 pycontrails/datalib/ecmwf/__init__.py,sha256=9EkfWlGki8LYt7ySKf87gS8RzZjAOxK2w87_Sok3CCo,2094
 pycontrails/datalib/ecmwf/arco_era5.py,sha256=PojAfT0N12SLcgiecZtHiN96sbRWwFx3PThrXIwSX5M,12782
 pycontrails/datalib/ecmwf/common.py,sha256=6fcZC_-3FvWJ3vtlZX89PiiS7-DSQhAOgxrLjwU4iW4,4138
-pycontrails/datalib/ecmwf/era5.py,sha256=W4qA-9UPIMXHZ86FymC5irgfx9l7a8Age3FbE2x6D40,19601
-pycontrails/datalib/ecmwf/era5_model_level.py,sha256=0uZiRFgj4dTvx4f92butomAof2yuMM-VY-SFnIovyNY,19919
+pycontrails/datalib/ecmwf/era5.py,sha256=TbZlOqn3fPmfvCUR1XrVBWxNgIBpSXgRx0S4M49TSeY,19506
+pycontrails/datalib/ecmwf/era5_model_level.py,sha256=NVquyG_3SzdmfoQl25Wvp4oB_pOe7K_AQOfNv7no14E,19844
 pycontrails/datalib/ecmwf/hres.py,sha256=k7VK1KUOopzTd0TrO5FYwFSSagArKq4q8oAyK3hNPso,29168
 pycontrails/datalib/ecmwf/hres_model_level.py,sha256=ghrN-z5bjV-ztv6L5KlGiCLlGR9ABbAe5k38CaARmLU,18121
-pycontrails/datalib/ecmwf/ifs.py,sha256=qCZHJPWs0Kxnmk--SX-ozNZf53Y3-NmbusX0olfsEjE,11067
+pycontrails/datalib/ecmwf/ifs.py,sha256=a5QmXuihBNGx1eNN7EJGjR5dL9dO142nqkDSkPYGGlc,11048
 pycontrails/datalib/ecmwf/model_levels.py,sha256=noLSx45AHZ0rFPiUh3aK3iaEueHgsg6mG_AplHqHeU8,17431
 pycontrails/datalib/ecmwf/variables.py,sha256=49uzpkk9YV5OGBnq-Po5e3ig2JXi2i1ZtsOOEC-AQFI,10181
 pycontrails/datalib/ecmwf/static/model_level_dataframe_v20240418.csv,sha256=9u7CVA3QnPUmNLIWUkF5b9wFunczkvx1zSudwGmtOv8,9927
 pycontrails/datalib/gfs/__init__.py,sha256=DGd8twOXwRZZhHx5muc9SJT-YET1KB599kS45_x3IbY,712
-pycontrails/datalib/gfs/gfs.py,sha256=Maxz7n8IbOWjTWWBQ-UTuRiN_25DGiKzIPTfMdNPFjY,23074
+pycontrails/datalib/gfs/gfs.py,sha256=qh_nMDaSqkGs-YgibsmDWWXGtn6HY7EUqv5tve7IK5s,23055
 pycontrails/datalib/gfs/variables.py,sha256=gmw5cs8RAeB-s9kCbnuKFp1K2SqNbc0lNR-JqhcenZY,3239
 pycontrails/ext/bada.py,sha256=RmLDMaZQody8XUR-1I_5rPJqoz6eIq63IpDTcuJweoc,1133
 pycontrails/ext/cirium.py,sha256=zRPVBBWwocZKkX3XhonSBf54x7P_xnjRcA7psI0Kqnw,429
@@ -46,52 +46,52 @@ pycontrails/ext/empirical_grid.py,sha256=mveQltokaGeQcxxbdMSLQ6wQ14oh3XX5dfzjWaF
 pycontrails/ext/synthetic_flight.py,sha256=6w2pC7DpbdHi3J1w5BL-8j3xCzYdP8N7FQ8dsMfDBpw,17226
 pycontrails/models/__init__.py,sha256=TKhrXe1Pu1-mV1gctx8cUAMrVxCCAtBkbZi9olfWq8s,34
 pycontrails/models/accf.py,sha256=YlRo5aDeHSSYE7IRHbNW4dsWTACCkVaYsqGbgM-AqlI,14090
-pycontrails/models/dry_advection.py,sha256=rjjd7-KjC98JVbB-ne13o41TuxvJeQ9d6IrrQI2XBuI,17377
-pycontrails/models/issr.py,sha256=QXkTIpj13u9qG5BeAaMVdtWbN8hNSsnGLL5hIzU5ZMM,7550
-pycontrails/models/pcc.py,sha256=M5KhtRgdCP9pfDFgui7ibbijtRBTjx3QOJL_m1tQYfs,11443
+pycontrails/models/dry_advection.py,sha256=vDPjNrECefMvRVnfkhWCWbYQPpB2YYhGUvLiIuW10TM,19727
+pycontrails/models/issr.py,sha256=J6mh4pze31XpD2_zD9ujzYPXsZFrmSwNcRORCcLoOVI,7588
+pycontrails/models/pcc.py,sha256=7k8kICqDeZ99O2n2Zpnu7EFNGjEpPka_9cu9nrmP44s,11394
 pycontrails/models/pcr.py,sha256=G_0yR5PsCMeJBP6tZFi3M7A6Wcq8s71UvosdA7ozUkI,5502
 pycontrails/models/sac.py,sha256=LhEwexJZnkxitj-x5eNVSCDGdkoCdj8Zh_I0WB8FWOY,16405
-pycontrails/models/tau_cirrus.py,sha256=7wvZrgT9Da8A4SzIlLsE1zIRoJRNglmR2yKsMCAjxaQ,5556
+pycontrails/models/tau_cirrus.py,sha256=G39eEUYdPMC0AEW4msC1pxRvzLLdgw9Sfzzzi_jB5Sw,5959
 pycontrails/models/apcemm/__init__.py,sha256=dDsRW3V6jjzKDd43Yoyc74m_Om1fccvftZgp3OFdAYE,183
-pycontrails/models/apcemm/apcemm.py,sha256=WpJ6TwteIBnYXq5QwoklBEQZBK4Ot7It993JWQQl7JY,40982
+pycontrails/models/apcemm/apcemm.py,sha256=tbG57Vro7_vXwqE0YpXrimPTtvAXsurti2eBAVWGe-Y,40958
 pycontrails/models/apcemm/inputs.py,sha256=zHRSWVVlwYw6ms7PpC0p0I-xFsRDUVY9eDZ1g95Uf8U,6811
-pycontrails/models/apcemm/utils.py,sha256=6pKQbS5EAzTnI_edVtUvGrzM0xwNq1t9MBGgCRJtg_0,17531
+pycontrails/models/apcemm/utils.py,sha256=gew1MGtuOwKy0CTVKomJ_Lmuhmy4JxsopkughzCeB4o,17519
 pycontrails/models/apcemm/static/apcemm_yaml_template.yaml,sha256=A3H_FWVOtqkZhG91TWLdblMKaLWIcjRMsKqkfTN6mB4,6928
 pycontrails/models/cocip/__init__.py,sha256=v8JJN_Jx3_tOHaqGaQG-Es7srEAtSCHI7-gCEnM-n-s,991
-pycontrails/models/cocip/cocip.py,sha256=IEinGyJ8yV2-BGNv6zJp0Txcps2kO3GlFGmeFgE8mL8,102758
+pycontrails/models/cocip/cocip.py,sha256=CtZWQWAAuOhyn3KVgkvoQGYYRNGP__8G4HR6c-irYe8,105086
 pycontrails/models/cocip/cocip_params.py,sha256=9q6teJgXKxEqWLhA_itMG-A8OeLIFb7XvEUUf7eTjdE,12631
 pycontrails/models/cocip/cocip_uncertainty.py,sha256=fKQVAg-HyviegwNauxLgX9wdA0cRpK8XAOCNjZZIRWI,12528
 pycontrails/models/cocip/contrail_properties.py,sha256=jF7iXFmMQEpyI3DNkRa7NFs-unx5a3HmmX6xs9FSJDQ,57734
-pycontrails/models/cocip/output_formats.py,sha256=JwEpcagVSoyKihTR6pgPEBB0WJAwRwHxVkL2_xeQJLY,85958
+pycontrails/models/cocip/output_formats.py,sha256=WpuSYTZ221kYUQNgUZGssdZlMXMy2GeCCiU13pCaAyI,85975
 pycontrails/models/cocip/radiative_forcing.py,sha256=Zx7amTmIQHozuYyxfkryBJZVFDJws6a--By71TIMMIk,46297
 pycontrails/models/cocip/radiative_heating.py,sha256=PcOEkqRtQJNq7bxOoz1baBbVV2ku1UQRMrrQXXsRBwc,19504
 pycontrails/models/cocip/unterstrasser_wake_vortex.py,sha256=GBFtwCPslStlgJU81WgE7nkWHVfSJkxFrPgJ2nq4PJc,15081
 pycontrails/models/cocip/wake_vortex.py,sha256=i6P1UDxde_WPP8SAliPdiaVCdeFMRxCFR7_zKaoNlno,14911
 pycontrails/models/cocip/wind_shear.py,sha256=qhmP3RJ9SEjd-qnXcgRiYis9-apKGF-1d78z6N__tq8,3988
 pycontrails/models/cocipgrid/__init__.py,sha256=OYSdZ1Htbr_IP7N_HuOAj1Pa_KLHtdEeJfXP-cN-gnU,271
-pycontrails/models/cocipgrid/cocip_grid.py,sha256=ovBUx81oaeMzTqKlZGJUXwHRdm3q8iX3tofTWyKfuhA,96045
+pycontrails/models/cocipgrid/cocip_grid.py,sha256=8J7WeTyblaJo69yp6VSRVcic_Jrs1vITXL93jTWHY1o,93672
 pycontrails/models/cocipgrid/cocip_grid_params.py,sha256=ZpN00VEmeRYaeZhvSfVjnEjrgn6XdClf1eqJC8Ytcuw,6013
 pycontrails/models/emissions/__init__.py,sha256=phai3wH5VuUyfyVpu5vHOFI0jXSyoYSWvLTknS78xs0,499
 pycontrails/models/emissions/black_carbon.py,sha256=oIi-SxnRKdVDewyzqpA5eE4kzq5CJCtPcNcqrUh4Ito,20940
-pycontrails/models/emissions/emissions.py,sha256=0vvVtR5T3Hk5E5g5ORLgr1wsYgAutlAKXDB-Rhoq3JE,49006
+pycontrails/models/emissions/emissions.py,sha256=nj3dNXH2NXX4xotsbkt2_yVen4nAioSFFeqCu-9dL9w,49044
 pycontrails/models/emissions/ffm2.py,sha256=sWWzaV-5N2nNQlS0RxgKFwPzja5dehc99mfifTHW6pQ,12404
 pycontrails/models/emissions/static/default-engine-uids.csv,sha256=6e-0Fjbka1www4o2CNtw2pW-g0s_E7hZQ6vOaR84Q5Y,6456
 pycontrails/models/emissions/static/edb-gaseous-v29b-engines.csv,sha256=s-3_KGQyVoypXCHeQgsTDwdri-e3JVJn5SDxZo60m_s,128119
 pycontrails/models/emissions/static/edb-nvpm-v29b-engines.csv,sha256=MwLLrcATd38KPddTpHpMGBrZuA4I7he-1B5otTp4ar8,77533
 pycontrails/models/humidity_scaling/__init__.py,sha256=-xqDCJzKJx2nX6yl-gglHheQHWDhkvb8X7atbMJT2LA,1156
-pycontrails/models/humidity_scaling/humidity_scaling.py,sha256=NT0VtkrCAiQwaQMBqfHskNPDmCpEX2Qpm1faMDsiOmI,37800
+pycontrails/models/humidity_scaling/humidity_scaling.py,sha256=7s9EsWmHm02feXZOSB-sdnVJQ-wyTvtRwB-C9NqqiTQ,37797
 pycontrails/models/humidity_scaling/quantiles/era5-model-level-quantiles.pq,sha256=pShCvNUo0NYtAHhT9IBRuj38X9jejdlKfv-ZoOKmtKI,35943
 pycontrails/models/humidity_scaling/quantiles/era5-pressure-level-quantiles.pq,sha256=tfYhbafF9Z-gGCg6VQ1YBlOaK_01e65Dc6s9b-hQ6Zo,286375
 pycontrails/models/ps_model/__init__.py,sha256=fCGfdrJjK4K_EOODU8exmOFzedbABb3bMbuFi0gbrgc,571
 pycontrails/models/ps_model/ps_aircraft_params.py,sha256=xs6-bCAhhOgN-LRDa7rUuuJdYM-bjDAMABLRayVhYwo,13731
-pycontrails/models/ps_model/ps_grid.py,sha256=UUc7ena69z7h5PISa3a9-fyU074U7vgWWQF-aC_9WE8,26734
-pycontrails/models/ps_model/ps_model.py,sha256=quKoYFhfXjnUQQx-ePcNVmOmN6G_o91g6_Sobz3Hndw,34255
-pycontrails/models/ps_model/ps_operational_limits.py,sha256=qGT6_EP0v5Zn9_V5fnB309eyifZRzQFE1G5qmJiw4gU,17006
+pycontrails/models/ps_model/ps_grid.py,sha256=IhtCJF5FxJM7xYcc6jwPog91owe3dfkMwsOh6UTcrqI,26772
+pycontrails/models/ps_model/ps_model.py,sha256=-l2sEWzyjaoXNjvATKoC_vqbNYfex4XpgXSzDAf03zQ,33261
+pycontrails/models/ps_model/ps_operational_limits.py,sha256=95evggmtPbnr3kqNgqfOEJhbupK_D_ksONPmTm0k2B8,16966
 pycontrails/models/ps_model/static/ps-aircraft-params-20240524.csv,sha256=2RtIHwXRuMVAEfsefopm1m6ozHi8YciYUN3WTMpfoo4,25852
 pycontrails/models/ps_model/static/ps-synonym-list-20240524.csv,sha256=MLXOeVjC5FQULGNc6rn-_BdSURJAkJLMSDzPhC7OpDY,1141
 pycontrails/physics/__init__.py,sha256=AScCMSMSZjKxfL6mssdSLwcja1ml7MzREThQp5PLr9U,45
 pycontrails/physics/constants.py,sha256=SWG7H7eJCvQXfUR3qS6_fYzNvEeRZga50qT2RuaHoYU,3262
-pycontrails/physics/geo.py,sha256=k7fuEhWsV-qGn37wZklnlQpmoalhBN12Ygm_kN6dUFo,37371
+pycontrails/physics/geo.py,sha256=WyZKLj-63yGCfjePEhiwxLp26be44VCdEiisu9tXtzE,37461
 pycontrails/physics/jet.py,sha256=z_MNEU7BVcy0sTtRbpKooS0Ynf4Ah5kVMDoLIeO-4Fg,31274
 pycontrails/physics/thermo.py,sha256=HAcg2wmNXW-vJbOF2kOXBoUyJiAosPY0nRWeM37otdY,13238
 pycontrails/physics/units.py,sha256=P6j9v2-29TDoy2JE_FQlcXH-2mlihVulSP1wBLqZY44,12765
@@ -103,9 +103,9 @@ pycontrails/utils/iteration.py,sha256=En2YY4NiNwCNtAVO8HL6tv9byBGKs8MKSI7R8P-gZy
 pycontrails/utils/json.py,sha256=Pqashwoupuf_GfrrSfHclwug9Hg-kYQ4WNxEqay_0Rc,6083
 pycontrails/utils/temp.py,sha256=5XXqQoEfWjz1OrhoOBZD5vkkCFeuq9LpZkyhc38gIeY,1159
 pycontrails/utils/types.py,sha256=hPqUwaeRLgga69nj7LVbPojPg1k7pUSvYzFlGAiPKIM,5154
-pycontrails-0.54.4.dist-info/LICENSE,sha256=HVr8JnZfTaA-12BfKUQZi5hdrB3awOwLWs5X_ga5QzA,10353
-pycontrails-0.54.4.dist-info/METADATA,sha256=lSgEm44TBaerh5-wlgcdIVWvGv7EN1QSc6Fm2mmUCb0,9335
-pycontrails-0.54.4.dist-info/NOTICE,sha256=QG0F9avpssHcmlEMlLbndVRGqmB7ATPIk16uDVmTlVE,1972
-pycontrails-0.54.4.dist-info/WHEEL,sha256=tcd-HDpskugT8GYYKyyid0lOlzoZtZdWwcrj5ormtfo,101
-pycontrails-0.54.4.dist-info/top_level.txt,sha256=dwaYXVcMhF92QWtAYcLvL0k02vyBqwhsv92lYs2V6zQ,23
-pycontrails-0.54.4.dist-info/RECORD,,
+pycontrails-0.54.6.dist-info/LICENSE,sha256=HVr8JnZfTaA-12BfKUQZi5hdrB3awOwLWs5X_ga5QzA,10353
+pycontrails-0.54.6.dist-info/METADATA,sha256=xLlw2rgL4SdWGJz7X5z5AwKSe_-kgycaMUlYsEorXNo,9292
+pycontrails-0.54.6.dist-info/NOTICE,sha256=QG0F9avpssHcmlEMlLbndVRGqmB7ATPIk16uDVmTlVE,1972
+pycontrails-0.54.6.dist-info/WHEEL,sha256=rzGfZgUcGeKSgIHGYMuqg4xE4VPHxnaldXH6BG0zjVk,101
+pycontrails-0.54.6.dist-info/top_level.txt,sha256=dwaYXVcMhF92QWtAYcLvL0k02vyBqwhsv92lYs2V6zQ,23
+pycontrails-0.54.6.dist-info/RECORD,,

{pycontrails-0.54.4.dist-info → pycontrails-0.54.6.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: false
 Tag: cp310-cp310-win_amd64