EAMxx: in the fpe_guard_wrapper for CIME runs, capture all exceptions

trey-ornl · Sep 5, 2024 · 70222af · 70222af
1 parent 74a090c
commit 70222af
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/components/eamxx/src/mct_coupling/scream_cxx_f90_interface.cpp b/components/eamxx/src/mct_coupling/scream_cxx_f90_interface.cpp
@@ -65,6 +65,14 @@ void fpe_guard_wrapper (const Lambda& f) {
     auto raw_comm = c.get<ekat::Comm>().mpi_comm();
     c.clean_up();
 
+    MPI_Abort (raw_comm,1);
+  } catch (...) {
+
+    // Get raw comm before cleaning up singleton
+    auto& c = ScreamContext::singleton();
+    auto raw_comm = c.get<ekat::Comm>().mpi_comm();
+    c.clean_up();
+
     MPI_Abort (raw_comm,1);
   }