Assuming that all the metric tensor components have the same mesh, an…

…d that covariant and contravariant components have the same mesh.
tomc271 · Nov 24, 2023 · cb163cf · cb163cf
1 parent 5f782fd
commit cb163cf
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -85,3 +85,4 @@ coverage/
 /_version.txt
 /.idea
 /cmake-build-debug
+/cmake-build-debug-wsl
diff --git a/include/bout/metricTensor.hxx b/include/bout/metricTensor.hxx
@@ -37,7 +37,7 @@ public:
 
   void setLocation(const CELL_LOC location);
 
-  MetricTensor oppositeRepresentation(const CELL_LOC location, Mesh* mesh,
+  MetricTensor oppositeRepresentation(const CELL_LOC location,
                                       const std::string& region = "RGN_ALL");
 
   // Transforms the MetricTensor by applying the given function to every component

diff --git a/src/mesh/coordinates.cxx b/src/mesh/coordinates.cxx
@@ -1151,13 +1151,13 @@ void Coordinates::CalculateChristoffelSymbols() {
 void Coordinates::calcCovariant(const std::string& region) {
   TRACE("Coordinates::calcCovariant");
   covariantMetricTensor.setMetricTensor(
-      contravariantMetricTensor.oppositeRepresentation(location, localmesh, region));
+      contravariantMetricTensor.oppositeRepresentation(location, region));
 }
 
 void Coordinates::calcContravariant(const std::string& region) {
   TRACE("Coordinates::calcContravariant");
   contravariantMetricTensor.setMetricTensor(
-      covariantMetricTensor.oppositeRepresentation(location, localmesh, region));
+      covariantMetricTensor.oppositeRepresentation(location, region));
 }
 
 void Coordinates::jacobian() {
@@ -1792,14 +1792,14 @@ void Coordinates::setContravariantMetricTensor(MetricTensor metric_tensor,
                                                const std::string& region) {
   contravariantMetricTensor.setMetricTensor(metric_tensor);
   covariantMetricTensor.setMetricTensor(
-      contravariantMetricTensor.oppositeRepresentation(location, localmesh, region));
+      contravariantMetricTensor.oppositeRepresentation(location, region));
 }
 
 void Coordinates::setCovariantMetricTensor(MetricTensor metric_tensor,
                                            const std::string& region) {
   covariantMetricTensor.setMetricTensor(metric_tensor);
   contravariantMetricTensor.setMetricTensor(
-      covariantMetricTensor.oppositeRepresentation(location, localmesh, region));
+      covariantMetricTensor.oppositeRepresentation(location, region));
 }
 
 const MetricTensor::FieldMetric& Coordinates::g_11() const {

diff --git a/src/mesh/metricTensor.cxx b/src/mesh/metricTensor.cxx
@@ -107,7 +107,7 @@ void MetricTensor::setLocation(const CELL_LOC location) {
   g23.setLocation(location);
 }
 
-MetricTensor MetricTensor::oppositeRepresentation(CELL_LOC location, Mesh* mesh,
+MetricTensor MetricTensor::oppositeRepresentation(CELL_LOC location,
                                                   const std::string& region) {
 
   TRACE("MetricTensor::CalculateOppositeRepresentation");
@@ -164,7 +164,7 @@ MetricTensor MetricTensor::oppositeRepresentation(CELL_LOC location, Mesh* mesh,
   //              + g_23 * g_33)));
   //
   //  output_info.write("\tMaximum error in off-diagonal inversion is {:e}\n", maxerr);
-
+  const auto mesh = g11.getMesh(); // All the components have the same mesh
   auto other_representation = MetricTensor(g_11, g_22, g_33, g_12, g_13, g_23, mesh);
   other_representation.setLocation(location);
   return other_representation;