Pass no shear condition to set_tokamak_coordinates_on_mesh() as an (optional) integer parameter rather than a boolean

Suggested on PR.

Author: tomchapman

examples/6field-simple/elm_6f.cxx

@@ -1031,10 +1031,11 @@ class Elm_6f : public PhysicsModel {
     // SHIFTED RADIAL COORDINATES
     if (!mesh->IncIntShear) {
       noshear = true;
+      ShearFactor = 1.0;
     }
 
     /**************** CALCULATE METRICS ******************/
-    set_tokamak_coordinates_on_mesh(tokamak_options, *mesh, noshear, Lbar, Bbar);
+    set_tokamak_coordinates_on_mesh(tokamak_options, *mesh, Lbar, Bbar, 1.0);
 
     //////////////////////////////////////////////////////////////
     // SHIFTED RADIAL COORDINATES

examples/conducting-wall-mode/cwm.cxx

@@ -55,8 +55,6 @@ class CWM : public PhysicsModel {
 
   int init(bool UNUSED(restarting)) override {
 
-    bool noshear = false;
-
     /************* LOAD DATA FROM GRID FILE ****************/
 
     // Load 2D profiles (set to zero if not found)
@@ -95,7 +93,7 @@ class CWM : public PhysicsModel {
             "identity");
 
     if (lowercase(ptstr) == "shifted") {
-      noshear = true;
+      ShearFactor = 0.0; // I disappears from metric
     }
 
     /************** CALCULATE PARAMETERS *****************/
@@ -132,7 +130,7 @@ class CWM : public PhysicsModel {
     Te0 /= Te_x;
 
     // Normalise geometry
-    set_tokamak_coordinates_on_mesh(tokamak_options, *mesh, noshear, rho_s, bmag / 1e4, ShearFactor);
+    set_tokamak_coordinates_on_mesh(tokamak_options, *mesh, rho_s, bmag / 1e4, ShearFactor);
 
     // Set nu
     nu = nu_hat * Ni0 / pow(Te0, 1.5);

examples/constraints/alfven-wave/alfven.cxx

@@ -163,18 +163,18 @@ class Alfven : public PhysicsModel {
     // Get the coordinates object
     Coordinates* coord = mesh->getCoordinates();
 
-    bool noshear;
-
     // Check type of parallel transform
     std::string ptstr =
         Options::root()["mesh"]["paralleltransform"]["type"].withDefault("identity");
 
+    BoutReal shearFactor = 1.0
     if (lowercase(ptstr) == "shifted") {
-      noshear = true;
+      // Using shifted metric method
+      shearFactor = 0.0; // I disappears from metric
     }
 
     auto tokamak_options = TokamakOptions(*mesh);
-    set_tokamak_coordinates_on_mesh(tokamak_options, *mesh, noshear, Lnorm, Bnorm);
+    set_tokamak_coordinates_on_mesh(tokamak_options, *mesh, Lnorm, Bnorm, shearFactor);
   }
 };
 

examples/dalf3/dalf3.cxx

@@ -86,8 +86,6 @@ class DALF3 : public PhysicsModel {
 protected:
   int init(bool UNUSED(restarting)) override {
 
-    bool noshear;
-
     /////////////////////////////////////////////////////
     // Load data from the grid
 
@@ -162,10 +160,11 @@ class DALF3 : public PhysicsModel {
     std::string ptstr =
         Options::root()["mesh"]["paralleltransform"]["type"].withDefault("identity");
 
+    BoutReal shearFactor = 1.0;
     if (lowercase(ptstr) == "shifted") {
       // Dimits style, using local coordinate system
       b0xcv.z += tokamak_options.I * b0xcv.x;
-      noshear = true;
+      shearFactor = 0.0; // I disappears from metric
     }
 
     ///////////////////////////////////////////////////
@@ -224,7 +223,7 @@ class DALF3 : public PhysicsModel {
     b0xcv.z *= rho_s * rho_s;
 
     // Metrics
-    set_tokamak_coordinates_on_mesh(tokamak_options, *mesh, noshear, rho_s, Bnorm);
+    set_tokamak_coordinates_on_mesh(tokamak_options, *mesh, rho_s, Bnorm, shearFactor);
 
     SOLVE_FOR3(Vort, Pe, Vpar);
     comms.add(Vort, Pe, Vpar);