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

update colvars to version of 2016-04-20

Browse Source
This commit is contained in:
Axel Kohlmeyer
2016-04-22 20:50:51 -04:00
parent ec9977f788
commit 5f0578f95a
17 changed files with 236 additions and 211 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;
}