ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

include bugfix from colvars git repo

Browse Source
This commit is contained in:
Axel Kohlmeyer
2014-10-31 02:08:51 -04:00
parent 83f6ab465e
commit 62c40c86fc
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/colvars/colvar.cpp
View File

@ -406,11 +406,11 @@ colvar::colvar(std::string const &conf)
const bool found = get_keyval(conf, "extendedTemp", temp, cvm::temperature()); const bool found = get_keyval(conf, "extendedTemp", temp, cvm::temperature());
if (temp <= 0.0) { if (temp <= 0.0) {
if (found) if (found)
cvm::log("Error: \"extendedTemp\" must be positive.\n"); cvm::error("Error: \"extendedTemp\" must be positive.\n", INPUT_ERROR);
else else
cvm::error("Error: a positive temperature must be provided, either " cvm::error("Error: a positive temperature must be provided, either "
"by enabling a thermostat, or through \"extendedTemp\".\n", "by enabling a thermostat, or through \"extendedTemp\".\n",
INPUT_ERROR); INPUT_ERROR);
} }
get_keyval(conf, "extendedFluctuation", tolerance); get_keyval(conf, "extendedFluctuation", tolerance);

2
lib/colvars/colvarmodule.h
View File

@ -4,7 +4,7 @@
#define COLVARMODULE_H #define COLVARMODULE_H
#ifndef COLVARS_VERSION #ifndef COLVARS_VERSION
#define COLVARS_VERSION "2014-10-29" #define COLVARS_VERSION "2014-10-30"
#endif #endif
#ifndef COLVARS_DEBUG #ifndef COLVARS_DEBUG