Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
240bf4f
Extract function tokamak_coordinates(coord, Rxy, Bpxy, hthe, I, B0, B…
tomchapman Oct 10, 2024
ef81a05
Use function in more examples
tomchapman Oct 10, 2024
53d4f98
Move and rename "examples/common.hxx" to "include/bout/tokamak_coordi…
tomchapman Oct 11, 2024
f5f93de
Use function `tokamak_coordinates` in tests
tomchapman Oct 11, 2024
a5dab54
Make function `tokamak_coordinates` provide the Coordinates object
tomchapman Oct 15, 2024
7f5d78b
Bxy and dx may be Field2D or Field3D
tomchapman Nov 4, 2024
a623183
Make tokamak_coordinates a method on new class TokamakCoordinatesFactory
tomchapman Nov 6, 2024
5304237
Add constructor (taking mesh as parameter)
tomchapman Nov 6, 2024
cb88cf6
Assign tokamak_coordinates_factory to variable
tomchapman Nov 6, 2024
28e6221
Field mesh_m should be private
tomchapman Nov 6, 2024
e266784
Rename variable (Sign of Bp)
tomchapman Nov 6, 2024
ab2defd
Prefer const ref
tomchapman Nov 6, 2024
e9561f8
Make Rxy a member variable of TokamakCoordinatesFactory
tomchapman Nov 6, 2024
e00cbd8
Get coordinates from TokamakCoordinatesFactory instead of mesh->getCo…
tomchapman Nov 6, 2024
e04e7fd
Rxy has to be of type Field2D
tomchapman Nov 6, 2024
43ba094
Make Bpxy a member variable of TokamakCoordinatesFactory
tomchapman Nov 6, 2024
f1f9c75
Make Btxy a member variable of TokamakCoordinatesFactory
tomchapman Nov 6, 2024
e41dc92
Make B a member variable of TokamakCoordinatesFactory
tomchapman Nov 6, 2024
a2be200
Make hthe a member variable of TokamakCoordinatesFactory
tomchapman Nov 6, 2024
3256092
Make I a member variable of TokamakCoordinatesFactory
tomchapman Nov 8, 2024
7fd82e4
Load values for metric quantities (from mesh) inside TokamakCoordinat…
tomchapman Nov 8, 2024
1189dad
More fixes
tomchapman Nov 8, 2024
b7d1bff
Getters for Rxy, Bpxy, Btxy, Bxy, and hthe cannot be const
tomchapman Nov 9, 2024
47fbd3f
Fixes to dalf3 example
tomchapman Nov 9, 2024
a45cb00
Fixes to elm_pb example
tomchapman Nov 9, 2024
70eb219
Fix typo (double semicolons)
tomchapman Nov 9, 2024
0cc5dac
Assign value to new (const) variable
tomchapman Nov 9, 2024
34c8239
Getters for Rxy, Bpxy, Btxy, Bxy, and hthe can be const
tomchapman Nov 9, 2024
defefb9
Fixes to elm_pb_outerloop example
tomchapman Nov 9, 2024
a07e508
Extract method TokamakCoordinatesFactory.normalise()
tomchapman Nov 9, 2024
382884d
Fix TokamakCoordinatesFactory method calls in elm_pb
tomchapman Nov 10, 2024
5273455
Add dx to TokamakCoordinatesFactory.normalise() method
tomchapman Nov 10, 2024
eba046e
Use extracted methods in more examples and tests
tomchapman Nov 10, 2024
a31b2bb
Extract method setShearFactor()
tomchapman Nov 10, 2024
7e395f4
Restore ShearFactor setter on TokamakCoordinatesFactory
tomchapman Nov 10, 2024
c883dcb
Use extracted methods in alfven-wave example
tomchapman Nov 10, 2024
22e17f1
Extract method TokamakCoordinatesFactory.get_sign_of_bp()
tomchapman Nov 10, 2024
fe6cc63
Use extracted method TokamakCoordinatesFactory.normalise() in more pl…
tomchapman Nov 10, 2024
4ee074f
Reorder (instantiate TokamakCoordinatesFactory before first use)
tomchapman Nov 10, 2024
e6625e8
Use new getters and setters elm_pb_outerloop
tomchapman Nov 10, 2024
0c00e37
More use of new getters and setters elm_pb_outerloop
tomchapman Nov 10, 2024
39e727b
Get Bxy from the Coordinates object
tomchapman Nov 10, 2024
73f8ec7
Bxy has to be of type Field2D, so get from TokamakCoordinatesFactory …
tomchapman Nov 10, 2024
27cb929
Bxy is now normalised in TokamakCoordinatesFactory.normalise()
tomchapman Nov 10, 2024
6f0cab2
Move b0xcv to TokamakCoordinatesFactory
tomchapman Nov 10, 2024
58606f7
Normalise b0xcv (magnetic curvature term)
tomchapman Nov 10, 2024
397d50e
dx is now normalised in TokamakCoordinatesFactory.normalise()
tomchapman Nov 10, 2024
19843b0
Make make_tokamak_coordinates method take optional boolean argument s…
tomchapman Nov 10, 2024
42df7b6
dx is now normalised in TokamakCoordinatesFactory.normalise()
tomchapman Nov 10, 2024
a86df4e
Normalise b0xcv (magnetic curvature term) moved to normalise() method…
tomchapman Nov 10, 2024
d953304
Pass arguments noshear include_curvature to make_tokamak_coordinates …
tomchapman Nov 10, 2024
31d07d6
Further fixes to `Pass arguments noshear include_curvature to make_to…
tomchapman Nov 10, 2024
aad6afc
Remove unused method set_ShearFactor()
tomchapman Nov 10, 2024
2e4e46f
More fixes
tomchapman Nov 10, 2024
1cdc3b7
Finish: Move b0xcv to TokamakCoordinatesFactory
tomchapman Nov 10, 2024
38d7501
Further fixes to `Pass arguments noshear include_curvature to make_to…
tomchapman Nov 10, 2024
3a445df
dx is now normalised in TokamakCoordinatesFactory.normalise()
tomchapman Nov 10, 2024
1878107
Declare variable noshear
tomchapman Nov 10, 2024
1016401
Further small fixes
tomchapman Nov 10, 2024
bf00451
Declare variable noshear
tomchapman Nov 10, 2024
1e3ada6
noshear and include_curvature variables don't exist in gem example
tomchapman Nov 10, 2024
7a618ff
TokamakCoordinatesFactory instance can't be const
tomchapman Nov 11, 2024
8bf978e
include_curvature variable doesn't exist in test-drift-instability/2f…
tomchapman Nov 18, 2024
1e3eb2a
Fix: Move b0xcv to TokamakCoordinatesFactory
tomchapman Nov 18, 2024
3da9f17
Set ShearFactor before using it
tomchapman Nov 19, 2024
1db3688
Extract method set_shearfactor_and_curvature_term()
tomchapman Nov 19, 2024
85df36c
clang-tidy: directly include headers
tomchapman Nov 19, 2024
b02df20
Access b0xcv (curvature term) through getter
tomchapman Nov 19, 2024
ebcce8c
Fix tests gbs and conducting-wall-mode/cwm - don't redefine coords ob…
tomchapman Nov 19, 2024
2d228ce
Initialise noshear to false
tomchapman Nov 19, 2024
192b45c
Must call tokamak_coordinates_factory.normalise() before tokamak_coor…
tomchapman Nov 19, 2024
bff4734
Pass (optional) ShearFactor parameter to TokamakCoordinatesFactory.no…
tomchapman Nov 19, 2024
a3156c9
Fix mix up between the two shear factor variables
tomchapman Nov 19, 2024
c52c7e0
Make variable const
tomchapman Nov 19, 2024
f7532aa
Fix: "Must call tokamak_coordinates_factory.normalise() before tokama…
tomchapman Nov 21, 2024
dfedefb
Fix TokamakCoordinatesFactory: Set dx
tomchapman Nov 21, 2024
183af00
Fix syntax typo (compound assignments operators in normalise() method)
tomchapman Nov 22, 2024
8410df2
Remove b0xcv (curvature term) from TokamakCoordinatesFactory
tomchapman Nov 22, 2024
a50a51c
Make TokamakCoordinatesFactory.normalise() private and call in make_t…
tomchapman Dec 4, 2024
ca83f7a
Rename TokamakCoordinatesFactory getters
tomchapman Dec 4, 2024
a83193b
Rename class and method
tomchapman Dec 16, 2024
a029aa7
Move implementation of TokamakCoordinates class out of header file
tomchapman Dec 16, 2024
4b5ab57
Apply clang-format changes
tomc271 Dec 16, 2024
4f2446f
Copy values to local variables
tomchapman Jan 13, 2025
89bc589
Fix: Add new parameters Lbar and Bbar to make_coordinates method call
tomchapman Jan 13, 2025
1b192b2
const qualifier in parameter declaration has no effect
tomchapman Jan 13, 2025
60940af
Fix "Copy values to local variables"
tomchapman Jan 13, 2025
07b8e14
Make TokamakCoordinates a struct rather than a class
tomchapman Jan 14, 2025
e6bf572
Rename make_coordinates() to set_tokamak_coordinates_on_mesh() and do…
tomchapman Jan 14, 2025
2ee750f
Restore mesh->getCoordinates() calls
tomchapman Jan 15, 2025
3e88db4
Rename struct TokamakCoordinates to TokamakOptions
tomchapman Jan 15, 2025
dd0cff9
Fix naming clash
tomchapman Feb 17, 2025
6ebc748
Pass no shear condition to set_tokamak_coordinates_on_mesh() as an (o…
tomchapman Feb 17, 2025
3d6b2c1
If no value is specified for dpsi, set TokamakOptions.dx to mesh.getC…
tomchapman Feb 21, 2025
6b4ddcc
Merge branch 'refactor-coordinates' into dry-up-examples
tomchapman Feb 21, 2025
ac26ef9
Apply black changes
tomc271 Feb 21, 2025
0d3b79b
Move implementations to new tokamak_coordinates.cxx file
tomchapman Mar 18, 2025
2f99a73
Move TokamakOptions to `bout` namespace
tomchapman Mar 18, 2025
10c1abe
Also move implementation of normalise() method to cxx file
tomchapman Mar 18, 2025
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
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,8 @@ set(BOUT_SOURCES
./src/mesh/g_values.cxx
${CMAKE_CURRENT_BINARY_DIR}/include/bout/revision.hxx
${CMAKE_CURRENT_BINARY_DIR}/include/bout/version.hxx
./include/bout/tokamak_coordinates.hxx
./src/mesh/tokamak_coordinates.cxx
)


Expand Down
Loading
Loading