Remove call to calculateGeometry() in tests and examples since no lon…

…ger need to call it now that metric tensor quantities are updated by Coordinates::recalculateAndReset when calling setContravariantMetricTensor() and setCovariantMetricTensor().
boutproject · Dec 5, 2023 · 1412aaa · 1412aaa
1 parent 4af8002
commit 1412aaa
Show file tree

Hide file tree

Showing 21 changed files with 7 additions and 49 deletions.
diff --git a/examples/2Dturbulence_multigrid/esel.cxx b/examples/2Dturbulence_multigrid/esel.cxx
@@ -89,8 +89,6 @@ class ESEL : public PhysicsModel {
     g_23 = 0.0;
     coord->setCovariantMetricTensor(MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
 
-    coord->calculateGeometry();
-
     SOLVE_FOR(N, vort);
     SAVE_REPEAT(phi);
     if (test_laplacian) {

diff --git a/examples/6field-simple/elm_6f.cxx b/examples/6field-simple/elm_6f.cxx
@@ -1072,8 +1072,6 @@ class Elm_6f : public PhysicsModel {
     g_23 = Btxy * hthe * Rxy / Bpxy;
     coord->setCovariantMetricTensor(MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
 
-    coord->calculateGeometry(); // Calculate quantities from metric tensor
-
     // Set B field vector
 
     B0vec.covariant = false;

diff --git a/examples/conducting-wall-mode/cwm.cxx b/examples/conducting-wall-mode/cwm.cxx
@@ -208,8 +208,6 @@ class CWM : public PhysicsModel {
     g_23 = Btxy * hthe * Rxy / Bpxy;
     coord->setCovariantMetricTensor(MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
 
-    coord->calculateGeometry();
-
     /**************** SET EVOLVING VARIABLES *************/
 
     // Tell BOUT++ which variables to evolve

diff --git a/examples/constraints/alfven-wave/alfven.cxx b/examples/constraints/alfven-wave/alfven.cxx
@@ -220,8 +220,6 @@ class Alfven : public PhysicsModel {
     g_13 = sinty * Rxy * Rxy;
     g_23 = sbp * Btxy * hthe * Rxy / Bpxy;
     coord->setCovariantMetricTensor(MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
-
-    coord->calculateGeometry();
   }
 };
 

diff --git a/examples/dalf3/dalf3.cxx b/examples/dalf3/dalf3.cxx
@@ -274,8 +274,6 @@ class DALF3 : public PhysicsModel {
     g_23 = Btxy * hthe * Rxy / Bpxy;
     coord->setCovariantMetricTensor(MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
 
-    coord->calculateGeometry(); // Calculate quantities from metric tensor
-
     SOLVE_FOR3(Vort, Pe, Vpar);
     comms.add(Vort, Pe, Vpar);
     if (!(estatic && ZeroElMass)) {

diff --git a/examples/elm-pb-outerloop/elm_pb_outerloop.cxx b/examples/elm-pb-outerloop/elm_pb_outerloop.cxx
@@ -1109,8 +1109,6 @@ class ELMpb : public PhysicsModel {
     metric->g_13 = I * Rxy * Rxy;
     metric->g_23 = Btxy * hthe * Rxy / Bpxy;
 
-    metric->calculateGeometry(); // Calculate quantities from metric tensor
-
     // Set B field vector
 
     B0vec.covariant = false;
@@ -1669,12 +1667,12 @@ class ELMpb : public PhysicsModel {
 #endif
     };
 
-      // Terms which are not yet single index operators
-      // Note: Terms which are included in the single index loop
-      //       may be commented out here, to allow comparison/testing
+    // Terms which are not yet single index operators
+    // Note: Terms which are included in the single index loop
+    //       may be commented out here, to allow comparison/testing
 
-      ////////////////////////////////////////////////////
-      // Parallel electric field
+    ////////////////////////////////////////////////////
+    // Parallel electric field
 
 #if not EVOLVE_JPAR
     // Vector potential

diff --git a/examples/elm-pb/elm_pb.cxx b/examples/elm-pb/elm_pb.cxx
@@ -1049,8 +1049,6 @@ class ELMpb : public PhysicsModel {
     metric->g_13 = I * Rxy * Rxy;
     metric->g_23 = Btxy * hthe * Rxy / Bpxy;
 
-    metric->calculateGeometry(); // Calculate quantities from metric tensor
-
     // Set B field vector
 
     B0vec.covariant = false;

diff --git a/examples/gyro-gem/gem.cxx b/examples/gyro-gem/gem.cxx
@@ -390,8 +390,6 @@ class GEM : public PhysicsModel {
     g_23 = Btxy * hthe * Rxy / Bpxy;
     coord->setCovariantMetricTensor(MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
 
-    coord->calculateGeometry();
-
     // Set B field vector
 
     B0vec.covariant = false;

diff --git a/examples/jorek-compare/jorek_compare.cxx b/examples/jorek-compare/jorek_compare.cxx
@@ -320,8 +320,6 @@ class Jorek : public PhysicsModel {
     g_23 = Btxy * hthe * Rxy / Bpxy;
     coord->setCovariantMetricTensor(MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
 
-    coord->calculateGeometry(); // Calculate quantities from metric tensor
-
     // Set B field vector
     B0vec.covariant = false;
     B0vec.x = 0.;

diff --git a/examples/lapd-drift/lapd_drift.cxx b/examples/lapd-drift/lapd_drift.cxx
@@ -352,8 +352,6 @@ class LAPDdrift : public PhysicsModel {
     g_23 = Btxy * hthe * Rxy / Bpxy;
     coord->setCovariantMetricTensor(MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
 
-    coord->calculateGeometry();
-
     rho0 = Ni0 * Delp2(phi0) + Perp_Grad_dot_Grad(phi0, Ni0);
 
     /**************** SET EVOLVING VARIABLES *************/

diff --git a/examples/laplacexy/alfven-wave/alfven.cxx b/examples/laplacexy/alfven-wave/alfven.cxx
@@ -201,7 +201,7 @@ class Alfven : public PhysicsModel {
     if (min(Bpxy, true) < 0.0) {
       sbp = -1.0;
     }
-    
+
     MetricTensor::FieldMetric g11, g22, g33, g12, g13, g23;
     g11 = SQ(Rxy * Bpxy);
     g22 = 1.0 / SQ(hthe);
@@ -221,8 +221,6 @@ class Alfven : public PhysicsModel {
     g_13 = sinty * Rxy * Rxy;
     g_23 = sbp * Btxy * hthe * Rxy / Bpxy;
     coord->setCovariantMetricTensor(MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
-
-    coord->calculateGeometry();
   }
 };
 

diff --git a/examples/laplacexy/laplace_perp/test.cxx b/examples/laplacexy/laplace_perp/test.cxx
@@ -45,8 +45,6 @@ int main(int argc, char** argv) {
     g_13 = I * Rxy * Rxy;
     g_23 = Btxy * hthe * Rxy / Bpxy;
     coord->setCovariantMetricTensor(MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
-
-    coord->calculateGeometry();
   }
   ///////////////////////////////////////
 

diff --git a/examples/reconnect-2field/2field.cxx b/examples/reconnect-2field/2field.cxx
@@ -183,8 +183,6 @@ class TwoField : public PhysicsModel {
     g_23 = Btxy * hthe * Rxy / Bpxy;
     coord->setCovariantMetricTensor(MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
 
-    coord->calculateGeometry();
-
     // Tell BOUT++ which variables to evolve
     SOLVE_FOR(U, Apar);
 

diff --git a/examples/shear-alfven-wave/2fluid.cxx b/examples/shear-alfven-wave/2fluid.cxx
@@ -202,8 +202,6 @@ class ShearAlfven : public PhysicsModel {
     g_23 = Btxy * hthe * Rxy / Bpxy;
     coord->setCovariantMetricTensor(MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
 
-    coord->calculateGeometry();
-
     /**************** SET EVOLVING VARIABLES *************/
 
     // Tell BOUT++ which variables to evolve

diff --git a/examples/uedge-benchmark/ue_bmark.cxx b/examples/uedge-benchmark/ue_bmark.cxx
@@ -160,8 +160,6 @@ class UedgeBenchmark : public PhysicsModel {
     g_23 = Btxy * hthe * Rxy / Bpxy;
     coords->setCovariantMetricTensor(MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
 
-    coords->calculateGeometry(); // Calculate other metrics
-
     //////////////// BOUNDARIES ///////////////////////
     //
     // We want to apply the relaxing boundries to total density,

diff --git a/examples/wave-slab/wave_slab.cxx b/examples/wave-slab/wave_slab.cxx
@@ -51,8 +51,6 @@ class WaveTest : public PhysicsModel {
     g_23 = Btxy * hthe * Rxy / Bpxy;
     coords->setCovariantMetricTensor(MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
 
-    coords->calculateGeometry();
-
     solver->add(f, "f");
     solver->add(g, "g");
 

diff --git a/tests/MMS/diffusion/diffusion.cxx b/tests/MMS/diffusion/diffusion.cxx
@@ -43,15 +43,12 @@ int Diffusion::init(bool UNUSED(restarting)) {
   SAVE_ONCE(mu_N);
 
   //set mesh
-  auto contravariant_metric_tensor =
-      MetricTensor(1.1, 1.1, 1.1, 0.0, 0.0, 0.0);
+  auto contravariant_metric_tensor = MetricTensor(1.1, 1.1, 1.1, 0.0, 0.0, 0.0);
   coord->setContravariantMetricTensor(contravariant_metric_tensor);
 
   auto covariant_metric_tensor = MetricTensor(1.1, 1.1, 1.1, 0.0, 0.0, 0.0);
   coord->setCovariantMetricTensor(covariant_metric_tensor);
 
-  coord->calculateGeometry();
-
   // Tell BOUT++ to solve N
   SOLVE_FOR(N);
 

diff --git a/tests/MMS/wave-1d/wave.cxx b/tests/MMS/wave-1d/wave.cxx
@@ -38,8 +38,6 @@ class Wave1D : public PhysicsModel {
     auto covariant_metric_tensor = MetricTensor(1.1, 1.1, 1.1, 0.0, 0.0, 0.0);
     coord->setCovariantMetricTensor(covariant_metric_tensor);
 
-    coord->calculateGeometry();
-
     g.setLocation(CELL_XLOW); // g staggered to the left of f
 
     // Tell BOUT++ to solve f and g

diff --git a/tests/integrated/test-drift-instability/2fluid.cxx b/tests/integrated/test-drift-instability/2fluid.cxx
@@ -237,8 +237,6 @@ class TwoFluid : public PhysicsModel {
     g_23 = Btxy * hthe * Rxy / Bpxy;
     coord->setCovariantMetricTensor(MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
 
-    coord->calculateGeometry();
-
     /**************** SET EVOLVING VARIABLES *************/
 
     // Tell BOUT++ which variables to evolve

diff --git a/tests/integrated/test-interchange-instability/2fluid.cxx b/tests/integrated/test-interchange-instability/2fluid.cxx
@@ -159,8 +159,6 @@ class Interchange : public PhysicsModel {
     g_23 = Btxy * hthe * Rxy / Bpxy;
     coord->setCovariantMetricTensor(MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23));
 
-    coord->calculateGeometry();
-
     // Tell BOUT++ which variables to evolve
     SOLVE_FOR2(rho, Ni);
 

diff --git a/tests/unit/invert/laplace/test_laplace_cyclic.cxx b/tests/unit/invert/laplace/test_laplace_cyclic.cxx
@@ -85,7 +85,6 @@ class CyclicTest : public FakeMeshFixture,
 
     static_cast<FakeMesh*>(bout::globals::mesh)
         ->setGridDataSource(new GridFromOptions(Options::getRoot()));
-    bout::globals::mesh->getCoordinates()->calculateGeometry();
     f3.allocate();
     coef2.allocate();
     coef3.allocate();