Remove calls to calcCovariant() and calcContravariant() since they ar…

…e now calculated when calling setContravariantMetricTensor() and setCovariantMetricTensor().
boutproject · Dec 5, 2023 · 935c061 · 935c061
1 parent 1412aaa
commit 935c061
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 51 deletions.
diff --git a/include/bout/coordinates.hxx b/include/bout/coordinates.hxx
@@ -129,12 +129,6 @@ public:
   /// Calculate differential geometry quantities from the metric tensor
   int calculateGeometry();
 
-  /// Invert contravariant metric to get covariant components
-  void calcCovariant(const std::string& region = "RGN_ALL");
-
-  /// Invert covariant metric to get contravariant components
-  void calcContravariant(const std::string& region = "RGN_ALL");
-
   void jacobian(); ///< Calculate J and Bxy
 
   ///////////////////////////////////////////////////////////

diff --git a/include/bout/geometry.hxx b/include/bout/geometry.hxx
@@ -141,12 +141,6 @@ public:
 
   void setBxy(FieldMetric Bxy);
 
-  /// Invert contravariant metric to get covariant components
-  void calcCovariant(const std::string& region = "RGN_ALL");
-
-  /// Invert covariant metric to get contravariant components
-  void calcContravariant(const std::string& region = "RGN_ALL");
-
   /// Calculate Christoffel symbol terms
   void CalculateChristoffelSymbols(FieldMetric& dx, FieldMetric& dy);
 

diff --git a/src/mesh/coordinates.cxx b/src/mesh/coordinates.cxx
@@ -493,19 +493,6 @@ void Coordinates::setBoundaryCells(Mesh* mesh, Options* options,
     } else {
       output_warn.write("Not all covariant components of metric tensor found. "
                         "Calculating all from the contravariant tensor\n");
-      /// Calculate contravariant metric components if not found
-      try {
-        calcCovariant("RGN_NOCORNERS");
-      } catch (BoutException&) {
-        throw BoutException("Error in calcCovariant call");
-      }
-    }
-  } else {
-    /// Calculate contravariant metric components if not found
-    try {
-      calcCovariant("RGN_NOCORNERS");
-    } catch (BoutException&) {
-      throw BoutException("Error in calcCovariant call");
     }
   }
 
@@ -794,16 +781,6 @@ void Coordinates::calculateCommunicateAndExtrapolateChristoffelSymbols() {
   geometry.applyToChristoffelSymbols(interpolateAndExtrapolate_function);
 }
 
-void Coordinates::calcCovariant(const std::string& region) {
-  TRACE("Coordinates::calcCovariant");
-  geometry.calcCovariant(region);
-}
-
-void Coordinates::calcContravariant(const std::string& region) {
-  TRACE("Coordinates::calcContravariant");
-  geometry.calcContravariant(region);
-}
-
 void Coordinates::jacobian() {
   TRACE("Coordinates::jacobian");
 

diff --git a/src/mesh/geometry.cxx b/src/mesh/geometry.cxx
@@ -213,16 +213,6 @@ void Geometry::CalculateChristoffelSymbols(FieldMetric& dx, FieldMetric& dy) {
                  * differential_operators->DDY(covariantMetricTensor.Getg33(), dy);
 }
 
-void Geometry::calcCovariant(const std::string& region) {
-  TRACE("Geometry::calcCovariant");
-  covariantMetricTensor.setMetricTensor(contravariantMetricTensor.inverse(region));
-}
-
-void Geometry::calcContravariant(const std::string& region) {
-  TRACE("Geometry::calcContravariant");
-  contravariantMetricTensor.setMetricTensor(covariantMetricTensor.inverse(region));
-}
-
 MetricTensor::FieldMetric Geometry::recalculateJacobian() {
 
   // calculate Jacobian using g^-1 = det[g^ij], J = sqrt(g)

diff --git a/tests/unit/mesh/test_coordinates.cxx b/tests/unit/mesh/test_coordinates.cxx
@@ -139,9 +139,7 @@ TEST_F(CoordinatesTest, CalcContravariant) {
                      FieldMetric{0.0}}; // IntShiftTorsion
   // No call to Coordinates::calculateGeometry() needed here
 
-  output_info.disable();
-  coords.calcCovariant();
-  output_info.enable();
+  coords.setContravariantMetricTensor(MetricTensor(1.0, 1.0, 1.0, 0.0, 0.0, 0.0));
 
   EXPECT_TRUE(IsFieldEqual(coords.g_11(), 1.0));
   EXPECT_TRUE(IsFieldEqual(coords.g_22(), 1.0));
@@ -174,9 +172,7 @@ TEST_F(CoordinatesTest, CalcCovariant) {
                      FieldMetric{0.0}}; // IntShiftTorsion
   // No call to Coordinates::calculateGeometry() needed here
 
-  output_info.disable();
-  coords.calcContravariant();
-  output_info.enable();
+  coords.setCovariantMetricTensor(MetricTensor(1.0, 1.0, 1.0, 0.0, 0.0, 0.0));
 
   EXPECT_TRUE(IsFieldEqual(coords.g11(), 1.0));
   EXPECT_TRUE(IsFieldEqual(coords.g22(), 1.0));