Handle errors with try-catch rather than returning an int.

tomc271 · Nov 22, 2023 · 7d201b2 · 7d201b2
1 parent ca25cf0
commit 7d201b2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/include/bout/coordinates.hxx b/include/bout/coordinates.hxx
@@ -143,7 +143,7 @@ public:
   void calcCovariant(const std::string& region = "RGN_ALL");
   /// Invert covariant metric to get contravariant components
   void calcContravariant(const std::string& region = "RGN_ALL");
-  int jacobian();                     ///< Calculate J and Bxy
+  void jacobian();                     ///< Calculate J and Bxy
   void CalculateChristoffelSymbols(); /// Calculate Christoffel symbol terms
 
   ///////////////////////////////////////////////////////////

diff --git a/src/mesh/coordinates.cxx b/src/mesh/coordinates.cxx
@@ -645,9 +645,7 @@ Coordinates::Coordinates(Mesh* mesh, Options* options, const CELL_LOC loc,
     checkCovariant();
 
     /// Calculate Jacobian and Bxy
-    if (jacobian()) {
-      throw BoutException("Error in jacobian call");
-    }
+    jacobian();
 
     // Attempt to read J from the grid file
     auto Jcalc = this_J;
@@ -1161,12 +1159,15 @@ void Coordinates::calcContravariant(const std::string& region) {
       covariantMetricTensor.oppositeRepresentation(location, localmesh, region));
 }
 
-int Coordinates::jacobian() {
+void Coordinates::jacobian() {
   TRACE("Coordinates::jacobian");
-
-  this_J = recalculateJacobian();
-  this_Bxy = recalculateBxy();
-  return 0;
+  try {
+    this_J = recalculateJacobian();
+    this_Bxy = recalculateBxy();
+  } catch (BoutException&) {
+    output_error.write("\tError in jacobian call\n");
+    throw;
+  }
 }
 
 MetricTensor::FieldMetric Coordinates::recalculateJacobian() {