From 8b84bc6b4b6861987b41425e550e72f9a6511453 Mon Sep 17 00:00:00 2001
From: Kjetil Olsen Lye <kjetil.olsen.lye@sintef.no>
Date: Sat, 8 Feb 2025 12:50:56 +0100
Subject: [PATCH] Using the CriticalException in PreconditionerFactory and
 ISTLSolver

---
 opm/simulators/linalg/ISTLSolver.hpp                 | 8 +++++---
 opm/simulators/linalg/PreconditionerFactory_impl.hpp | 7 ++++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/opm/simulators/linalg/ISTLSolver.hpp b/opm/simulators/linalg/ISTLSolver.hpp
index 053a6fbc6..93ef60c75 100644
--- a/opm/simulators/linalg/ISTLSolver.hpp
+++ b/opm/simulators/linalg/ISTLSolver.hpp
@@ -25,6 +25,7 @@
 #include <dune/istl/owneroverlapcopy.hh>
 #include <dune/istl/solver.hh>
 
+#include <opm/common/CriticalError.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/Exceptions.hpp>
 #include <opm/common/TimingMacros.hpp>
@@ -377,10 +378,11 @@ std::unique_ptr<Matrix> blockJacobiAdjacency(const Grid& grid,
         void prepare(const Matrix& M, Vector& b)
         {
             OPM_TIMEBLOCK(istlSolverPrepare);
+            OPM_BEGIN_TRY_CATCH_RETHROW_AS_CRITICAL_ERROR();
+                initPrepare(M,b);
 
-            initPrepare(M,b);
-
-            prepareFlexibleSolver();
+                prepareFlexibleSolver();
+            OPM_END_TRY_CATCH_RETHROW_AS_CRITICAL_ERROR();
         }
 
 
diff --git a/opm/simulators/linalg/PreconditionerFactory_impl.hpp b/opm/simulators/linalg/PreconditionerFactory_impl.hpp
index 44287b6eb..b6dca5f0a 100644
--- a/opm/simulators/linalg/PreconditionerFactory_impl.hpp
+++ b/opm/simulators/linalg/PreconditionerFactory_impl.hpp
@@ -20,6 +20,7 @@
 
 #include <config.h>
 
+#include <opm/common/CriticalError.hpp>
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/TimingMacros.hpp>
 
@@ -776,7 +777,7 @@ PreconditionerFactory<Operator, Comm>::create(const Operator& op,
                                               const std::function<Vector()>& weightsCalculator,
                                               std::size_t pressureIndex)
 {
-    return instance().doCreate(op, prm, weightsCalculator, pressureIndex);
+    OPM_TRY_THROW_AS_CRITICAL_ERROR(return instance().doCreate(op, prm, weightsCalculator, pressureIndex));
 }
 
 template <class Operator, class Comm>
@@ -787,7 +788,7 @@ PreconditionerFactory<Operator, Comm>::create(const Operator& op,
                                               const Comm& comm,
                                               std::size_t pressureIndex)
 {
-    return instance().doCreate(op, prm, weightsCalculator, pressureIndex, comm);
+    OPM_TRY_THROW_AS_CRITICAL_ERROR(return instance().doCreate(op, prm, weightsCalculator, pressureIndex, comm));
 }
 
 
@@ -798,7 +799,7 @@ PreconditionerFactory<Operator, Comm>::create(const Operator& op,
                                               const Comm& comm,
                                               std::size_t pressureIndex)
 {
-    return instance().doCreate(op, prm, std::function<Vector()>(), pressureIndex, comm);
+    OPM_TRY_THROW_AS_CRITICAL_ERROR(return instance().doCreate(op, prm, std::function<Vector()>(), pressureIndex, comm));
 }
 
 template <class Operator, class Comm>