Fix: Move b0xcv to TokamakCoordinatesFactory

tomc271 · Nov 19, 2024 · 97a48a3 · 97a48a3
1 parent 21891ae
commit 97a48a3
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/tests/integrated/test-drift-instability/2fluid.cxx b/tests/integrated/test-drift-instability/2fluid.cxx
@@ -58,6 +58,8 @@ class TwoFluid : public PhysicsModel {
 
   FieldGroup comms; // Group of variables for communications
 
+  TokamakCoordinatesFactory tokamak_coordinates_factory = TokamakCoordinatesFactory(*mesh);
+
   Coordinates* coord; // Coordinate system
 
   CELL_LOC maybe_ylow;
@@ -180,7 +182,6 @@ class TwoFluid : public PhysicsModel {
     pei0 = (Ti0 + Te0) * Ni0;
     pe0 = Te0 * Ni0;
 
-    auto tokamak_coordinates_factory = TokamakCoordinatesFactory(*mesh);
     coord = tokamak_coordinates_factory.make_tokamak_coordinates(noshear, true);
     tokamak_coordinates_factory.normalise(rho_s, bmag / 1e4);
 
@@ -337,8 +338,8 @@ class TwoFluid : public PhysicsModel {
     if (evolve_te) {
       ddt(Te) -= vE_Grad(Te0, phi) + vE_Grad(Te, phi0) + vE_Grad(Te, phi);
       ddt(Te) -= Vpar_Grad_par(Ve, Te0) + Vpar_Grad_par(Ve0, Te) + Vpar_Grad_par(Ve, Te);
-      ddt(Te) += 1.333 * Te0 * (V_dot_Grad(b0xcv, pe) / Ni0 - V_dot_Grad(b0xcv, phi));
-      ddt(Te) += 3.333 * Te0 * V_dot_Grad(b0xcv, Te);
+      ddt(Te) += 1.333 * Te0 * (V_dot_Grad(tokamak_coordinates_factory.get_b0xcv(), pe) / Ni0 - V_dot_Grad(tokamak_coordinates_factory.get_b0xcv(), phi));
+      ddt(Te) += 3.333 * Te0 * V_dot_Grad(tokamak_coordinates_factory.get_b0xcv(), Te);
       ddt(Te) += (0.6666667 / Ni0) * Div_par_K_Grad_par(kapa_Te, Te);
     }
 
@@ -349,8 +350,8 @@ class TwoFluid : public PhysicsModel {
       ddt(Ti) -= vE_Grad(Ti0, phi) + vE_Grad(Ti, phi0) + vE_Grad(Ti, phi);
       ddt(Ti) -= Vpar_Grad_par(Vi, Ti0) + Vpar_Grad_par(Vi0, Ti) + Vpar_Grad_par(Vi, Ti);
       ddt(Ti) +=
-          1.333 * (Ti0 * V_dot_Grad(b0xcv, pe) / Ni0 - Ti * V_dot_Grad(b0xcv, phi));
-      ddt(Ti) -= 3.333 * Ti0 * V_dot_Grad(b0xcv, Ti);
+          1.333 * (Ti0 * V_dot_Grad(tokamak_coordinates_factory.get_b0xcv(), pe) / Ni0 - Ti * V_dot_Grad(tokamak_coordinates_factory.get_b0xcv(), phi));
+      ddt(Ti) -= 3.333 * Ti0 * V_dot_Grad(tokamak_coordinates_factory.get_b0xcv(), Ti);
       ddt(Ti) += (0.6666667 / Ni0) * Div_par_K_Grad_par(kapa_Ti, Ti);
     }