Fix mix up between the two shear factor variables

tomc271 · Nov 19, 2024 · 43c0aee · 43c0aee
1 parent cb9c39e
commit 43c0aee
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/include/bout/tokamak_coordinates_factory.hxx b/include/bout/tokamak_coordinates_factory.hxx
@@ -92,7 +92,6 @@ public:
       if (include_curvature) {
         b0xcv_m.z += ShearFactor_m * b0xcv_m.x;
       }
-      ShearFactor_m = 0.0;
     }
 
     //      if (ShiftXderivs and not!mesh->IncIntShear) {

diff --git a/tests/integrated/test-drift-instability/2fluid.cxx b/tests/integrated/test-drift-instability/2fluid.cxx
@@ -66,7 +66,6 @@ class TwoFluid : public PhysicsModel {
 
 protected:
   int init(bool UNUSED(restarting)) override {
-    Field2D I; // Shear factor
 
     output.write("Solving 6-variable 2-fluid equations\n");
 
@@ -129,6 +128,7 @@ class TwoFluid : public PhysicsModel {
     bool noshear = false;
     const bool ShiftXderivs = (*globalOptions)["ShiftXderivs"].withDefault(false);
     if (ShiftXderivs) {
+      ShearFactor = 0.0; // I disappears from metric
       noshear = true;
     }
 

diff --git a/tests/integrated/test-interchange-instability/2fluid.cxx b/tests/integrated/test-interchange-instability/2fluid.cxx
@@ -37,7 +37,6 @@ class Interchange : public PhysicsModel {
 
 protected:
   int init(bool UNUSED(restarting)) override {
-    Field2D I; // Shear factor
 
     output << "Solving 2-variable equations\n";
 
@@ -76,6 +75,7 @@ class Interchange : public PhysicsModel {
     bool noshear = false;
     const bool ShiftXderivs = (*globalOptions)["ShiftXderivs"].withDefault(false);
     if (ShiftXderivs) {
+      ShearFactor = 0.0; // I disappears from metric
       noshear = true;
     }