From c3661272f17cbb0b0aed0cfb6bcbe8cb5f365d5c Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Tue, 24 Jul 2018 19:55:39 -0400
Subject: [PATCH] re-allow commands after an exception was caught inside a run.
after an exception "all bets are off",
i.e. the user should be allowed to do anything to recover.
through setting Update::whichflag to 0, the guard against running commands during a run is removed.
---
src/error.cpp | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/src/error.cpp b/src/error.cpp
index d516050385..3feaf1d1ac 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -16,6 +16,7 @@
#include <cstring>
#include "error.h"
#include "universe.h"
+#include "update.h"
#include "output.h"
#include "input.h"
@@ -69,6 +70,10 @@ void Error::universe_all(const char *file, int line, const char *str)
if (universe->ulogfile) fclose(universe->ulogfile);
#ifdef LAMMPS_EXCEPTIONS
+
+ // allow commands if an exception was caught in a run
+ update->whichflag = 0;
+
char msg[100];
sprintf(msg, "ERROR: %s (%s:%d)\n", str, file, line);
throw LAMMPSException(msg);
@@ -90,6 +95,10 @@ void Error::universe_one(const char *file, int line, const char *str)
universe->me,str,truncpath(file),line);
#ifdef LAMMPS_EXCEPTIONS
+
+ // allow commands if an exception was caught in a run
+ update->whichflag = 0;
+
char msg[100];
sprintf(msg, "ERROR: %s (%s:%d)\n", str, file, line);
throw LAMMPSAbortException(msg, universe->uworld);
@@ -137,6 +146,10 @@ void Error::all(const char *file, int line, const char *str)
}
#ifdef LAMMPS_EXCEPTIONS
+
+ // allow commands if an exception was caught in a run
+ update->whichflag = 0;
+
char msg[100];
sprintf(msg, "ERROR: %s (%s:%d)\n", str, file, line);
@@ -183,6 +196,10 @@ void Error::one(const char *file, int line, const char *str)
universe->me,str,truncpath(file),line);
#ifdef LAMMPS_EXCEPTIONS
+
+ // allow commands if an exception was caught in a run
+ update->whichflag = 0;
+
char msg[100];
sprintf(msg, "ERROR on proc %d: %s (%s:%d)\n", me, str, file, line);
throw LAMMPSAbortException(msg, world);
--
GitLab