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

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@14900 f3b2605a-c512-4ea7-a41b-209d697bcdaa

Browse Source
This commit is contained in:
sjplimp
2016-04-28 14:48:56 +00:00
parent 107e28c77a
commit 17fd5898df
15 changed files with 300 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/colvars/colvarbias_histogram.cpp
View File

@ -95,7 +95,7 @@ int colvarbias_histogram::update()
{
int error_code = COLVARS_OK;
// update base class
error_code |= colvarbias::update();
cvm::combine_errors(error_code, colvarbias::update());
if (cvm::debug()) {
cvm::log("Updating histogram bias " + this->name);
@ -148,7 +148,8 @@ int colvarbias_histogram::update()
write_output_files();
}
return error_code | cvm::get_error();
cvm::combine_errors(error_code, cvm::get_error());
return error_code;
}