Skip to content

Commit

Permalink
Merge branch 'v2.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
GiovanniBussi committed Nov 15, 2020
2 parents 717c1a5 + d969523 commit a2fc8b4
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions src/colvar/Energy.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,22 @@ namespace colvar {
/*
Calculate the total potential energy of the simulation box.
Total energy can be biased with umbrella sampling \cite bart-karp98jpcb or with well tempered metadynamics \cite Bonomi:2009p17935.
The potential energy can be biased e.g. with umbrella sampling \cite bart-karp98jpcb or with well-tempered metadynamics \cite Bonomi:2009p17935.
Notice that this CV could be unavailable with some MD code. When
it is available, and when also replica exchange is available,
metadynamics applied to ENERGY can be used to decrease the
number of required replicas.
\bug This \ref ENERGY does not include long tail corrections.
Thus when using e.g. LAMMPS `"pair_modify tail yes"` or GROMACS `"DispCorr Ener"` (or `"DispCorr EnerPres"`),
the potential energy from \ref ENERGY will be slightly different form the one of the MD code.
You should still be able to use \ref ENERGY and then reweight your simulation with the correct MD energy value.
\bug Acceptance for replica exchange when \ref ENERGY is biased
is computed correctly only of all the replicas has the same
is computed correctly only if all the replicas have the same
potential energy function. This is for instance not true when
using GROMACS with lambda replica exchange of with plumed-hrex branch.
using GROMACS with lambda replica exchange or with plumed-hrex branch.
\par Examples
Expand Down

1 comment on commit a2fc8b4

@PlumedBot
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Found broken examples in automatic/performance-optimization.txt
Found broken examples in automatic/a-trieste-6.txt
Found broken examples in automatic/munster.txt
Found broken examples in automatic/ANN.tmp
Found broken examples in automatic/EDS.tmp
Found broken examples in automatic/EMMI.tmp
Found broken examples in automatic/FOURIER_TRANSFORM.tmp
Found broken examples in automatic/FUNCPATHGENERAL.tmp
Found broken examples in automatic/FUNCPATHMSD.tmp
Found broken examples in automatic/FUNNEL.tmp
Found broken examples in automatic/FUNNEL_PS.tmp
Found broken examples in automatic/INCLUDE.tmp
Found broken examples in automatic/MAZE_MEMETIC_SAMPLING.tmp
Found broken examples in automatic/MAZE_OPTIMIZER_BIAS.tmp
Found broken examples in automatic/MAZE_RANDOM_ACCELERATION_MD.tmp
Found broken examples in automatic/MAZE_RANDOM_WALK.tmp
Found broken examples in automatic/MAZE_SIMULATED_ANNEALING.tmp
Found broken examples in automatic/MAZE_STEERED_MD.tmp
Found broken examples in automatic/PIV.tmp
Found broken examples in automatic/PLUMED.tmp
Found broken examples in MiscelaneousPP.md

Please sign in to comment.