Skip to content

Commit 2ee750f

Browse files
committed
Restore mesh->getCoordinates() calls
since TokamakCoordinates function now doesn't return Coordinates.
1 parent e6bf572 commit 2ee750f

File tree

11 files changed

+18
-1
lines changed

11 files changed

+18
-1
lines changed

examples/6field-simple/elm_6f.cxx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,9 @@ class Elm_6f : public PhysicsModel {
378378

379379
bool noshear;
380380

381+
// Get the metric tensor
382+
Coordinates* coord = mesh->getCoordinates();
383+
381384
output.write("Solving high-beta flute reduced equations\n");
382385
output.write("\tFile : {:s}\n", __FILE__);
383386
output.write("\tCompiled: {:s} at {:s}\n", __DATE__, __TIME__);

examples/conducting-wall-mode/cwm.cxx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ class CWM : public PhysicsModel {
6262
// Load 2D profiles (set to zero if not found)
6363
GRID_LOAD(Ni0, Te0);
6464

65+
coord = mesh->getCoordinates();
66+
67+
6568
// Load normalisation values
6669
GRID_LOAD(Te_x, Ni_x, bmag);
6770

examples/constraints/alfven-wave/alfven.cxx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,9 @@ class Alfven : public PhysicsModel {
160160

161161
void LoadMetric(BoutReal Lnorm, BoutReal Bnorm) {
162162

163+
// Get the coordinates object
164+
Coordinates* coord = mesh->getCoordinates();
165+
163166
bool noshear;
164167

165168
// Check type of parallel transform

examples/dalf3/dalf3.cxx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,8 @@ class DALF3 : public PhysicsModel {
154154
return 1;
155155
}
156156

157+
Coordinates* coord = mesh->getCoordinates();
158+
157159
// SHIFTED RADIAL COORDINATES
158160

159161
// Check type of parallel transform

examples/elm-pb-outerloop/elm_pb_outerloop.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,7 @@ class ELMpb : public PhysicsModel {
357357
// Note: The rhs() function needs to be public so that RAJA can use CUDA
358358

359359
int init(bool restarting) override {
360+
Coordinates* metric = mesh->getCoordinates();
360361

361362
output.write("Solving high-beta flute reduced equations\n");
362363
output.write("\tFile : {:s}\n", __FILE__);

examples/elm-pb/elm_pb.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ class ELMpb : public PhysicsModel {
300300

301301
bool noshear;
302302

303-
Coordinates *metric = mesh->getCoordinates();
303+
Coordinates* metric = mesh->getCoordinates();
304304

305305
output.write("Solving high-beta flute reduced equations\n");
306306
output.write("\tFile : {:s}\n", __FILE__);

examples/gyro-gem/gem.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,7 @@ class GEM : public PhysicsModel {
345345
output << "\tNormalised rho_e = " << rho_e << endl;
346346
output << "\tNormalised rho_i = " << rho_i << endl;
347347

348+
coord = mesh->getCoordinates();
348349
// Set B field vector
349350

350351
B0vec.covariant = false;

examples/laplacexy/laplace_perp/test.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ int main(int argc, char** argv) {
1818
set_tokamak_coordinates_on_mesh(tokamak_coordinates, *mesh, true, 1.0, 1.0);
1919
}
2020

21+
Coordinates* coord = mesh->getCoordinates();
2122
///////////////////////////////////////
2223

2324
// Read an analytic input

tests/integrated/test-drift-instability/2fluid.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ class TwoFluid : public PhysicsModel {
8686
b0xcv.covariant = false; // Read contravariant components
8787
mesh->get(b0xcv, "bxcv"); // b0xkappa terms
8888

89+
coord = mesh->getCoordinates();
8990
// Load normalisation values
9091
GRID_LOAD(Te_x);
9192
GRID_LOAD(Ti_x);

tests/integrated/test-interchange-instability/2fluid.cxx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class Interchange : public PhysicsModel {
5454

5555
b0xcv *= -1.0; // NOTE: THIS IS FOR 'OLD' GRID FILES ONLY
5656

57+
coord = mesh->getCoordinates();
5758
// Load normalisation values
5859
GRID_LOAD(Te_x);
5960
GRID_LOAD(Ti_x);

0 commit comments

Comments
 (0)