Disable metric tensor getter with (x, y) arguments when BOUT_USE_METR…

…IC_3D.
tomc271 · Sep 25, 2024 · 35d0912 · 35d0912
1 parent f2e01ab
commit 35d0912
Showing 1 changed file with 3 additions and 17 deletions.
diff --git a/include/bout/coordinates.hxx b/include/bout/coordinates.hxx
@@ -154,14 +154,7 @@ public:
   const BoutReal& g_13(int x, int y, int z) const { return covariantMetricTensor.g13(x, y, z); }
   const BoutReal& g_23(int x, int y, int z) const { return covariantMetricTensor.g23(x, y, z); }
 
-#if BOUT_USE_METRIC_3D
-  const BoutReal* g_11(int x, int y) const { return covariantMetricTensor.g11(x, y); }
-  const BoutReal* g_22(int x, int y) const { return covariantMetricTensor.g22(x, y); }
-  const BoutReal* g_33(int x, int y) const { return covariantMetricTensor.g33(x, y); }
-  const BoutReal* g_12(int x, int y) const { return covariantMetricTensor.g12(x, y); }
-  const BoutReal* g_13(int x, int y) const { return covariantMetricTensor.g13(x, y); }
-  const BoutReal* g_23(int x, int y) const { return covariantMetricTensor.g23(x, y); }
-#else
+#if BOUT_USE_METRIC_3D != 1
   const BoutReal& g_11(int x, int y) const { return covariantMetricTensor.g11(x, y); }
   const BoutReal& g_22(int x, int y) const { return covariantMetricTensor.g22(x, y); }
   const BoutReal& g_33(int x, int y) const { return covariantMetricTensor.g33(x, y); }
@@ -177,15 +170,8 @@ public:
   const BoutReal& g12(int x, int y, int z) const { return contravariantMetricTensor.g12(x, y, z); }
   const BoutReal& g13(int x, int y, int z) const { return contravariantMetricTensor.g13(x, y, z); }
   const BoutReal& g23(int x, int y, int z) const { return contravariantMetricTensor.g23(x, y, z); }
-
-#if BOUT_USE_METRIC_3D
-  const BoutReal* g11(int x, int y) const { return contravariantMetricTensor.g11(x, y); }
-  const BoutReal* g22(int x, int y) const { return contravariantMetricTensor.g22(x, y); }
-  const BoutReal* g33(int x, int y) const { return contravariantMetricTensor.g33(x, y); }
-  const BoutReal* g12(int x, int y) const { return contravariantMetricTensor.g12(x, y); }
-  const BoutReal* g13(int x, int y) const { return contravariantMetricTensor.g13(x, y); }
-  const BoutReal* g23(int x, int y) const { return contravariantMetricTensor.g23(x, y); }
-#else
+
+#if BOUT_USE_METRIC_3D != 1
   const BoutReal& g11(int x, int y) const { return contravariantMetricTensor.g11(x, y); }
   const BoutReal& g22(int x, int y) const { return contravariantMetricTensor.g22(x, y); }
   const BoutReal& g33(int x, int y) const { return contravariantMetricTensor.g33(x, y); }