pycontrails 0.39.6__tar.gz → 0.40.1__tar.gz

{pycontrails-0.39.6 → pycontrails-0.40.1}/.github/workflows/docs.yaml

@@ -18,23 +18,15 @@ on:
 env:
   PYCONTRAILS_CACHE_DIR: '${{ github.workspace }}/.cache/pycontrails'
 
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-
 # Allow one concurrent deployment
 concurrency:
   group: "pages"
   cancel-in-progress: true
 
+
 jobs:
   build:
     runs-on: ubuntu-latest
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
 
     steps:
     - name: OS Dependencies
@@ -83,6 +75,21 @@ jobs:
       with:
         path: 'docs/_build/html/'
 
+  deploy:
+    needs: build
+    runs-on: ubuntu-latest
+
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+
+    # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+    permissions:
+      contents: read
+      pages: write
+      id-token: write
+
+    steps:
     - name: Deploy to GitHub Pages
       id: deployment
-      uses: actions/deploy-pages@v1
+      uses: actions/deploy-pages@v2

pycontrails-0.40.1/.github/workflows/release.yaml

@@ -0,0 +1,109 @@
+# https://github.com/pypa/cibuildwheel/blob/main/examples/github-deploy.yml
+
+name: Release
+
+on:
+  release:
+    types:
+      - published
+    branches:
+      - main
+  
+  workflow_dispatch:
+
+jobs:
+  check-main-test-status:
+    runs-on: ubuntu-latest
+    steps:
+    - name: OS Dependencies
+      run: sudo apt-get install -y curl jq
+
+    - uses: actions/checkout@v3
+
+    - name: Check main test status
+      run: make main-test-status
+
+  build_wheels:
+    name: Build wheels on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    # https://cibuildwheel.readthedocs.io/en/stable/options/#testing
+    - name: Build wheels
+      uses: pypa/cibuildwheel@v2.12.1
+      env:
+        CIBW_BUILD: cp39-* cp310-* cp311-*
+        CIBW_SKIP: '*-win32 *-manylinux_i686 *-musllinux*'
+        CIBW_BUILD_VERBOSITY: 3
+        CIBW_ARCHS_MACOS: x86_64 arm64
+        CIBW_TEST_SKIP: '*-macosx_arm64'
+        # Completely isolate tests to prevent cibuildwheel from importing the
+        # source instead of the wheel. This happens when tests/__init__.py is read.
+        CIBW_TEST_EXTRAS: "complete,dev"
+        CIBW_TEST_COMMAND: >
+          mv {project}/pycontrails {project}/pycontrails-bak &&
+          python -m pytest {project}/tests -vv &&
+          mv {project}/pycontrails-bak {project}/pycontrails
+
+    - uses: actions/upload-artifact@v3
+      with:
+        path: ./wheelhouse/*.whl
+
+  build_sdist:
+    name: Build source distribution
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+
+    - name: Build sdist
+      run: pipx run build --sdist
+
+    - uses: actions/upload-artifact@v3
+      with:
+        path: dist/*.tar.gz
+
+  upload_pypi_test:
+    needs: [build_wheels, build_sdist]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/download-artifact@v3
+      with:
+        name: artifact
+        path: dist
+
+    - name: Publish distribution 📦 to Test PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        user: __token__
+        password: ${{ secrets.TEST_PYPI_API_TOKEN }}
+        repository-url: https://test.pypi.org/legacy/
+        verbose: true
+        verify-metadata: true
+
+  upload_pypi:
+    if: ${{ github.event_name == 'release' }}
+    needs: [build_wheels, build_sdist, check-main-test-status]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/download-artifact@v3
+      with:
+        name: artifact
+        path: dist
+
+    - name: Publish distribution 📦 to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        user: __token__
+        password: ${{ secrets.PYPI_API_TOKEN }}
+        verbose: true
+        verify-metadata: true

{pycontrails-0.39.6 → pycontrails-0.40.1}/.github/workflows/test.yaml

@@ -37,7 +37,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]  # add 'windows-latest'
+        os: [ubuntu-latest, windows-latest]
         pyversion: ['3.9', '3.10', '3.11']
     runs-on: ${{ matrix.os }}
 
@@ -82,34 +82,48 @@ jobs:
         mkdir -p ${{ env.BADA_CACHE_DIR }}
         gcloud storage cp -r gs://contrails-301217-bada/bada/bada3 ${{ env.BADA_CACHE_DIR }}
         gcloud storage cp -r gs://contrails-301217-bada/bada/bada4 ${{ env.BADA_CACHE_DIR }}
-        ls -la ${{ env.BADA_CACHE_DIR }}
+        ls -l ${{ env.BADA_CACHE_DIR }}
 
     - name: Install pycontrails (dev)
-      run: make dev-install
+      run: |
+        pip install -U pip wheel
+        pip install -e .[dev,docs,ecmwf,gcp,gfs,jupyter,vis,zarr] --verbose
+
+    # In latest-windows, redirecting stdout to a file uses utf-16 encoding
+    # This gives an error when ssh tries to read the key
+    # Instead don't pre-create the known_hosts file
+    - name: Install pycontrails-bada - windows
+      if: ${{ matrix.os == 'windows-latest' }}
+      run: |
+        mkdir -p $HOME/.ssh/
+        gcloud secrets versions access latest --secret="contrails-301217-github-ssh-key" --out-file="$HOME/.ssh/id_rsa"
+        pip install "pycontrails-bada @ git+ssh://git@github.com/contrailcirrus/pycontrails-bada.git"
+      env:
+        GIT_SSH_COMMAND: "ssh -o StrictHostKeyChecking=no"
 
-    - name: Install pycontrails-bada extension
+    - name: Install pycontrails-bada - linux
+      if: ${{ matrix.os == 'ubuntu-latest' }}
       run: |
-        mkdir -p ~/.ssh/ && ssh-keyscan github.com > ~/.ssh/known_hosts
-        gcloud secrets versions access latest --secret="contrails-301217-github-ssh-key" > ~/.ssh/id_rsa
-        chmod 600 ~/.ssh/id_rsa
+        mkdir -p $HOME/.ssh/
+        ssh-keyscan github.com > $HOME/.ssh/known_hosts
+        gcloud secrets versions access latest --secret="contrails-301217-github-ssh-key" > $HOME/.ssh/id_rsa
+        chmod 600 $HOME/.ssh/id_rsa
         pip install "pycontrails-bada @ git+ssh://git@github.com/contrailcirrus/pycontrails-bada.git"
 
     - name: Show environment
       run: |
         pwd
-        ls -la
-        which python
+        ls -l .
+        ls -l pycontrails
         python --version
-        which mypy
         mypy --version
-        python -m pip list
-        python -m pip check
+        pip list
 
     - name: QC & Test
       run: |
-        make ruff
-        make mypy
-        make black-check
-        make pydocstyle
-        make pytest
-
+        pip check
+        black pycontrails --check
+        ruff pycontrails tests
+        mypy pycontrails
+        pydocstyle pycontrails --verbose
+        pytest tests/unit -vv

{pycontrails-0.39.6 → pycontrails-0.40.1}/.gitignore

@@ -22,6 +22,9 @@ sdist
 .eggs
 venv
 _version.py
+rgi_cython.c
+rgi_cython*.so
+rgi_cython*.pyd
 
 # test
 .mypy_cache

{pycontrails-0.39.6 → pycontrails-0.40.1}/CHANGELOG.md

@@ -1,13 +1,52 @@
 
 # Changelog
 
+## v0.40.1
+
+#### Fixes
+
+- Use [oldest-supported-numpy](https://pypi.org/project/oldest-supported-numpy/) for building pycontrails wheels. This allows pycontrails to be compatible with environments that use old versions of numpy. The [pycontrails v0.40.0 wheels](https://pypi.org/project/pycontrails/0.40.0/#files) are not compatible with numpy 1.22.
+- Fix a unit test (`test_dtypes.py::test_issr_sac_grid_output`) that occasionally hangs.
+
+## v0.40.0
+
+Support scipy 1.10, improve interpolation performance, and fix many windows issues.
+
+#### Features
+
+- Improve interpolation performance by cythonizing linear interpolation. This extends the approach taken in [scipy 1.10](https://github.com/scipy/scipy/pull/17291). The pycontrails [cython routines](pycontrails/core/rgi_cython.pyx) allow for both float64 and float32 grids via cython fused types (the current scipy implementation assumes float64). In addition, interpolation up to dimension 4 is supported (the scipy implementation supports dimension 1 and 2).
+- Officially support [scipy 1.10](https://scipy.github.io/devdocs/release/1.10.0-notes.html).
+- Officially test on windows in the GitHub Actions CI.
+- Build custom wheels for python 3.9, 3.10, and 3.11 for the following platforms:
+  - Linux (x86_64)
+  - macOS (arm64 and x86_64)
+  - Windows (x86_64)
+
+#### Breaking changes
+
+- Change `MetDataset` and `MetDataArray` conventions: underlying dimension coordinates are automatically promoted to float64.
+- Change how datetime arrays are converted to floating values for interpolation. The new approach introduces small differences compared with the previous implementation. These differences are significant enough to see relative differences in CoCiP predictions on the order of 1e-4.
+
+#### Fixes
+
+- Unit tests no longer raise errors when the `pycontrails-bada` package is not installed. Instead, some tests are skipped.
+- Fix many numpy casting issues encountered on windows.
+- Fix temp file issues encountered on windows.
+- Officially support changes in `xarray` 2023.04 and `pandas` 2.0.
+
+#### Internals
+
+- Make the `interpolation` module more aligned with [scipy 1.10 enhancements](https://docs.scipy.org/doc/scipy/release.1.10.0.html#scipy-interpolate-improvements) to the `RegularGridInterpolator`. In particular, grid coordinates now must be float64.
+- Use [cibuildwheel](https://cibuildwheel.readthedocs.io/en/stable/) to build wheels for Linux, macOS (arm64 and x86_64), and Windows on [release](.github/workflows/release.yaml) in Github Actions. Allow this workflow to be triggered manually to test the release process without actually publishing to PyPI.
+- Simplify interpolation with pre-computed indices (invoked with the model parameter `interpolation_use_indices`) via a `RGIArtifacts` interface.
+- Overhaul much of the interpolation module to improve performance.
+- Slight performance enhancements to the `met` module.
+
 ## v0.39.6
 
 #### Features
 
-- Add `geo.azimuth` and `geo.segment_azimuth` functions to calculate the azimuth
-  between coordinates.
-  Azimuth is the angle between coordinates relative to true north on the range [0, 360].
+- Add `geo.azimuth` and `geo.segment_azimuth` functions to calculate the azimuth between coordinates. Azimuth is the angle between coordinates relative to true north on the interval `[0, 360)`.
 
 #### Fixes
 

{pycontrails-0.39.6 → pycontrails-0.40.1}/Makefile

@@ -81,7 +81,7 @@ pytest:
 	pytest tests/unit
 
 pydocstyle:
-	pydocstyle pycontrails --match='[^_deprecated].*.py' --verbose
+	pydocstyle pycontrails --verbose
 
 pytest-cov:
 	pytest \
@@ -172,6 +172,7 @@ nb-execute: nb-black-check
 nb-check-links:
 	python -m pytest --check-links \
 		--check-links-ignore "https://doi.org/10.1021/acs.est.9b05608" \
+		--check-links-ignore "https://doi.org/10.1021/acs.est.2c05781" \
 		--check-links-ignore "https://github.com/contrailcirrus/pycontrails-bada" \
 		docs/examples docs/tutorials
 

{pycontrails-0.39.6/pycontrails.egg-info → pycontrails-0.40.1}/PKG-INFO

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

{pycontrails-0.39.6 → pycontrails-0.40.1}/docs/_static/pycontrails.bib

@@ -382,6 +382,22 @@
   langid = {english}
 }
 
+@inproceedings{schumannContrailCirrusPrediction2010,
+  title = {A Contrail Cirrus Prediction Tool},
+  booktitle = {Proceedings of the 2nd {{International Conference}} on {{Transport}}, {{Atmosphere}} and {{Climate}} ({{TAC-2}})},
+  author = {Schumann, Ulrich},
+  editor = {Sausen, Robert and van Velthoven, Peter F. J. and Br{\"u}ning, Claus and Blum, Anja},
+  year = {2010},
+  volume = {2010--10},
+  pages = {69--74},
+  publisher = {{DLR}},
+  address = {{Aachen, Germany and Maastricht, The Netherlands}},
+  issn = {1434-8454},
+  urldate = {2023-04-16},
+  abstract = {An new ``Contrail Cirrus Prediction Tool'' (CoCiP) has been developed to simulate contrail cirrus resulting from a single flight as well as from a fleet of cruising aircraft, flight by flight, regionally or globally. The method predicts contrail cirrus for given air traffic and weather prediction data. The method describes the life cycle of each contrail individually using a Lagrangian Gaussian plume model with simple bulk contrail ice properties, without feedback to meteorology. Contrails are initiated when the Schmidt-Appleman criterion is satisfied and when the ambient atmosphere is humid enough to allow for contrail persistence. The initial plume properties reflect properties of the originating aircraft. The evolution of individual contrails of cruising aircraft is computed using wind, temperature, humidity, and ice water content from numerical weather prediction (NWP) output. The plume trajectory follows horizontal and vertical wind. The model simulates shear and turbulence driven spreading, ice water content as a function of ice supersaturation, and some ice particle loss processes (turbulent mixing, aggregation and sedimentation). Radiative cloud forcing is estimated for the sum of all contrails using radiative fluxes without contrails from NWP output. The tool is kept simple to allow for efficient contrail simulations. The method has been tested for case studies with some comparisons to observations. The most critical input parameter is the NWP humidity field. The results compare favourably with observations and support interpretations of insitu, satellite and lidar observed aviation impact on cirrus clouds. CoCiP can be used to predict and minimize the climate impact of contrails.},
+  langid = {english}
+}
+
 @article{schumannContrailCirrusPrediction2012,
   title = {A Contrail Cirrus Prediction Model},
   author = {Schumann, U.},
@@ -431,6 +447,23 @@
   langid = {english}
 }
 
+@inproceedings{schumannDeterminationContrailsSatellite1990,
+  title = {Determination of {{Contrails}} from {{Satellite Data}} and {{Observational Results}}},
+  booktitle = {Air {{Traffic}} and the {{Environment}} \textemdash{} {{Background}}, {{Tendencies}} and {{Potential Global Atmospheric Effects}}},
+  author = {Schumann, U. and Wendling, P.},
+  editor = {Schumann, U.},
+  year = {1990},
+  series = {Lecture {{Notes}} in {{Engineering}}},
+  pages = {138--153},
+  publisher = {{Springer}},
+  address = {{Berlin, Heidelberg}},
+  doi = {10.1007/978-3-642-51686-3_9},
+  abstract = {Condensation trails (contrails) from air traffic in the upper troposphere may have an effect on the earth's climate. We first discuss the state of knowledge. Then some results of radiation transfer calculations are reported which help to estimate the order of magnitude of the effects of cirrus clouds and water vapour in comparison to doubling of the concentration of CO2. The main part of the paper describes the analysis of contrails from satellite data. Based on NOAA-AVHRR data we present results for a specific case where contrails covered a few percent of a region including southern Germany and the Alps. Preliminary results are reported for 99 further cases. A pattern recognition method is described to identify contrails and the related cloud cover automatically. Laser observations reflect contrail cross-sections which are several km in width and about 700 m thick. The optical thickness reaches values up to 1.},
+  isbn = {978-3-642-51686-3},
+  langid = {english},
+  keywords = {Advanced Very High Resolution Radiometer,Cloud Cover,Optical Thickness,Sunshine Duration}
+}
+
 @article{schumannEffectiveRadiusIce2011,
   title = {Effective {{Radius}} of {{Ice Particles}} in {{Cirrus}} and {{Contrails}}},
   author = {Schumann, U. and Mayer, B. and Gierens, K. and Unterstrasser, S. and Jessberger, P. and Petzold, A. and Voigt, C. and Gayet, J.-F.},
@@ -496,6 +529,19 @@
   langid = {english}
 }
 
+@incollection{schumannPotentialReduceClimate2011a,
+  title = {Potential to Reduce the Climate Impact of Aviation by Flight Level Changes},
+  booktitle = {3rd {{AIAA Atmospheric Space Environments Conference}}},
+  author = {Schumann, Ulrich and Graf, Kaspar and Mannstein, Hermann},
+  year = {2011},
+  month = jun,
+  series = {Fluid {{Dynamics}} and {{Co-located Conferences}}},
+  publisher = {{American Institute of Aeronautics and Astronautics}},
+  doi = {10.2514/6.2011-3376},
+  urldate = {2023-04-16},
+  keywords = {Aviation,Base of Aircraft Data,Contrails,Cruise Altitude,Earth,Earth Atmosphere,Fuel Consumption,Greenhouse Effect,Numerical Weather Prediction,Optical Depth}
+}
+
 @article{schumannPropertiesIndividualContrails2017,
   title = {Properties of Individual Contrails: A Compilation of Observations and Some Comparisons},
   shorttitle = {Properties of Individual Contrails},
@@ -678,6 +724,23 @@
   howpublished = {http://solardat.uoregon.edu/SolarRadiationBasics.html}
 }
 
+@article{voigtInsituObservationsYoung2010,
+  title = {In-Situ Observations of Young Contrails \textendash{} Overview and Selected Results from the {{CONCERT}} Campaign},
+  author = {Voigt, C. and Schumann, U. and Jurkat, T. and Sch{\"a}uble, D. and Schlager, H. and Petzold, A. and Gayet, J.-F. and Kr{\"a}mer, M. and Schneider, J. and Borrmann, S. and Schmale, J. and Jessberger, P. and Hamburger, T. and Lichtenstern, M. and Scheibe, M. and Gourbeyre, C. and Meyer, J. and K{\"u}bbeler, M. and Frey, W. and Kalesse, H. and Butler, T. and Lawrence, M. G. and Holz{\"a}pfel, F. and Arnold, F. and Wendisch, M. and D{\"o}pelheuer, A. and Gottschaldt, K. and Baumann, R. and Z{\"o}ger, M. and S{\"o}lch, I. and Rautenhaus, M. and D{\"o}rnbrack, A.},
+  year = {2010},
+  month = sep,
+  journal = {Atmospheric Chemistry and Physics},
+  volume = {10},
+  number = {18},
+  pages = {9039--9056},
+  publisher = {{Copernicus GmbH}},
+  issn = {1680-7316},
+  doi = {10.5194/acp-10-9039-2010},
+  urldate = {2023-04-16},
+  abstract = {Lineshaped contrails were detected with the research aircraft Falcon during the CONCERT \textendash{} CONtrail and Cirrus ExpeRimenT \textendash{} campaign in October/November 2008. The Falcon was equipped with a set of instruments to measure the particle size distribution, shape, extinction and chemical composition as well as trace gas mixing ratios of sulfur dioxide (SO2), reactive nitrogen and halogen species (NO, NOy, HNO3, HONO, HCl), ozone (O3) and carbon monoxide (CO). During 12 mission flights over Europe, numerous contrails, cirrus clouds and a volcanic aerosol layer were probed at altitudes between 8.5 and 11.6 km and at temperatures above 213 K. 22 contrails from 11 different aircraft were observed near and below ice saturation. The observed NO mixing ratios, ice crystal and soot number densities are compared to a process based contrail model. On 19 November 2008 the contrail from a CRJ-2 aircraft was penetrated in 10.1 km altitude at a temperature of 221 K. The contrail had mean ice crystal number densities of 125 cm-3 with effective radii reff of 2.6 {$\mu$}m. The presence of particles with r{$>$}50 {$\mu$}m in the less than 2 min old contrail suggests that natural cirrus crystals were entrained in the contrail. Mean HONO/NO (HONO/NOy) ratios of 0.037 (0.024) and the fuel sulfur conversion efficiency to H2SO4 (\εS{$\downarrow$}) of 2.9 \% observed in the CRJ-2 contrail are in the range of previous measurements in the gaseous aircraft exhaust. On 31 October 2010 aviation NO emissions could have contributed by more than 40\% to the regional scale NO levels in the mid-latitude lowest stratosphere. The CONCERT observations help to better quantify the climate impact from contrails and will be used to investigate the chemical processing of trace gases on contrails.},
+  langid = {english}
+}
+
 @article{wasiukAircraftPerformanceModel2015,
   title = {An Aircraft Performance Model Implementation for the Estimation of Global and Regional Commercial Aviation Fuel Burn and Emissions},
   author = {Wasiuk, D. K. and Lowenberg, M. H. and Shallcross, D. E.},

{pycontrails-0.39.6 → pycontrails-0.40.1}/docs/conf.py

@@ -182,6 +182,7 @@ autodoc_default_options = {
 bibtex_bibfiles = ["_static/pycontrails.bib"]
 bibtex_reference_style = "author_year"
 bibtex_default_style = "unsrt"
+bibtex_cite_id = "cite-{key}"
 
 nbsphinx_timeout = 600
 nbsphinx_execute = "never"

{pycontrails-0.39.6 → pycontrails-0.40.1}/docs/examples/CoCiP.ipynb

@@ -12,8 +12,11 @@
     "\n",
     "- Schumann, U. “A Contrail Cirrus Prediction Model.” Geoscientific Model Development 5, no. 3 (May 3, 2012): 543–80. https://doi.org/10.5194/gmd-5-543-2012.\n",
     "- Schumann, U., B. Mayer, K. Graf, and H. Mannstein. “A Parametric Radiative Forcing Model for Contrail Cirrus.” Journal of Applied Meteorology and Climatology 51, no. 7 (July 2012): 1391–1406. https://doi.org/10.1175/JAMC-D-11-0242.1.\n",
+    "- Schumann, Ulrich, Robert Baumann, Darrel Baumgardner, Sarah T. Bedka, David P. Duda, Volker Freudenthaler, Jean-Francois Gayet, et al. 2017. “Properties of Individual Contrails: A Compilation of Observations and Some Comparisons.” Atmospheric Chemistry and Physics 17 (1): 403–38. https://doi.org/10.5194/acp-17-403-2017.\n",
     "- Teoh, Roger, Ulrich Schumann, Arnab Majumdar, and Marc E. J. Stettler. “Mitigating the Climate Forcing of Aircraft Contrails by Small-Scale Diversions and Technology Adoption.” Environmental Science & Technology 54, no. 5 (March 3, 2020): 2941–50. https://doi.org/10.1021/acs.est.9b05608.\n",
-    "- Teoh, Roger, Ulrich Schumann, Edward Gryspeerdt, Marc Shapiro, Jarlath Molloy, George Koudis, Christiane Voigt, and Marc Stettler. “Aviation Contrail Climate Effects in the North Atlantic from 2016–2021.” Atmospheric Chemistry and Physics Discussions, March 30, 2022, 1–27. https://doi.org/10.5194/acp-2022-169.\n"
+    "- Teoh, Roger, Ulrich Schumann, Edward Gryspeerdt, Marc Shapiro, Jarlath Molloy, George Koudis, Christiane Voigt, and Marc E. J. Stettler. 2022. “Aviation Contrail Climate Effects in the North Atlantic from 2016 to 2021.” Atmospheric Chemistry and Physics 22 (16): 10919–35. https://doi.org/10.5194/acp-22-10919-2022.\n",
+    "- Teoh, Roger, Ulrich Schumann, Christiane Voigt, Tobias Schripp, Marc Shapiro, Zebediah Engberg, Jarlath Molloy, George Koudis, and Marc E. J. Stettler. 2022. “Targeted Use of Sustainable Aviation Fuel to Maximize Climate Benefits.” Environmental Science & Technology, November. https://doi.org/10.1021/acs.est.2c05781.\n",
+    "\n"
    ]
   },
   {

{pycontrails-0.39.6 → pycontrails-0.40.1}/docs/examples/ECMWF.ipynb

@@ -14,9 +14,8 @@
     "\n",
     "Support provided for:\n",
     "\n",
-    "- [ERA5](https://www.ecmwf.int/en/forecasts/dataset/ecmwf-reanalysis-v5) via the [Copernicus Data Store (CDS)](https://cds.climate.copernicus.eu/) and locally downloaded files\n",
-    "- [HRES](https://confluence.ecmwf.int/display/FUG/HRES+-+High-Resolution+Forecast) and [ENS](https://confluence.ecmwf.int/display/FUG/ENS+-+Ensemble+Forecasts?src=contextnavpagetreemode) via [MARS](https://confluence.ecmwf.int/display/UDOC/MARS+user+documentation) and locally downloaded files\n",
-    "- [IFS](https://www.ecmwf.int/en/publications/ifs-documentation) for locally downloaded files\n"
+    "- [ERA5](https://www.ecmwf.int/en/forecasts/dataset/ecmwf-reanalysis-v5) via the [Copernicus Data Store (CDS)](https://cds.climate.copernicus.eu/) using [cdsapi](https://github.com/ecmwf/cdsapi) or user provided files\n",
+    "- [HRES](https://confluence.ecmwf.int/display/FUG/HRES+-+High-Resolution+Forecast) and [ENS](https://confluence.ecmwf.int/display/FUG/ENS+-+Ensemble+Forecasts?src=contextnavpagetreemode) via [MARS](https://confluence.ecmwf.int/display/UDOC/MARS+user+documentation) using [ecmwf-api-client](https://github.com/ecmwf/ecmwf-api-client) or user provided files"
    ]
   },
   {
@@ -28,7 +27,7 @@
     "### Access\n",
     "\n",
     "- Requires account with [Copernicus Data Portal](https://cds.climate.copernicus.eu/cdsapp#!/home)\n",
-    "- Refer to the [CDS API Documentation](https://github.com/ecmwf/cdsapi#configure) for how to create `~/.cdsapirc` file to configure access to CDS.\n",
+    "- Provide `url` and `key` credentials on input, or refer to the [CDS API Documentation](https://github.com/ecmwf/cdsapi#configure) for how to create `~/.cdsapirc` file to configure access.\n",
     "\n",
     "### Reference\n",
     "\n",
@@ -82,6 +81,8 @@
     "    time=\"2022-03-01 00:00:00\",\n",
     "    variables=[\"t\", \"q\", \"u\", \"v\", \"w\", \"ciwc\", \"z\", \"cc\"],  # supports CF name or short names\n",
     "    pressure_levels=[300, 250, 200],\n",
+    "    # url=\"https://cds.climate.copernicus.eu/api/v2\",\n",
+    "    # key=\"<key>\"\n",
     ")\n",
     "era5"
    ]
@@ -123,6 +124,8 @@
     "        \"cc\",\n",
     "    ],  # supports CF name or short names\n",
     "    pressure_levels=[300, 250, 200],\n",
+    "    # url=\"https://cds.climate.copernicus.eu/api/v2\",\n",
+    "    # key=\"<key>\"\n",
     ")\n",
     "era5"
    ]
@@ -1412,7 +1415,12 @@
     }
    ],
    "source": [
-    "era5 = ERA5(time=(\"2022-03-01 00:00:00\", \"2022-03-01 03:00:00\"), variables=[\"tsr\", \"ttr\"])\n",
+    "era5 = ERA5(\n",
+    "    time=(\"2022-03-01 00:00:00\", \"2022-03-01 03:00:00\"),\n",
+    "    variables=[\"tsr\", \"ttr\"],\n",
+    "    # url=\"https://cds.climate.copernicus.eu/api/v2\",\n",
+    "    # key=\"<key>\"\n",
+    ")\n",
     "era5"
    ]
   },
@@ -2061,7 +2069,7 @@
     "Users within ECMWF Member and Co-operating States may contact their Computing Representative to obtain access to MARS. \n",
     "All other users may [request a username and password](https://accounts.ecmwf.int/auth/realms/ecmwf/protocol/openid-connect/registrations?client_id=apps&response_type=code&scope=openid%20email&redirect_uri=https://www.ecmwf.int) and then [get an api key](https://api.ecmwf.int/v1/key/).\n",
     "\n",
-    "- See [ECMWF API Client documentatino](https://github.com/ecmwf/ecmwf-api-client#configure) to configure  local `~/.ecmwfapirc` file:\n",
+    "Provide `url`, `key`, and `email` credentials on input, or see [ECMWF API Client documentation](https://github.com/ecmwf/ecmwf-api-client#configure) to configure  local `~/.ecmwfapirc` file:\n",
     "\n",
     "```json\n",
     "{\n",
@@ -2073,7 +2081,7 @@
     "\n",
     "### Reference\n",
     "\n",
-    "- [HRES](https://confluence.ecmwf.int/display/FUG/HRES+-+High-Resolution+Forecast) Hi-res forecast\n",
+    "- [HRES](https://confluence.ecmwf.int/display/FUG/HRES+-+High-Resolution+Forecast) High resolution forecast\n",
     "- [ENS](https://confluence.ecmwf.int/display/FUG/ENS+-+Ensemble+Forecasts?src=contextnavpagetreemode) Ensemble forecast"
    ]
   },
@@ -2127,6 +2135,9 @@
     "    variables=[\"t\", \"q\", \"u\", \"v\", \"w\", \"z\"],\n",
     "    pressure_levels=[300, 250, 200],\n",
     "    grid=1,\n",
+    "    # url=\"https://api.ecmwf.int/v1\",\n",
+    "    # key=\"<key>\"\n",
+    "    # email=\"<email>\"\n",
     ")\n",
     "hres"
    ]
@@ -3240,7 +3251,14 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "hres = HRES(time=time, variables=[\"tsr\", \"ttr\"], grid=1)"
+    "hres = HRES(\n",
+    "    time=time,\n",
+    "    variables=[\"tsr\", \"ttr\"],\n",
+    "    grid=1,\n",
+    "    # url=\"https://api.ecmwf.int/v1\",\n",
+    "    # key=\"<key>\"\n",
+    "    # email=\"<email>\"\n",
+    ")"
    ]
   },
   {
@@ -3934,6 +3952,9 @@
     "    variables=[\"t\", \"q\"],\n",
     "    pressure_levels=[300, 250, 200],\n",
     "    forecast_time=\"2022-03-25 12:00:00\",\n",
+    "    # url=\"https://api.ecmwf.int/v1\",\n",
+    "    # key=\"<key>\"\n",
+    "    # email=\"<email>\"\n",
     ")\n",
     "hres"
    ]
@@ -3944,6 +3965,8 @@
    "source": [
     "## IFS\n",
     "\n",
+    "> In development\n",
+    "\n",
     "Integrated Forecasting System from ECMWF\n",
     "\n",
     "- [IFS Documentation](https://www.ecmwf.int/en/publications/ifs-documentation)\n",
@@ -4118,6 +4141,8 @@
     "    variables=variables,\n",
     "    pressure_levels=[300, 250, 150],\n",
     "    cachestore=gcp,\n",
+    "    # url=\"https://cds.climate.copernicus.eu/api/v2\",\n",
+    "    # key=\"<key>\"\n",
     ")"
    ]
   },

{pycontrails-0.39.6 → pycontrails-0.40.1}/docs/examples/Flight.ipynb

@@ -723,7 +723,7 @@
     }
    ],
    "source": [
-    "# Air pressure at waypoint, in Pa\n",
+    "# Altitude, in ft\n",
     "fl.altitude_ft"
    ]
   },

{pycontrails-0.39.6 → pycontrails-0.40.1}/docs/install.rst

@@ -56,6 +56,18 @@ See ``[project.optional-dependencies]`` in `pyproject.toml <https://github.com/c
 for the latest optional dependencies.
 
 
+Pre-built wheels
+-----------------
+
+Wheels for common platforms are available on `PyPI <https://pypi.org/project/pycontrails/>`__. Currently, wheels are available for:
+
+- Linux (x86_64)
+- macOS (x86_64 and arm64)
+- Windows (x86_64)
+
+It's possible to build the wheels from source using `Cython <https://cython.org/>`__ and a C compiler with the usual ``pip install`` process. The source distribution on PyPI includes the C files, so it's not necessary to have Cython installed to build from source.
+
+
 Extensions
 ----------
 

{pycontrails-0.39.6 → pycontrails-0.40.1}/pycontrails/_version.py

@@ -1,4 +1,4 @@
 # file generated by setuptools_scm
 # don't change, don't track in version control
-__version__ = version = '0.39.6'
-__version_tuple__ = version_tuple = (0, 39, 6)
+__version__ = version = '0.40.1'
+__version_tuple__ = version_tuple = (0, 40, 1)

{pycontrails-0.39.6 → pycontrails-0.40.1}/pycontrails/core/flight.py

@@ -1088,8 +1088,8 @@ class Flight(GeoVectorDataset):
         >>> # Intersect and attach
         >>> fl["air_temperature"] = fl.intersect_met(met['air_temperature'])
         >>> fl["air_temperature"]
-        array([235.94657215, 235.55773934, 235.56765885, ..., 234.59956144,
-               234.60406387, 234.60845904])
+        array([235.94658, 235.55774, 235.56766, ..., 234.59956, 234.60406,
+               234.60846], dtype=float32)
 
         >>> # Length (in meters) of waypoints whose temperature exceeds 236K
         >>> fl.length_met("air_temperature", threshold=236)