Skip to content

Commit f3556a9

Browse files
authored
Prepare release 26.6 (OpenFUSIONToolkit#297)
- Update versioning scheme to year-based - Update publications list - Update examples
1 parent 45d9064 commit f3556a9

44 files changed

Lines changed: 2203 additions & 2036 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ framework, for problems in plasma and fusion research and engineering in arbitra
1414
The underlying framework and its component tools support the use of variable order finite element methods on
1515
unstructured tetrahedral (triangular) or hexahedral (quadralateral) grids.
1616

17-
**NOTE:** This project is current in a beta status as the transition to a fully open source code, including
18-
associated documentation and examples is completed. For more information see [v1.0 release status](https://github.com/openfusiontoolkit/OpenFUSIONToolkit/milestone/1) for more information.
17+
**NOTE:** This project is under active development, please watch [releases](https://github.com/openfusiontoolkit/OpenFUSIONToolkit/releases) for any new features and breaking changes that may be introduced.
1918

2019
Component tools
2120
------------
@@ -51,6 +50,6 @@ See [CONTRIBUTING.md](https://github.com/openfusiontoolkit/OpenFUSIONToolkit/blo
5150
Copyright
5251
---------
5352

54-
Open FUSION Toolkit code development project, up to version 1.0 Copyright (c) 2023, Open FUSION Toolkit team.
53+
Open FUSION Toolkit code development project, up to version 26.6 Copyright (c) 2023 - 2026, Open FUSION Toolkit team.
5554

5655
Written by Open FUSION Toolkit team and collaborators with Christopher J. Hansen as principle developer. All rights reserved.

spack/repo/packages/openfusiontoolkit/package.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Openfusiontoolkit(CMakePackage):
1212
framework, for problems in plasma and fusion research and engineering in arbitrary 2D and 3D geometries.
1313
The underlying framework and its component tools support the use of variable order finite element methods on
1414
unstructured tetrahedral (triangular) or hexahedral (quadralateral) grids.
15-
15+
1616
Component tools:
1717
- TokaMaker: A time-dependent free-boundary Grad-Shafranov equilibrium code
1818
- ThinCurr: A 3D thin-wall electromagnetic simulation package
@@ -21,17 +21,17 @@ class Openfusiontoolkit(CMakePackage):
2121

2222
# Project and repo information
2323
homepage = "https://openfusiontoolkit.github.io/OpenFUSIONToolkit/"
24-
url = "https://github.com/OpenFUSIONToolkit/OpenFUSIONToolkit/archive/refs/tags/v1.0.0-beta6.tar.gz"
24+
url = "https://github.com/OpenFUSIONToolkit/OpenFUSIONToolkit/archive/refs/tags/v26.6.tar.gz"
2525
git = "https://github.com/OpenFUSIONToolkit/OpenFUSIONToolkit.git"
2626
maintainers("hansec")
2727
license("LGPL-3.0-only", checked_by="hansec")
2828

2929
# CMakeLists.txt is in the src/ directory
3030
root_cmakelists_dir = "src"
3131

32-
# Version list supported by spack build (needs 1.0.0-beta8 or newer)
32+
# Version list supported by spack build (needs 26.6 or newer)
3333
version("main", branch="main")
34-
# version("1.0.0-beta8", sha256="d687c788f05118e88b3bcb78c14fbf726286b5359b122ecdb9829fc26084f3c4") # FIXME: Uncomment and update hash when available
34+
# version("26.6", sha256="d687c788f05118e88b3bcb78c14fbf726286b5359b122ecdb9829fc26084f3c4") # FIXME: Uncomment and update hash when available
3535

3636
# Build variants
3737
variant("build_type",default="Release",description="The build type to build",values=("Debug", "Release"))

src/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
# SPDX-License-Identifier: LGPL-3.0-only
55
########################
66
cmake_minimum_required( VERSION 3.27 )
7-
project( OpenFUSIONToolkit LANGUAGES NONE VERSION "1.0.0" )
8-
set( OFT_VER_SUFFIX "-beta7" CACHE INTERNAL "Version suffix" )
9-
set( OFT_PYPI_VER_SUFFIX "${OFT_VER_SUFFIX}" CACHE INTERNAL "Version suffix for PYPI (needs to be pep440)" )
7+
project( OpenFUSIONToolkit LANGUAGES NONE VERSION "26.6" )
8+
set( OFT_VER_SUFFIX "" CACHE INTERNAL "Version suffix" )
9+
set( OFT_PYPI_VER_SUFFIX "" CACHE INTERNAL "Version suffix for PYPI (needs to be pep440)" )
1010
list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake" )
1111

1212
option(OFT_BUILD_TESTS "Build tests?" OFF)
@@ -47,7 +47,7 @@ if(OFT_PACKAGE_BUILD AND OFT_PACKAGE_NIGHTLY)
4747
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
4848
OUTPUT_VARIABLE GIT_COMMIT_COUNT
4949
OUTPUT_STRIP_TRAILING_WHITESPACE)
50-
set( OFT_PYPI_VER_SUFFIX "${OFT_VER_SUFFIX}.dev${GIT_COMMIT_COUNT}" CACHE INTERNAL "Version suffix for PYPI (needs to be pep440)" FORCE )
50+
set( OFT_PYPI_VER_SUFFIX ".dev${GIT_COMMIT_COUNT}" CACHE INTERNAL "Version suffix for PYPI (needs to be pep440)" FORCE )
5151
execute_process(
5252
COMMAND git rev-parse --short HEAD
5353
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

src/docs/ThinCurr/doc_thincurr_main.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ flowing in thin conducting structures (2D sheets in 3D geometry)
1010

1111
\f[ \mathrm{L} \frac{\partial I}{\partial t} + \mathrm{R} I = V. \f]
1212

13+
ThinCurr should primarily be used through the python interface using the \ref OpenFUSIONToolkit.ThinCurr "OpenFUSIONToolkit.ThinCurr" python module
14+
and the \ref OpenFUSIONToolkit.ThinCurr._core.ThinCurr "OpenFUSIONToolkit.ThinCurr.ThinCurr" class.
15+
1316
\section doc_tw_main_ex ThinCurr Examples
1417
The following examples illustrate usage of ThinCurr to perform calculations using the thin-wall model.
1518

src/docs/build_doc_versions.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ echo $CURR_RELEASE >> doc_versions.txt
2626
MENU_PATCH+='{text:"'$CURR_RELEASE'",url:"'../$CURR_RELEASE'/index.html"},'
2727

2828
# Build previous releases (explicitly set for now)
29-
for verTag in v1.0.0-beta6 v1.0.0-beta5 v1.0.0-beta4 v1.0.0-beta3 ;
29+
for verTag in v1.0.0-beta7 v1.0.0-beta6 ;
3030
do
3131
git checkout $verTag
3232
mkdir $verTag && cd $verTag

src/docs/website/publications.html

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,20 @@ <h2 id="project_tagline">An open-source framework for fusion and plasma science
2424
<h2>Publications</h2>
2525
<p>A list of publications using the Open FUSION Toolkit. To be added to this list please <a href="https://github.com/openfusiontoolkit/OpenFUSIONToolkit/issues">open an issue</a> or create a pull request.</p>
2626
<ol class="ref_list">
27+
<li>M. Pharr et al., <a href="https://arxiv.org/abs/2606.02901">Coordinate-invariant flux-surface Fourier analysis in tokamaks</a>, <em>arXiv:2606.02901</em> (2026)</li>
28+
<li>The CENTAUR Collaboration et al., <a href="https://arxiv.org/abs/2605.27549">Compact Experimental Negative TriAngUlarity Reactor (CENTAUR): A design study for a compact, affordable breakeven tokamak</a>, <em>arXiv:2605.27549</em> (2026)</li>
29+
<li>S. Guizzo et al., <a href="http://dx.doi.org/10.2139/ssrn.6828994">Flexible, Axisymmetric MHD Solver for Coupled Plasma and Flowing, Conducting Blanket Dynamics</a>, <em>SSRN Preprint</em> (2026)</li>
30+
<li>S. Sarkar et al., <a href="https://arxiv.org/abs/2605.09913">Magnetohydrodynamic equilibrium and neutronics study on MAST-U using Jenga framework</a>, <em>arXiv:2605.09913</em> (2026)</li>
31+
<li>J. Cohen et al., <a href="https://arxiv.org/abs/2605.04190">Yinsen: A low power density HTS tokamak fusion reactor for marine and off-grid applications</a>, <em>arXiv:2605.04190</em> (2026)</li>
32+
<li>K. Yasoda et al., <a href="https://arxiv.org/abs/2605.00165">Characterization of ELM Pacing via Vertical Jogs on DIII-D</a>, <em>arXiv:2605.00165</em> (2026)</li>
33+
<li>E.M. Bursch et al., <a href="https://arxiv.org/abs/2604.27317">Improved n=1 Empirical Error Field Penetration Threshold Scaling with Ohmic and L-Mode Conventional Tokamak Plasma Discharges</a>, <em>arXiv:2604.27317</em> (2026)</li>
34+
<li>R. Gupta et al., <a href="https://arxiv.org/abs/2603.11549">Design and mechanical analysis of the PRAGYA tokamak vacuum vessel</a>, <em>arXiv:2603.11549</em> (2026)</li>
35+
<li>D. Burgess et al., <a href="https://doi.org/10.1088/1361-6587/ae7156">Tearing Stability Prediction Combining Toroidal Calculations With a Two-Fluid Slab Layer</a>, <em>Plasma Physics & Controlled Fusion</em> <strong>68</strong>, 065017 (2026)</li>
36+
<li>J. Salm et al., <a href="https://doi.org/10.1063/5.0332786">Poloidal field coils optimization in tokamaks using TokaMaker</a>, <em>AIP Advances</em> <strong>16</strong>, 065113 (2026)</li>
37+
<li>J. Hillesheim et al., <a href="https://doi.org/10.1017/S0022377826101706">Overview of the physics basis for the ARC fusion power plant</a>, <em>Journal of Plasma Physics</em> <strong>92(3)</strong>, E69 (2026)</li>
38+
<li>R. Sweeney et al., <a href="https://doi.org/10.1017/S0022377826101585">ARC Disruption Physics and Strategy</a>, <em>Journal of Plasma Physics</em> <strong>92(3)</strong>, E68 (2026)</li>
39+
<li>N. Leuthold et al., <a href="https://doi.org/10.1017/S0022377826101421">ARC Physics Basis - MHD</a>, <em>Journal of Plasma Physics</em> <strong>92(2)</strong>, E49 (2026)</li>
40+
<li>H. Sun et al., <a href="https://doi.org/10.1088/1361-6587/ae4a4a">Physics of the low momentum diffusivity regime in tokamaks and its experimental applicability</a>, <em>Plasma Physics & Controlled Fusion</em> <strong>68</strong>, 035011 (2026)</li>
2741
<li>S. Benjamin et al., <a href="https://doi.org/10.1088/1741-4326/ae44ad">Macroscopic trends of neoclassical tearing stability in high-field H-mode tokamak pilot plants</a>, <em>Nuclear Fusion</em> <strong>66</strong>, 036049 (2026)</li>
2842
<li>A. Braun et al., <a href="https://doi.org/10.1088/1741-4326/ae4041">Validation of Runaway Electron Mitigation Coil Electromagnetic Modeling in the HBT-EP Tokamak</a>, <em>Nuclear Fusion</em> <strong>66</strong>, 036036 (2026)</li>
2943
<li>M. Parsons et al., <a href="https://doi.org/10.1088/1361-6587/ae3ada">A Data-Driven Approach to Real-Time Vertical Position Estimation for NSTX-U Vertical Stability Control</a>, <em>Plasma Physics & Controlled Fusion</em> <strong>68</strong>, 025008 (2026)</li>

src/examples/Marklin/NCSX/NCSX_vac_ex.ipynb

Lines changed: 27 additions & 51 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)