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

update colvars to version 2015-04-03

Browse Source
This commit is contained in:
Axel Kohlmeyer
2015-04-18 19:43:44 -04:00
parent 874f2f3d92
commit 2a20dc2ef9
24 changed files with 701 additions and 614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/colvars/colvar.cpp
View File

@ -20,9 +20,10 @@ colvar::colvar(std::string const &conf)
(std::string("colvar")+cvm::to_str(cvm::colvars.size()+1)));
if (cvm::colvar_by_name(this->name) != NULL) {
cvm::error("Error: this colvar cannot have the same name, \""+this->name+
cvm::error("Error: this colvar cannot have the same name, \""+this->name+
"\", as another colvar.\n",
INPUT_ERROR);
return;
}
// all tasks disabled by default
@ -1616,7 +1617,7 @@ int colvar::write_output_files()
// ******************** ANALYSIS FUNCTIONS ********************
void colvar::analyse()
void colvar::analyze()
{
if (tasks[task_runave]) {
calc_runave();