Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions doc/grid-file.rst
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,11 @@ BoutMesh writes three poloidal coordinates to the grid file:
- The total poloidal distance around a closed flux surface in the core.
Not calculated on open flux surfaces.

* - ``total_parallel_distance``

- The total distance parallel to a magnetic field line around a closed
flux surface in the core. Not calculated on open flux surfaces.

* - ``ShiftAngle``

- The total toroidal angular displacement when following a field line one
Expand Down Expand Up @@ -259,6 +264,13 @@ Integral quantities
surface to the grid point (on open field lines), or from the poloidal
location of the lower X-point (on closed field lines).

* - ``parallel_distance``

- Distance (in metres) parallel to a magnetic field line from the lower
divertor target of each flux surface to the grid point (on open field
lines), or from the poloidal location of the lower X-point (on closed
field lines).

* - ``zShift``

- Toroidal displacement of a field line followed from some reference
Expand Down
1 change: 1 addition & 0 deletions doc/whats-new.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ Release history
- Set the dimension for R_closed_wall and Z_closed_wall to 'closed_wall'. Fixes
loading of grid files by xBOUT (#191).
By [John Omotani](https://github.com/johnomotani)
- Calculate the parallel distance along field lines, and save to the output (#193).


### New features
Expand Down
153 changes: 108 additions & 45 deletions hypnotoad/core/equilibrium.py

Large diffs are not rendered by default.

210 changes: 180 additions & 30 deletions hypnotoad/core/mesh.py

Large diffs are not rendered by default.

Loading