OpenFUSIONToolkit · logan-nc · Feb 13, 2026 · Dec 30, 2025 · Dec 30, 2025 · Dec 30, 2025
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,7 @@
 .vscode
 *.DS_Store
 *.pdf
+!docs/resources/*.pdf
 *.png
 *.jld2
 .gitattributes

diff --git a/CLAUDE.md b/CLAUDE.md
diff --git a/Project.toml b/Project.toml
@@ -5,6 +5,7 @@ authors = ["Matthew Pharr <matthewcpharr@gmail.com>", "Rithik Banerjee <rb3736@c
 version = "0.1.0"
 
 [deps]
+DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
 DiffEqCallbacks = "459566f4-90b8-5000-8ac3-15dfb0a30def"
 Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
 FastInterpolations = "9ea80cae-fc13-4c00-8066-6eaedb12f34b"
@@ -18,10 +19,12 @@ Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
 SpecialFunctions = "276daf66-3868-5448-9aa4-cd146d93841b"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
+Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 TOML = "fa267f1f-6049-4f14-aa54-33bafae1ed76"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [compat]
+DelimitedFiles = "1.9.1"
 DiffEqCallbacks = "4.9.0"
 Documenter = "1.14.1"
 FastInterpolations = ">=0.2.8"
@@ -35,5 +38,6 @@ Plots = "1.40.15"
 Printf = "1.11.0"
 SpecialFunctions = "2.5.1"
 StaticArrays = "1.9.15"
+Statistics = "1.11.0"
 TOML = "1.0.3"
 Test = "1.11.0"
diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ To assist with the process of compiling release notes, please confirm to the com
 ```
 CODE - TAG - Detailed message
 ```
-where CODE is EQUIL, DCON, VAC, etc. and TAGs are short descriptors of the type of commit. Example tags might be WIP (work in progress), MINOR, IMPROVEMENT, BUG FIX, NEW FEATURE, etc. Look through old commits for examples of what tags are commonly used.
+where CODE is EQUIL, ForceFreeStates, VAC, etc. and TAGs are short descriptors of the type of commit. Example tags might be WIP (work in progress), MINOR, IMPROVEMENT, BUG FIX, NEW FEATURE, etc. Look through old commits for examples of what tags are commonly used.
 
 Again, this is currently used for the by-hand compilation of release notes. The tags thus need to be human readable but are not strictly inforced to be within some limited set. The objective is to allow a lead developer to skim through commits and pick out only the key new features / bug fixes / improvements to note in the release while not having to read all the work-in-progress or minor changes.
 

diff --git a/benchmarks/DIIID_ideal_example/Project.toml b/benchmarks/DIIID_ideal_example/Project.toml
diff --git a/benchmarks/DIIID_ideal_example/TKMKR_D3Dlike_default_Hmode.geqdsk b/benchmarks/DIIID_ideal_example/TKMKR_D3Dlike_default_Hmode.geqdsk
diff --git a/benchmarks/DIIID_ideal_example/benchmark_inputs.jld2 b/benchmarks/DIIID_ideal_example/benchmark_inputs.jld2
diff --git a/benchmarks/DIIID_ideal_example/equil.toml b/benchmarks/DIIID_ideal_example/equil.toml
diff --git a/benchmarks/DIIID_ideal_example/euler_fortran_julia_comparison.ipynb b/benchmarks/DIIID_ideal_example/euler_fortran_julia_comparison.ipynb
@@ -6,7 +6,7 @@
    "metadata": {},
    "source": [
     "## Overview\n",
-    "In this notebook, we will demonstrate that the outputs of the Julia DCON conversion are equivalent to those in the Fortran version by comparing the eigenmodes of the DIIID ideal example"
+    "In this notebook, we will demonstrate that the outputs of JPEC are equivalent to those in the Fortran DCON by comparing the eigenmodes of the DIIID ideal example"
    ]
   },
   {
@@ -315,7 +315,7 @@
    "metadata": {},
    "source": [
     "## Load in Julia data\n",
-    "We will run the main DCON code on the same inputs. We output the `euler.h5` file, which is a Julia version of the `euler.bin` file."
+    "We will run the main DCON code on the same inputs. We output the `jpec.h5` file, which is a Julia version of the `euler.bin` file."
    ]
   },
   {
@@ -325,10 +325,10 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "# Run DCON in Julia\n",
+    "# Run\n",
     "Pkg.activate(\"../..\")\n",
     "using JPEC\n",
-    "JPEC.DCON.Main(\"./\") # \"./\" tells us to obtain inputs and direct outputs to our current folder"
+    "JPEC.main([\"./\"]) # \"./\" tells us to obtain inputs and direct outputs to our current folder"
    ]
   },
   {
@@ -339,7 +339,7 @@
    "outputs": [],
    "source": [
     "# Read in from julia hdf5 for comparison\n",
-    "eh5 = h5open(\"euler.h5\", \"r\")\n",
+    "eh5 = h5open(\"jpec.h5\", \"r\")\n",
     "mstepj = read(eh5[\"integration/nstep\"])\n",
     "xi_psij = read(eh5[\"integration/xi_psi\"])\n",
     "psifacj = read(eh5[\"integration/psi\"])\n",
@@ -351,7 +351,7 @@
     "chi1j = 2π*psioj\n",
     "wtf = wt*(chi1*1e-3)\n",
     "wtj = wtj*(chi1j*1e-3)\n",
-    "println(\"Done reading euler.h5\")"
+    "println(\"Done reading jpec.h5\")"
    ]
   },
   {

diff --git a/benchmarks/DIIID_ideal_example/dcon.toml → benchmarks/DIIID_ideal_example/jpec.toml b/benchmarks/DIIID_ideal_example/dcon.toml → benchmarks/DIIID_ideal_example/jpec.toml
@@ -1,4 +1,21 @@
-[DCON_CONTROL]
+[Equilibrium]
+eq_type = "efit"                        # Type of the input 2D equilibrium file
+eq_filename = "TKMKR_D3Dlike_default_Hmode.geqdsk" # Path to equilibrium file
+jac_type = "hamada"                     # Coordinate system (hamada, pest, boozer, equal_arc)
+power_bp = 0                            # Poloidal field power exponent for Jacobian
+power_b = 0                             # Toroidal field power exponent for Jacobian
+power_r = 0                             # Major radius power exponent for Jacobian
+grid_type = "ldp"                       # Radial grid packing type
+psilow = 1e-4                           # Lower limit of normalized flux coordinate
+psihigh = 0.993                         # Upper limit of normalized flux coordinate
+mpsi = 128                              # Number of radial grid points
+mtheta = 256                            # Number of poloidal grid points
+newq0 = 0                               # Override for on-axis safety factor (0 = use input value)
+etol = 1e-7                             # Error tolerance for equilibrium solver
+force_termination = false               # Terminate after equilibrium setup (skip stability calculations)
+
+
+[ForceFreeStates]
 bal_flag = false              # Ideal MHD ballooning criterion for short wavelengths
 mat_flag = true               # Construct coefficient matrices for diagnostic purposes
 ode_flag = true              # Integrate ODE's for determining stability of internal long-wavelength mode (must be true for GPEC)

diff --git a/benchmarks/DIIID_ideal_example/vacuum_accuracy_benchmark.jl b/benchmarks/DIIID_ideal_example/vacuum_accuracy_benchmark.jl
@@ -5,6 +5,7 @@ using LinearAlgebra
 
 Pkg.activate("$(@__DIR__)/../.."); using JPEC
 
+# this requires you to have run the DIIID-like_ideal_example first to generate the benchmark inputs
 @load "$(@__DIR__)/../../examples/DIIID-like_ideal_example/benchmark_inputs.jld2" benchmark_inputs
 
 (; wv_block, mpert, mtheta_eq, mthvac, complex_flag, kernelsign,
@@ -44,7 +45,7 @@ if benchmark_n
         println("Testing n = $n_test")
 
         # Compute Fortran solution
-        JPEC.Vacuum.set_dcon_params(mtheta_eq, vac_inputs.mlow, vac_inputs.mhigh,
+        JPEC.Vacuum.set_surface_params(mtheta_eq, vac_inputs.mlow, vac_inputs.mhigh,
                                     n_test, vac_inputs.qa, vac_inputs.r,
                                     vac_inputs.z, vac_inputs.delta)
 
@@ -53,7 +54,7 @@ if benchmark_n
                           complex_flag, kernelsign, wall_flag,
                           farwall_flag, grri, xzpts)
 
-        JPEC.Vacuum.unset_dcon_params()
+        JPEC.Vacuum.unset_surface_params()
 
         # Compute Julia solution
         vac_inputs_test = deepcopy(vac_inputs)
@@ -123,15 +124,15 @@ if benchmark_m
 
     # Fortran reference
     mpert_ref = mhigh_reference - vac_inputs.mlow
-    JPEC.Vacuum.set_dcon_params(mtheta_eq, vac_inputs.mlow, mhigh_reference,
+    JPEC.Vacuum.set_surface_params(mtheta_eq, vac_inputs.mlow, mhigh_reference,
                                 1, vac_inputs.qa, vac_inputs.r,
                                 vac_inputs.z, vac_inputs.delta)
     wv_block_ref_fortran_m = zeros(ComplexF64, mpert_ref, mpert_ref)
     grri_ref = zeros(Float64, 2 * (mthvac + 5), 2 * mpert_ref)
     JPEC.Vacuum.mscvac(wv_block_ref_fortran_m, mpert_ref, mtheta_eq, mthvac,
                        complex_flag, kernelsign, wall_flag,
                        farwall_flag, grri_ref, xzpts, ahg_file, "$(@__DIR__)/../../examples/DIIID-like_ideal_example")
-    JPEC.Vacuum.unset_dcon_params()
+    JPEC.Vacuum.unset_surface_params()
 
     println("Reference solutions computed.\n")
 
@@ -142,7 +143,7 @@ if benchmark_m
         mpert_test = mhigh_test - vac_inputs.mlow
 
         # Compute Fortran solution
-        JPEC.Vacuum.set_dcon_params(mtheta_eq, vac_inputs.mlow, mhigh_test,
+        JPEC.Vacuum.set_surface_params(mtheta_eq, vac_inputs.mlow, mhigh_test,
                                     1, vac_inputs.qa, vac_inputs.r,
                                     vac_inputs.z, vac_inputs.delta)
 
@@ -152,7 +153,7 @@ if benchmark_m
                           complex_flag, kernelsign, wall_flag,
                           farwall_flag, grri_test, xzpts, ahg_file, "$(@__DIR__)/../../examples/DIIID-like_ideal_example")
 
-        JPEC.Vacuum.unset_dcon_params()
+        JPEC.Vacuum.unset_surface_params()
 
         # Compute Julia solution
         vac_inputs_test_m = deepcopy(vac_inputs)

diff --git a/benchmarks/DIIID_ideal_example/vacuum_speed_benchmark.jl b/benchmarks/DIIID_ideal_example/vacuum_speed_benchmark.jl
@@ -7,7 +7,8 @@ using Plots
 Pkg.activate("../..");
 using JPEC
 
-@load "benchmark_inputs.jld2" benchmark_inputs
+# this requires you to have run the DIIID-like_ideal_example first to generate the benchmark inputs
+@load "$(@__DIR__)/../../examples/DIIID-like_ideal_example/benchmark_inputs.jld2" benchmark_inputs
 
 (; wv_block, mpert, mtheta_eq, mthvac, complex_flag, kernelsign,
     wall_flag, farwall_flag, grri, xzpts, ahg_file, dir_path,
@@ -37,7 +38,7 @@ if benchmark_n
         println("Benchmarking n = $n_test")
 
         # Benchmark Fortran version
-        JPEC.Vacuum.set_dcon_params(mtheta_eq, vac_inputs.mlow, vac_inputs.mhigh,
+        JPEC.Vacuum.set_surface_params(mtheta_eq, vac_inputs.mlow, vac_inputs.mhigh,
             n_test, vac_inputs.qa, vac_inputs.r,
             vac_inputs.z, vac_inputs.delta)
 
@@ -50,7 +51,7 @@ if benchmark_n
         push!(fortran_allocs, median(b_fortran).allocs)
         push!(fortran_memory, median(b_fortran).memory / 1e6)
 
-        JPEC.Vacuum.unset_dcon_params()
+        JPEC.Vacuum.unset_surface_params()
 
         # Benchmark Julia version
         vac_inputs_test = deepcopy(vac_inputs)
@@ -107,7 +108,7 @@ if benchmark_m
         mpert_test = mhigh_test - vac_inputs.mlow
 
         # Benchmark Fortran version
-        JPEC.Vacuum.set_dcon_params(mtheta_eq, vac_inputs.mlow, mhigh_test,
+        JPEC.Vacuum.set_surface_params(mtheta_eq, vac_inputs.mlow, mhigh_test,
             1, vac_inputs.qa, vac_inputs.r,
             vac_inputs.z, vac_inputs.delta)
 
@@ -120,7 +121,7 @@ if benchmark_m
         push!(fortran_mhigh_allocs, median(b_fortran).allocs)
         push!(fortran_mhigh_memory, median(b_fortran).memory / 1e6)
 
-        JPEC.Vacuum.unset_dcon_params()
+        JPEC.Vacuum.unset_surface_params()
 
         # Benchmark Julia version
         vac_inputs_test = deepcopy(vac_inputs)

diff --git a/benchmarks/Solovev_ideal_example/vacuum_accuracy_benchmark.jl b/benchmarks/Solovev_ideal_example/vacuum_accuracy_benchmark.jl
@@ -8,6 +8,7 @@ default(markersize=2)
 
 Pkg.activate("$(@__DIR__)/../.."); using JPEC
 
+# this requires you to have run the Solovev_ideal_example first to generate the benchmark inputs
 @load "$(@__DIR__)/../../examples/Solovev_ideal_example/vacuum_response_inputs.jld2" benchmark_inputs
 
 (; wv_block, mpert, mtheta_eq, mthvac, complex_flag, kernelsign,
@@ -48,7 +49,7 @@ if benchmark_n
         println("Testing n = $n_test")
 
         # Compute Fortran solution
-        JPEC.Vacuum.set_dcon_params(mtheta_eq, vac_inputs.mlow, vac_inputs.mhigh,
+        JPEC.Vacuum.set_surface_params(mtheta_eq, vac_inputs.mlow, vac_inputs.mhigh,
                                     n_test, vac_inputs.qa, vac_inputs.r,
                                     vac_inputs.z, vac_inputs.delta)
 
@@ -57,7 +58,7 @@ if benchmark_n
                           complex_flag, kernelsign, wall_flag,
                           farwall_flag, grri, xzpts)
 
-        JPEC.Vacuum.unset_dcon_params()
+        JPEC.Vacuum.unset_surface_params()
 
         # Compute Julia solution
         vac_inputs_test = deepcopy(vac_inputs)
@@ -122,7 +123,7 @@ if benchmark_a
         println("Testing a = $a_test")
 
         # Compute Fortran solution
-        JPEC.Vacuum.set_dcon_params(mtheta_eq, vac_inputs.mlow, vac_inputs.mhigh,
+        JPEC.Vacuum.set_surface_params(mtheta_eq, vac_inputs.mlow, vac_inputs.mhigh,
                                     vac_inputs.n, vac_inputs.qa, vac_inputs.r,
                                     vac_inputs.z, vac_inputs.delta)
 
@@ -136,7 +137,7 @@ if benchmark_a
                           complex_flag, kernelsign, wall_flag,
                           farwall_flag, grri, xzpts)
 
-        JPEC.Vacuum.unset_dcon_params()
+        JPEC.Vacuum.unset_surface_params()
 
         # Compute Julia solution
         new_wall = JPEC.Vacuum.WallShapeSettings(
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,7 @@ @@
     .vscode
     *.DS_Store
     *.pdf
+    !docs/resources/*.pdf
     *.png
     *.jld2
     .gitattributes
@@ Expand Down @@