From 31d6bcfac6722b501baa81c087937fd576ddaf4f Mon Sep 17 00:00:00 2001 From: tomc271 Date: Mon, 18 Nov 2024 13:03:59 +0000 Subject: [PATCH] Fix: Move b0xcv to TokamakCoordinatesFactory --- tests/integrated/test-drift-instability/2fluid.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/integrated/test-drift-instability/2fluid.cxx b/tests/integrated/test-drift-instability/2fluid.cxx index 3699b71b6e..7e81652dab 100644 --- a/tests/integrated/test-drift-instability/2fluid.cxx +++ b/tests/integrated/test-drift-instability/2fluid.cxx @@ -337,8 +337,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 +349,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); }