Skip to content

Commit

Permalink
Merge branch 'development' into feature/thermal_cx_line
Browse files Browse the repository at this point in the history
  • Loading branch information
vsnever committed Dec 1, 2023
2 parents 520abd0 + cd06ea0 commit b622ba5
Show file tree
Hide file tree
Showing 124 changed files with 24,019 additions and 2,464 deletions.
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[run]
plugins = Cython.Coverage
source = cherab
omit = *tests*
omit = */tests/*
13 changes: 4 additions & 9 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@ jobs:
strategy:
fail-fast: false
matrix:
numpy-version: ["1.15.0", "1.16.6", "1.19.2"]
python-version: ["3.6", "3.7", "3.8"]
exclude:
- python-version: "3.8"
numpy-version: "1.15.0"
numpy-version: ["oldest-supported-numpy", "numpy"]
python-version: ["3.7", "3.8", "3.9", "3.10"]
steps:
- name: Checkout code
uses: actions/checkout@v2
Expand All @@ -26,11 +23,9 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- name: Install Python dependencies
run: python -m pip install cython>=0.28 numpy==${{ matrix.numpy-version }} scipy matplotlib pyopencl[pocl]==2022.1
- name: Work around PyOpenCL issue 537
run: echo OCL_ICD_VENDORS=$(python -c 'import os, pyopencl; print(os.path.join(*pyopencl.__path__, ".libs"))') >> $GITHUB_ENV
run: python -m pip install --prefer-binary cython>=0.28 ${{ matrix.numpy-version }} scipy matplotlib "pyopencl[pocl]>=2022.2.4"
- name: Install Raysect from pypi
run: pip install raysect==0.7.1
run: pip install raysect==0.8.1
- name: Build cherab
run: dev/build.sh
- name: Run tests
Expand Down
40 changes: 32 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,49 @@
Project Changelog
=================

Release 1.4.0 (TBD)
Release 1.5.0 (TBD)
-------------------

New:
* Support Raysect 0.8
* Add custom line shape support to BeamCXLine model. (#394)
* Add PeriodicTransformXD and VectorPeriodicTransformXD functions to support the data simulated with periodic boundary conditions. (#387)
* Add CylindricalTransform and VectorCylindricalTransform to transform functions from cylindrical to Cartesian coordinates. (#387)
* Add numerical integration of Bremsstrahlung spectrum over a spectral bin. (#395)
* Replace the coarse numerical constant in the Bremsstrahlung model with an exact expression. (#409)
* Add the kind attribute to RayTransferPipelineXD that determines whether the ray transfer matrix is multiplied by sensitivity ('power') or not ('radiance'). (#412)
* Improved parsing of metadata from the ADAS ADF15 'bnd' files for H-like ions. Raises a runtime error if the metadata cannot be parsed. (#424)

Bug fixes:
* Fix deprecated transforms being cached in LaserMaterial after laser.transform update (#420)

Release 1.4.0 (3 Feb 2023)
-------------------

API changes:
* Spectroscopic observers and their groups are deprecated and replaced by groups based on Raysect's 0D observers. (#332)
* Spectroscopic observers and their groups are deprecated and replaced by groups based on Raysect's 0D observers. (#332)
* Support for Python 3.6 is dropped. It may still work, but is no longer actively tested.

Bug fixes:
* Fix and improve OpenCL utility functions. (#358)
* Fixed Bremsstrahlung trapezium evaluation (#384).

New:
* Make f_profile (current flux) a read-only attribute of EFITEquilibrium. (#355)
* Add group observer class for each of Raysect's 0D observers. (#332)
* Add a demo for observer group handling and plotting.
* Add verbose parameter to SartOpencl solver (default is False). (#358)
* Add Thomson Scattering model. (#97)
* Add Generomak core plasma profiles. (#360)
* Add toroidal_mesh_from_polygon for making mesh for not fully-360 degrees axisymmetric elements. (#365)

Bug Fixes:
----------
* Fixed Bremsstrahlung trapezium evaluation (#384).
* Fixed generomak plasma edge data paths.
* Fix and improve OpenCL utility functions. (#358)
* Add common spectroscopic instruments: Polychromator, SurveySpectrometer, CzernyTurnerSpectrometer. (#299)
* Add new classes for free-free Gaunt factors and improve accuracy of the Gaunt factor used in Bremsstrahlung emission model. (#352)
* Add GaussianQuadrature integration method for Function1D. (#366)
* Add integrator attribute to LineShapeModel to use with lineshapes that cannot be analytically integrated over a spectral bin. (#366)
* Add a numerical integration of StarkBroadenedLine over the spectral bin. (#366)
* Add Generomak full plasma profiles obtained by blending the core and edge profiles. (#372)
* Clean up build/install dependencies. (#353)
* Test against Python 3.10 and latest released Numpy. Drop Python 3.6 and older Numpy from tests. (#391)


Release 1.3.0 (8 Dec 2021)
Expand Down
6 changes: 0 additions & 6 deletions MANIFEST.in

This file was deleted.

7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,13 @@ with a build-time dependency on Cherab need to use a Cython version newer than
3.0a5, due to a [bug](https://github.com/cython/cython/issues/2918) in how
earlier versions of Cython handle namespaces.

By default, pip will install from wheel archives on PyPI. If a binary wheel is not
available for your version of Python, or if you are installing in editable mode
for development, the package will be compiled locally on your machine. Compilation
is done in parallel by default, using all available processors, but can be
overridden by setting the environment variable `CHERAB_NCPU` to the number of
processors to use.

Governance
----------

Expand Down
2 changes: 1 addition & 1 deletion cherab/core/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.3.0
1.5.0.dev1
1 change: 1 addition & 0 deletions cherab/core/atomic/__init__.pxd
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ from cherab.core.atomic.line cimport Line
from cherab.core.atomic.interface cimport AtomicData
from cherab.core.atomic.rates cimport *
from cherab.core.atomic.zeeman cimport ZeemanStructure
from cherab.core.atomic.gaunt cimport *

1 change: 1 addition & 0 deletions cherab/core/atomic/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,4 @@
from .interface import AtomicData
from .rates import *
from .zeeman import ZeemanStructure
from .gaunt import *
Loading

0 comments on commit b622ba5

Please sign in to comment.