Merge branch 'v2.4' into v2.5

57e6453d · carlocamilloni · 4e5b9299 · 2b2e6a2b · 57e6453d
Commit 57e6453d authored 4 years ago by carlocamilloni
--- a/src/colvar/Energy.cpp
+++ b/src/colvar/Energy.cpp
@@ -32,7 +32,7 @@ namespace colvar {

 //+PLUMEDOC COLVAR ENERGY
 /*
-Calculate the total energy of the simulation box.
+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.