From f69b50408d98bc49ff0a6787e9ae59caea4d1a82 Mon Sep 17 00:00:00 2001
From: Axel Kohlmeyer <akohlmey@gmail.com>
Date: Sun, 28 May 2023 11:47:32 -0400
Subject: [PATCH] improve error messages

---
 src/output.cpp | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/output.cpp b/src/output.cpp
index 6282b85b76..ed8fa48831 100644
--- a/src/output.cpp
+++ b/src/output.cpp
@@ -276,7 +276,8 @@ void Output::setup(int memflag)
         auto  nextrestart = static_cast<bigint>
           (input->variable->compute_equal(ivar_restart_single));
         if (nextrestart <= ntimestep)
-          error->all(FLERR,"Restart variable returned a bad timestep");
+          error->all(FLERR,"Restart variable returned a bad next timestep: {} vs {}",
+                     nextrestart, ntimestep);
         next_restart_single = nextrestart;
       }
     } else next_restart_single = update->laststep + 1;
@@ -289,7 +290,8 @@ void Output::setup(int memflag)
         auto  nextrestart = static_cast<bigint>
           (input->variable->compute_equal(ivar_restart_double));
         if (nextrestart <= ntimestep)
-          error->all(FLERR,"Restart variable returned a bad timestep");
+          error->all(FLERR,"Restart variable returned a bad next timestep: {} vs {}",
+                     nextrestart, ntimestep);
         next_restart_double = nextrestart;
       }
     } else next_restart_double = update->laststep + 1;
@@ -401,7 +403,8 @@ void Output::write(bigint ntimestep)
         auto  nextrestart = static_cast<bigint>
           (input->variable->compute_equal(ivar_restart_single));
         if (nextrestart <= ntimestep)
-          error->all(FLERR,"Restart variable returned a bad timestep");
+          error->all(FLERR,"Restart variable returned a bad next timestep: {} vs {}",
+                     nextrestart, ntimestep);
         next_restart_single = nextrestart;
         modify->addstep_compute(next_restart_single);
       }
@@ -424,7 +427,8 @@ void Output::write(bigint ntimestep)
         auto  nextrestart = static_cast<bigint>
           (input->variable->compute_equal(ivar_restart_double));
         if (nextrestart <= ntimestep)
-          error->all(FLERR,"Restart variable returned a bad timestep");
+          error->all(FLERR,"Restart variable returned a bad next timestep: {} <= {}",
+                     nextrestart, ntimestep);
         next_restart_double = nextrestart;
         modify->addstep_compute(next_restart_double);
       }
@@ -647,7 +651,8 @@ void Output::reset_timestep(bigint ntimestep)
       auto  nextrestart = static_cast<bigint>
         (input->variable->compute_equal(ivar_restart_single));
       if (nextrestart < ntimestep)
-        error->all(FLERR,"Restart variable returned a bad timestep");
+        error->all(FLERR,"Restart variable returned a bad next timestep: {} <= {}",
+                   nextrestart, ntimestep);
       update->ntimestep++;
       next_restart_single = nextrestart;
       modify->addstep_compute(next_restart_single);
@@ -666,7 +671,8 @@ void Output::reset_timestep(bigint ntimestep)
       auto  nextrestart = static_cast<bigint>
         (input->variable->compute_equal(ivar_restart_double));
       if (nextrestart < ntimestep)
-        error->all(FLERR,"Restart variable returned a bad timestep");
+        error->all(FLERR,"Restart variable returned a bad next timestep: {} <= {}",
+                   nextrestart, ntimestep);
       update->ntimestep++;
       next_restart_double = nextrestart;
       modify->addstep_compute(next_restart_double);