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

update colvars library to 2016-06-23 version

Browse Source
This commit is contained in:
Axel Kohlmeyer
2016-06-27 11:33:10 -04:00
parent eba0376da3
commit f47a9e33e6
16 changed files with 353 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
lib/colvars/colvarbias.cpp
View File

@ -5,60 +5,95 @@
#include "colvarbias.h"
colvarbias::colvarbias(std::string const &conf, char const *key)
: colvarparse(conf), bias_energy(0.), has_data(false)
colvarbias::colvarbias(char const *key)
: bias_type(to_lower_cppstr(key))
{
cvm::log("Initializing a new \""+std::string(key)+"\" instance.\n");
init_cvb_requires();
size_t rank = 1;
std::string const key_str(key);
rank = 1;
if (to_lower_cppstr(key_str) == std::string("abf")) {
if (bias_type == std::string("abf")) {
rank = cvm::n_abf_biases+1;
}
if (to_lower_cppstr(key_str) == std::string("harmonic") ||
to_lower_cppstr(key_str) == std::string("linear")) {
if (bias_type == std::string("harmonic") ||
bias_type == std::string("linear")) {
rank = cvm::n_rest_biases+1;
}
if (to_lower_cppstr(key_str) == std::string("histogram")) {
if (bias_type == std::string("histogram")) {
rank = cvm::n_histo_biases+1;
}
if (to_lower_cppstr(key_str) == std::string("metadynamics")) {
if (bias_type == std::string("metadynamics")) {
rank = cvm::n_meta_biases+1;
}
get_keyval(conf, "name", name, key_str+cvm::to_str(rank));
has_data = false;
b_output_energy = false;
reset();
if (cvm::bias_by_name(this->name) != NULL) {
// Start in active state by default
enable(f_cvb_active);
}
int colvarbias::init(std::string const &conf)
{
colvarparse::init(conf);
if (name.size() == 0) {
cvm::log("Initializing a new \""+bias_type+"\" instance.\n");
get_keyval(conf, "name", name, bias_type+cvm::to_str(rank));
{
colvarbias *bias_with_name = cvm::bias_by_name(this->name);
if (bias_with_name != NULL) {
if ((bias_with_name->rank != this->rank) ||
(bias_with_name->bias_type != this->bias_type)) {
cvm::error("Error: this bias cannot have the same name, \""+this->name+
"\", as another bias.\n", INPUT_ERROR);
return;
return INPUT_ERROR;
}
}
}
description = "bias " + name;
{
// lookup the associated colvars
std::vector<std::string> colvars_str;
if (get_keyval(conf, "colvars", colvars_str)) {
for (size_t i = 0; i < colvars_str.size(); i++) {
add_colvar(colvars_str[i]);
std::vector<std::string> colvar_names;
if (get_keyval(conf, "colvars", colvar_names)) {
if (colvars.size()) {
cvm::error("Error: cannot redefine the colvars that a bias was already defined on.\n",
INPUT_ERROR);
return INPUT_ERROR;
}
for (size_t i = 0; i < colvar_names.size(); i++) {
add_colvar(colvar_names[i]);
}
}
if (!colvars.size()) {
cvm::error("Error: no collective variables specified.\n");
return;
}
for (size_t i=0; i<colvars.size(); i++) {
// All biases need at least the value of colvars
// although possibly not at all timesteps
add_child(colvars[i]);
}
// Start in active state by default
enable(f_cvb_active);
get_keyval(conf, "outputEnergy", b_output_energy, false);
if (!colvars.size()) {
cvm::error("Error: no collective variables specified.\n", INPUT_ERROR);
return INPUT_ERROR;
}
} else {
cvm::log("Reinitializing bias \""+name+"\".\n");
}
get_keyval(conf, "outputEnergy", b_output_energy, b_output_energy);
return COLVARS_OK;
}
int colvarbias::reset()
{
bias_energy = 0.0;
for (size_t i = 0; i < colvars.size(); i++) {
colvar_forces[i].reset();
}
return COLVARS_OK;
}
@ -66,7 +101,14 @@ colvarbias::colvarbias()
: colvarparse(), has_data(false)
{}
colvarbias::~colvarbias()
{
colvarbias::clear();
}
int colvarbias::clear()
{
// Remove references to this bias from colvars
for (std::vector<colvar *>::iterator cvi = colvars.begin();
@ -81,6 +123,7 @@ colvarbias::~colvarbias()
}
}
}
// ...and from the colvars module
for (std::vector<colvarbias *>::iterator bi = cvm::biases.begin();
bi != cvm::biases.end();
@ -90,25 +133,39 @@ colvarbias::~colvarbias()
break;
}
}
return COLVARS_OK;
}
void colvarbias::add_colvar(std::string const &cv_name)
int colvarbias::add_colvar(std::string const &cv_name)
{
if (colvar *cv = cvm::colvar_by_name(cv_name)) {
// Removed this as nor all biases apply forces eg histogram
// cv->enable(colvar::task_gradients);
if (cvm::debug())
if (cvm::debug()) {
cvm::log("Applying this bias to collective variable \""+
cv->name+"\".\n");
}
colvars.push_back(cv);
colvar_forces.push_back(colvarvalue());
colvar_forces.back().type(cv->value()); // make sure each forces is initialized to zero
colvar_forces.back().type(cv->value()); // make sure each force is initialized to zero
colvar_forces.back().reset();
cv->biases.push_back(this); // add back-reference to this bias to colvar
// Add dependency link.
// All biases need at least the value of each colvar
// although possibly not at all timesteps
add_child(cv);
} else {
cvm::error("Error: cannot find a colvar named \""+
cv_name+"\".\n");
cv_name+"\".\n", INPUT_ERROR);
return INPUT_ERROR;
}
return COLVARS_OK;
}

30
lib/colvars/colvarbias.h
View File

@ -15,8 +15,14 @@ public:
/// Name of this bias
std::string name;
/// Type of this bias
std::string bias_type;
/// If there is more than one bias of this type, record its rank
int rank;
/// Add a new collective variable to this bias
void add_colvar(std::string const &cv_name);
int add_colvar(std::string const &cv_name);
/// Retrieve colvar values and calculate their biasing forces
/// Return bias energy
@ -46,11 +52,29 @@ public:
void communicate_forces();
/// \brief Constructor
colvarbias(std::string const &conf, char const *key);
colvarbias(char const *key);
/// \brief Parse config string and (re)initialize
virtual int init(std::string const &conf);
/// \brief Set to zero all mutable data
virtual int reset();
protected:
/// Default constructor
colvarbias();
private:
/// Copy constructor
colvarbias(colvarbias &);
public:
/// \brief Delete everything
virtual int clear();
/// Destructor
virtual ~colvarbias();
@ -103,7 +127,7 @@ protected:
bool b_output_energy;
/// \brief Whether this bias has already accumulated information
/// (when relevant)
/// (for history-dependent biases)
bool has_data;
};

19
lib/colvars/colvarbias_abf.cpp
View File

@ -4,16 +4,22 @@
#include "colvar.h"
#include "colvarbias_abf.h"
/// ABF bias constructor; parses the config file
colvarbias_abf::colvarbias_abf(std::string const &conf, char const *key)
: colvarbias(conf, key),
colvarbias_abf::colvarbias_abf(char const *key)
: colvarbias(key),
force(NULL),
gradients(NULL),
samples(NULL),
last_gradients(NULL),
last_samples(NULL)
{
}
int colvarbias_abf::init(std::string const &conf)
{
colvarbias::init(conf);
// TODO relax this in case of VMD plugin
if (cvm::temperature() == 0.0)
cvm::log("WARNING: ABF should not be run without a thermostat or at 0 Kelvin!\n");
@ -63,10 +69,10 @@ colvarbias_abf::colvarbias_abf(std::string const &conf, char const *key)
if (update_bias) {
// Request calculation of system force (which also checks for availability)
if(enable(f_cvb_get_system_force)) return;
if(enable(f_cvb_get_system_force)) return cvm::get_error();
}
if (apply_bias) {
if(enable(f_cvb_apply_force)) return;
if(enable(f_cvb_apply_force)) return cvm::get_error();
}
for (size_t i = 0; i < colvars.size(); i++) {
@ -126,6 +132,8 @@ colvarbias_abf::colvarbias_abf(std::string const &conf, char const *key)
}
cvm::log("Finished ABF setup.\n");
return COLVARS_OK;
}
/// Destructor
@ -277,6 +285,7 @@ int colvarbias_abf::update()
return COLVARS_OK;
}
int colvarbias_abf::replica_share() {
int p;

8
lib/colvars/colvarbias_abf.h
View File

@ -19,10 +19,10 @@ class colvarbias_abf : public colvarbias {
public:
colvarbias_abf(std::string const &conf, char const *key);
~colvarbias_abf();
int update();
colvarbias_abf(char const *key);
virtual int init(std::string const &conf);
virtual ~colvarbias_abf();
virtual int update();
private:

39
lib/colvars/colvarbias_alb.cpp
View File

@ -23,8 +23,16 @@ double fmin(double A, double B) { return ( A < B ? A : B ); }
*
*/
colvarbias_alb::colvarbias_alb(std::string const &conf, char const *key) :
colvarbias(conf, key), update_calls(0), b_equilibration(true) {
colvarbias_alb::colvarbias_alb(char const *key)
: colvarbias(key), update_calls(0), b_equilibration(true)
{
}
int colvarbias_alb::init(std::string const &conf)
{
colvarbias::init(conf);
size_t i;
// get the initial restraint centers
@ -99,8 +107,6 @@ colvarbias_alb::colvarbias_alb(std::string const &conf, char const *key) :
}
}
if (!get_keyval(conf, "rateMax", max_coupling_rate, max_coupling_rate)) {
//set to default
for (i = 0; i < colvars.size(); i++) {
@ -112,16 +118,19 @@ colvarbias_alb::colvarbias_alb(std::string const &conf, char const *key) :
if (cvm::debug())
cvm::log(" bias.\n");
return COLVARS_OK;
}
colvarbias_alb::~colvarbias_alb() {
colvarbias_alb::~colvarbias_alb()
{
if (cvm::n_rest_biases > 0)
cvm::n_rest_biases -= 1;
}
int colvarbias_alb::update() {
int colvarbias_alb::update()
{
bias_energy = 0.0;
update_calls++;
@ -129,9 +138,6 @@ int colvarbias_alb::update() {
if (cvm::debug())
cvm::log("Updating the adaptive linear bias \""+this->name+"\".\n");
//log the moments of the CVs
// Force and energy calculation
bool finished_equil_flag = 1;
@ -423,17 +429,24 @@ std::ostream & colvarbias_alb::write_traj(std::ostream &os)
}
cvm::real colvarbias_alb::restraint_potential(cvm::real k, const colvar* x, const colvarvalue &xcenter) const
cvm::real colvarbias_alb::restraint_potential(cvm::real k,
colvar const *x,
colvarvalue const &xcenter) const
{
return k * (x->value() - xcenter);
}
colvarvalue colvarbias_alb::restraint_force(cvm::real k, const colvar* x, const colvarvalue &xcenter) const
colvarvalue colvarbias_alb::restraint_force(cvm::real k,
colvar const *x,
colvarvalue const &xcenter) const
{
return k;
}
cvm::real colvarbias_alb::restraint_convert_k(cvm::real k, cvm::real dist_measure) const
cvm::real colvarbias_alb::restraint_convert_k(cvm::real k,
cvm::real dist_measure) const
{
return k / dist_measure;
}

13
lib/colvars/colvarbias_alb.h
View File

@ -9,22 +9,15 @@
class colvarbias_alb : public colvarbias {
public:
colvarbias_alb(std::string const &conf, char const *key);
colvarbias_alb(char const *key);
virtual ~colvarbias_alb();
virtual int init(std::string const &conf);
virtual int update();
/// Read the bias configuration from a restart file
virtual std::istream & read_restart(std::istream &is);
/// Write the bias configuration to a restart file
virtual std::ostream & write_restart(std::ostream &os);
/// Write a label to the trajectory file (comment line)
virtual std::ostream & write_traj_label(std::ostream &os);
/// Output quantities such as the bias energy to the trajectory file
virtual std::ostream & write_traj(std::ostream &os);
protected:

24
lib/colvars/colvarbias_histogram.cpp
View File

@ -6,10 +6,17 @@
/// Histogram "bias" constructor
colvarbias_histogram::colvarbias_histogram(std::string const &conf, char const *key)
: colvarbias(conf, key),
colvarbias_histogram::colvarbias_histogram(char const *key)
: colvarbias(key),
grid(NULL), out_name("")
{
}
int colvarbias_histogram::init(std::string const &conf)
{
colvarbias::init(conf);
size_t i;
get_keyval(conf, "outputFile", out_name, std::string(""));
@ -30,18 +37,18 @@ colvarbias_histogram::colvarbias_histogram(std::string const &conf, char const *
for (i = 0; i < colvars.size(); i++) { // should be all vector
if (colvars[i]->value().type() != colvarvalue::type_vector) {
cvm::error("Error: used gatherVectorColvars with non-vector colvar.\n", INPUT_ERROR);
return;
return INPUT_ERROR;
}
if (i == 0) {
colvar_array_size = colvars[i]->value().size();
if (colvar_array_size < 1) {
cvm::error("Error: vector variable has dimension less than one.\n", INPUT_ERROR);
return;
return INPUT_ERROR;
}
} else {
if (colvar_array_size != colvars[i]->value().size()) {
cvm::error("Error: trying to combine vector colvars of different lengths.\n", INPUT_ERROR);
return;
return INPUT_ERROR;
}
}
}
@ -49,7 +56,7 @@ colvarbias_histogram::colvarbias_histogram(std::string const &conf, char const *
for (i = 0; i < colvars.size(); i++) { // should be all scalar
if (colvars[i]->value().type() != colvarvalue::type_scalar) {
cvm::error("Error: only scalar colvars are supported when gatherVectorColvars is off.\n", INPUT_ERROR);
return;
return INPUT_ERROR;
}
}
}
@ -76,9 +83,10 @@ colvarbias_histogram::colvarbias_histogram(std::string const &conf, char const *
}
cvm::log("Finished histogram setup.\n");
return COLVARS_OK;
}
/// Destructor
colvarbias_histogram::~colvarbias_histogram()
{
if (grid) {
@ -90,7 +98,7 @@ colvarbias_histogram::~colvarbias_histogram()
cvm::n_histo_biases -= 1;
}
/// Update the grid
int colvarbias_histogram::update()
{
int error_code = COLVARS_OK;

13
lib/colvars/colvarbias_histogram.h
View File

@ -16,12 +16,11 @@ class colvarbias_histogram : public colvarbias {
public:
colvarbias_histogram(std::string const &conf, char const *key);
colvarbias_histogram(char const *key);
~colvarbias_histogram();
int update();
int write_output_files();
virtual int init(std::string const &conf);
virtual int update();
virtual int write_output_files();
protected:
@ -36,8 +35,8 @@ protected:
/// If colvar_array_size is larger than 1, weigh each one by this number before accumulating the histogram
std::vector<cvm::real> weights;
std::istream& read_restart(std::istream&);
std::ostream& write_restart(std::ostream&);
virtual std::istream& read_restart(std::istream&);
virtual std::ostream& write_restart(std::ostream&);
};
#endif

15
lib/colvars/colvarbias_meta.cpp
View File

@ -25,19 +25,19 @@
#include "colvarbias_meta.h"
colvarbias_meta::colvarbias_meta()
: colvarbias(),
colvarbias_meta::colvarbias_meta(char const *key)
: colvarbias(key),
new_hills_begin(hills.end()),
state_file_step(0)
{
}
colvarbias_meta::colvarbias_meta(std::string const &conf, char const *key)
: colvarbias(conf, key),
new_hills_begin(hills.end()),
state_file_step(0)
int colvarbias_meta::init(std::string const &conf)
{
colvarbias::init(conf);
// TODO this relies on having initialized biases in alphabetical order
if (cvm::n_abf_biases > 0)
cvm::log("Warning: running ABF and metadynamics together is not recommended unless applyBias is off for ABF.\n");
@ -152,6 +152,7 @@ colvarbias_meta::colvarbias_meta(std::string const &conf, char const *key)
((comm != single_replica) ? ", replica \""+replica_id+"\"" : "")+".\n");
save_delimiters = false;
return COLVARS_OK;
}
@ -851,7 +852,7 @@ void colvarbias_meta::update_replicas_registry()
// add this replica to the registry
cvm::log("Metadynamics bias \""+this->name+"\""+
": accessing replica \""+new_replica+"\".\n");
replicas.push_back(new colvarbias_meta());
replicas.push_back(new colvarbias_meta("metadynamics"));
(replicas.back())->replica_id = new_replica;
(replicas.back())->replica_list_file = new_replica_file;
(replicas.back())->replica_state_file = "";

14
lib/colvars/colvarbias_meta.h
View File

@ -27,23 +27,13 @@ public:
/// Communication between different replicas
Communication comm;
/// Constructor
colvarbias_meta(std::string const &conf, char const *key);
/// Default constructor
colvarbias_meta();
/// Destructor
colvarbias_meta(char const *key);
virtual int init(std::string const &conf);
virtual ~colvarbias_meta();
virtual int update();
virtual std::istream & read_restart(std::istream &is);
virtual std::ostream & write_restart(std::ostream &os);
virtual int setup_output();
virtual void write_pmf();
class hill;

80
lib/colvars/colvarbias_restraint.cpp
View File

@ -5,12 +5,25 @@
#include "colvarbias_restraint.h"
colvarbias_restraint::colvarbias_restraint(std::string const &conf,
char const *key)
: colvarbias(conf, key),
target_nstages(0),
target_nsteps(0)
colvarbias_restraint::colvarbias_restraint(char const *key)
: colvarbias(key)
{
}
int colvarbias_restraint::init(std::string const &conf)
{
colvarbias::init(conf);
if (cvm::debug())
cvm::log("Initializing a new restraint bias.\n");
// TODO move these initializations to constructor and let get_keyval
// only override existing values
target_nstages = 0;
target_nsteps = 0;
force_k = 0.0;
get_keyval(conf, "forceConstant", force_k, 1.0);
{
@ -124,6 +137,7 @@ colvarbias_restraint::colvarbias_restraint(std::string const &conf,
cvm::log("Done initializing a new restraint bias.\n");
}
colvarbias_restraint::~colvarbias_restraint()
{
if (cvm::n_rest_biases > 0)
@ -505,8 +519,17 @@ std::ostream & colvarbias_restraint::write_traj(std::ostream &os)
return os;
}
colvarbias_restraint_harmonic::colvarbias_restraint_harmonic(std::string const &conf, char const *key) :
colvarbias_restraint(conf, key) {
colvarbias_restraint_harmonic::colvarbias_restraint_harmonic(char const *key)
: colvarbias_restraint(key)
{
}
int colvarbias_restraint_harmonic::init(std::string const &conf)
{
colvarbias_restraint::init(conf);
for (size_t i = 0; i < colvars.size(); i++) {
if (colvars[i]->width != 1.0)
cvm::log("The force constant for colvar \""+colvars[i]->name+
@ -516,24 +539,40 @@ colvarbias_restraint_harmonic::colvarbias_restraint_harmonic(std::string const &
}
}
cvm::real colvarbias_restraint_harmonic::restraint_potential(cvm::real k, colvar* x, const colvarvalue &xcenter) const
cvm::real colvarbias_restraint_harmonic::restraint_potential(cvm::real k,
colvar const *x,
colvarvalue const &xcenter) const
{
return 0.5 * k * x->dist2(x->value(), xcenter);
}
colvarvalue colvarbias_restraint_harmonic::restraint_force(cvm::real k, colvar* x, const colvarvalue &xcenter) const
colvarvalue colvarbias_restraint_harmonic::restraint_force(cvm::real k,
colvar const *x,
colvarvalue const &xcenter) const
{
return 0.5 * k * x->dist2_lgrad(x->value(), xcenter);
}
cvm::real colvarbias_restraint_harmonic::restraint_convert_k(cvm::real k, cvm::real dist_measure) const
cvm::real colvarbias_restraint_harmonic::restraint_convert_k(cvm::real k,
cvm::real dist_measure) const
{
return k / (dist_measure * dist_measure);
}
colvarbias_restraint_linear::colvarbias_restraint_linear(std::string const &conf, char const *key) :
colvarbias_restraint(conf, key) {
colvarbias_restraint_linear::colvarbias_restraint_linear(char const *key)
: colvarbias_restraint(key)
{
}
int colvarbias_restraint_linear::init(std::string const &conf)
{
colvarbias_restraint::init(conf);
for (size_t i = 0; i < colvars.size(); i++) {
if (colvars[i]->width != 1.0)
cvm::log("The force constant for colvar \""+colvars[i]->name+
@ -543,17 +582,28 @@ colvarbias_restraint_linear::colvarbias_restraint_linear(std::string const &conf
}
}
cvm::real colvarbias_restraint_linear::restraint_potential(cvm::real k, colvar* x, const colvarvalue &xcenter) const
cvm::real colvarbias_restraint_linear::restraint_potential(cvm::real k,
colvar const *x,
colvarvalue const &xcenter) const
{
return k * (x->value() - xcenter);
}
colvarvalue colvarbias_restraint_linear::restraint_force(cvm::real k, colvar* x, const colvarvalue &xcenter) const
colvarvalue colvarbias_restraint_linear::restraint_force(cvm::real k,
colvar const *x,
colvarvalue const &xcenter) const
{
return k;
}
cvm::real colvarbias_restraint_linear::restraint_convert_k(cvm::real k, cvm::real dist_measure) const
cvm::real colvarbias_restraint_linear::restraint_convert_k(cvm::real k,
cvm::real dist_measure) const
{
return k / dist_measure;
}

42
lib/colvars/colvarbias_restraint.h
View File

@ -14,6 +14,7 @@ public:
/// Retrieve colvar values and calculate their biasing forces
virtual int update();
// TODO the following can be supplanted by a new call to init()
/// Load new configuration - force constant and/or centers only
virtual void change_configuration(std::string const &conf);
@ -33,19 +34,21 @@ public:
virtual std::ostream & write_traj(std::ostream &os);
/// \brief Constructor
colvarbias_restraint(std::string const &conf, char const *key);
colvarbias_restraint(char const *key);
/// Destructor
virtual int init(std::string const &conf);
virtual ~colvarbias_restraint();
protected:
/// \brief Potential function
virtual cvm::real restraint_potential(cvm::real k, colvar* x, const colvarvalue& xcenter) const = 0;
virtual cvm::real restraint_potential(cvm::real k, colvar const *x,
colvarvalue const &xcenter) const = 0;
/// \brief Force function
virtual colvarvalue restraint_force(cvm::real k, colvar* x, const colvarvalue& xcenter) const = 0;
virtual colvarvalue restraint_force(cvm::real k, colvar const *x,
colvarvalue const &xcenter) const = 0;
///\brief Unit scaling
virtual cvm::real restraint_convert_k(cvm::real k, cvm::real dist_measure) const = 0;
@ -113,36 +116,51 @@ protected:
long target_nsteps;
};
/// \brief Harmonic bias restraint
/// (implementation of \link colvarbias_restraint \endlink)
class colvarbias_restraint_harmonic : public colvarbias_restraint {
public:
colvarbias_restraint_harmonic(std::string const &conf, char const *key);
protected: /// \brief Potential function
virtual cvm::real restraint_potential(cvm::real k, colvar* x, const colvarvalue& xcenter) const;
colvarbias_restraint_harmonic(char const *key);
virtual int init(std::string const &conf);
// no additional members, destructor not needed
protected:
/// \brief Potential function
virtual cvm::real restraint_potential(cvm::real k, colvar const *x,
colvarvalue const &xcenter) const;
/// \brief Force function
virtual colvarvalue restraint_force(cvm::real k, colvar* x, const colvarvalue& xcenter) const;
virtual colvarvalue restraint_force(cvm::real k, colvar const *x,
colvarvalue const &xcenter) const;
///\brief Unit scaling
virtual cvm::real restraint_convert_k(cvm::real k, cvm::real dist_measure) const;
};
/// \brief Linear bias restraint
/// (implementation of \link colvarbias_restraint \endlink)
class colvarbias_restraint_linear : public colvarbias_restraint {
public:
colvarbias_restraint_linear(std::string const &conf, char const *key);
colvarbias_restraint_linear(char const *key);
virtual int init(std::string const &conf);
// no additional members, destructor not needed
protected: /// \brief Potential function
virtual cvm::real restraint_potential(cvm::real k, colvar* x, const colvarvalue& xcenter) const;
protected:
/// \brief Potential function
virtual cvm::real restraint_potential(cvm::real k, colvar const *x,
colvarvalue const &xcenter) const;
/// \brief Force function
virtual colvarvalue restraint_force(cvm::real k, colvar* x, const colvarvalue& xcenter) const;
virtual colvarvalue restraint_force(cvm::real k, colvar const *x,
colvarvalue const &xcenter) const;
///\brief Unit scaling
virtual cvm::real restraint_convert_k(cvm::real k, cvm::real dist_measure) const;

15
lib/colvars/colvarmodule.cpp
View File

@ -32,8 +32,9 @@ colvarmodule::colvarmodule(colvarproxy *proxy_in)
cvm::log(cvm::line_marker);
cvm::log("Initializing the collective variables module, version "+
cvm::to_str(COLVARS_VERSION)+".\n");
cvm::log("Please cite Fiorin et al, Mol Phys 2013 in any publication "
"based on this calculation.\n");
cvm::log("Please cite Fiorin et al, Mol Phys 2013:\n "
"http://dx.doi.org/10.1080/00268976.2013.813594\n"
"in any publication based on this calculation.\n");
if (proxy->smp_enabled() == COLVARS_OK) {
cvm::log("SMP parallelism is available.\n");
@ -250,8 +251,9 @@ int colvarmodule::parse_biases_type(std::string const &conf,
if (bias_conf.size()) {
cvm::log(cvm::line_marker);
cvm::increase_depth();
biases.push_back(new bias_type(bias_conf, keyword));
if (cvm::check_new_bias(bias_conf, keyword)) {
biases.push_back(new bias_type(keyword));
biases.back()->init(bias_conf);
if (cvm::check_new_bias(bias_conf, keyword) != COLVARS_OK) {
return COLVARS_ERROR;
}
cvm::decrease_depth();
@ -322,7 +324,7 @@ int colvarmodule::catch_input_errors(int result)
if (result != COLVARS_OK || get_error()) {
set_error_bit(result);
set_error_bit(INPUT_ERROR);
parse->reset();
parse->init();
return get_error();
}
return COLVARS_OK;
@ -795,6 +797,7 @@ colvarmodule::~colvarmodule()
(proxy->smp_thread_id() == 0)) {
reset();
delete parse;
parse = NULL;
proxy = NULL;
}
}
@ -802,7 +805,7 @@ colvarmodule::~colvarmodule()
int colvarmodule::reset()
{
parse->reset();
parse->init();
cvm::log("Resetting the Collective Variables Module.\n");

2
lib/colvars/colvarmodule.h
View File

@ -4,7 +4,7 @@
#define COLVARMODULE_H
#ifndef COLVARS_VERSION
#define COLVARS_VERSION "2016-06-14"
#define COLVARS_VERSION "2016-06-23"
#endif
#ifndef COLVARS_DEBUG

2
lib/colvars/colvarparse.cpp
View File

@ -524,7 +524,7 @@ int colvarparse::check_keywords(std::string &conf, char const *key)
}
}
clear_keyword_registry();
init();
return COLVARS_OK;
}

48
lib/colvars/colvarparse.h
View File

@ -53,14 +53,35 @@ protected:
public:
inline colvarparse()
: save_delimiters(true)
{}
{
init();
}
/// Constructor that stores the object's config string
inline colvarparse(const std::string& conf)
: save_delimiters(true), config_string(conf)
{}
: save_delimiters(true)
{
init(conf);
}
/// Set the object ready to parse a new configuration string
inline void init()
{
config_string.clear();
clear_keyword_registry();
}
/// Set a new config string for this object
inline void init(const std::string& conf)
{
if (! config_string.size()) {
init();
config_string = conf;
}
}
inline const std::string& get_config()
{
@ -79,6 +100,16 @@ public:
parse_silent
};
/// \brief Check that all the keywords within "conf" are in the list
/// of allowed keywords; this will invoke strip_values() first and
/// then loop over all words
int check_keywords(std::string &conf, char const *key);
/// \brief Use this after parsing a config string (note that check_keywords() calls it already)
void clear_keyword_registry();
public:
/// \fn get_keyval bool const get_keyval (std::string const &conf,
/// char const *key, _type_ &value, _type_ const &def_value,
/// Parse_Mode const parse_mode) \brief Helper function to parse
@ -210,18 +241,9 @@ protected:
std::vector<TYPE> &values,
std::vector<TYPE> const &def_values,
Parse_Mode const parse_mode);
public:
/// \brief Check that all the keywords within "conf" are in the list
/// of allowed keywords; this will invoke strip_values() first and
/// then loop over all words
int check_keywords(std::string &conf, char const *key);
/// \brief Use this after parsing a config string (note that check_keywords() calls it already)
void clear_keyword_registry();
inline void reset() { clear_keyword_registry(); }
/// \brief Return a lowercased copy of the string
static inline std::string to_lower_cppstr(std::string const &in)
{