From 7dad1b5ee6de88bdc7b985e5f2c1ffd6a6c6b715 Mon Sep 17 00:00:00 2001
From: Phil Tooley <phil.tooley@sheffield.ac.uk>
Date: Thu, 2 May 2019 13:50:19 +0100
Subject: [PATCH] further output improvements

---
 src/baseconfiguration.hpp | 16 ++++++++++++----
 src/elastic.cpp           |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/baseconfiguration.hpp b/src/baseconfiguration.hpp
index d77a1bd..7d8dfea 100644
--- a/src/baseconfiguration.hpp
+++ b/src/baseconfiguration.hpp
@@ -48,7 +48,9 @@ class ConfigurationBase {
     }
     catch (std::out_of_range &err)
     {
-      throw InternalError("Attempt to access non-existent configuration option", __FILE__, __LINE__);
+      std::ostringstream errss;
+      errss << "Attempt to access non-existent configuration option \"" << key << "\"";
+      throw InternalError(errss.str(), __FILE__, __LINE__);
     }
   }
 
@@ -62,7 +64,9 @@ class ConfigurationBase {
     }
     catch (std::out_of_range &err)
     {
-      throw InternalError("Attempt to access non-existent configuration option", __FILE__, __LINE__);
+      std::ostringstream errss;
+      errss << "Attempt to access non-existent configuration option \"" << key << "\"";
+      throw InternalError(errss.str(), __FILE__, __LINE__);
     }
   }
 
@@ -76,7 +80,9 @@ class ConfigurationBase {
     }
     catch (std::out_of_range &err)
     {
-      throw InternalError("Attempt to access non-existent configuration option", __FILE__, __LINE__);
+      std::ostringstream errss;
+      errss << "Attempt to access non-existent configuration option \"" << key << "\"";
+      throw InternalError(errss.str(), __FILE__, __LINE__);
     }
 }
 
@@ -89,7 +95,9 @@ class ConfigurationBase {
     }
     catch (std::out_of_range &err)
     {
-      throw InternalError("Attempt to access non-existent configuration option", __FILE__, __LINE__);
+      std::ostringstream errss;
+      errss << "Attempt to access non-existent configuration option \"" << key << "\"";
+      throw InternalError(errss.str(), __FILE__, __LINE__);
     }
   }
 
diff --git a/src/elastic.cpp b/src/elastic.cpp
index b8f3311..b13a36c 100644
--- a/src/elastic.cpp
+++ b/src/elastic.cpp
@@ -129,7 +129,7 @@ void Elastic::innerloop(integer outer_count)
     innerstep(inum, recalculate_lambda);
     recalculate_lambda = false;
 
-    if (configuration.grab<bool>("save_intermediate_flames"))
+    if (configuration.grab<bool>("save_intermediate_frames"))
     {
       save_debug_frame(outer_count, inum);
       save_debug_map(outer_count, inum);