From 62c40c86fcef27ba7fb95d25207633526f705089 Mon Sep 17 00:00:00 2001 From: Axel Kohlmeyer Date: Fri, 31 Oct 2014 02:08:51 -0400 Subject: [PATCH] include bugfix from colvars git repo --- lib/colvars/colvar.cpp | 6 +++--- lib/colvars/colvarmodule.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/colvars/colvar.cpp b/lib/colvars/colvar.cpp index 25b0f20b36..e046a0bb12 100644 --- a/lib/colvars/colvar.cpp +++ b/lib/colvars/colvar.cpp @@ -406,11 +406,11 @@ colvar::colvar(std::string const &conf) const bool found = get_keyval(conf, "extendedTemp", temp, cvm::temperature()); if (temp <= 0.0) { if (found) - cvm::log("Error: \"extendedTemp\" must be positive.\n"); + cvm::error("Error: \"extendedTemp\" must be positive.\n", INPUT_ERROR); else cvm::error("Error: a positive temperature must be provided, either " - "by enabling a thermostat, or through \"extendedTemp\".\n", - INPUT_ERROR); + "by enabling a thermostat, or through \"extendedTemp\".\n", + INPUT_ERROR); } get_keyval(conf, "extendedFluctuation", tolerance); diff --git a/lib/colvars/colvarmodule.h b/lib/colvars/colvarmodule.h index e037a08402..b8959c50c9 100644 --- a/lib/colvars/colvarmodule.h +++ b/lib/colvars/colvarmodule.h @@ -4,7 +4,7 @@ #define COLVARMODULE_H #ifndef COLVARS_VERSION -#define COLVARS_VERSION "2014-10-29" +#define COLVARS_VERSION "2014-10-30" #endif #ifndef COLVARS_DEBUG