Merge remote-tracking branch 'origin/v2.4' into v2.4-ves

patches/namd-2.8.config

@@ -6,10 +6,22 @@ function plumed_preliminary_test(){
 }
 
 function plumed_patch_info(){
-  echo "\bug NAMD does not currently take into account virial contributions"
-  echo "from PLUMED. Please use constant volume simulations only"
-  echo ""
-  echo "For more information on NAMD you should visit http://www.ks.uiuc.edu/Research/namd/"
+cat << EOF
+
+To enable PLUMED in a NAMD simulation one should add the following lines in the NAMD configuration file
+(often named as xxx.namd or xxx.conf) and run the plumed-patched version of NAMD with it:
+
+plumed on
+plumed plumed.dat
+
+The first line tells NAMD to run with PLUMED and the second line specifies the PLUMED input file.
+
+\bug NAMD does not currently take into account virial contributions
+from PLUMED. Please use constant volume simulations only.
+
+For more information on NAMD you should visit http://www.ks.uiuc.edu/Research/namd/
+
+EOF
 }
 
 plumed_ignore_mpi=yes

patches/namd-2.9.config

@@ -6,10 +6,22 @@ function plumed_preliminary_test(){
 }
 
 function plumed_patch_info(){
-  echo "\bug NAMD does not currently take into account virial contributions"
-  echo "from PLUMED. Please use constant volume simulations only"
-  echo ""
-  echo "For more information on NAMD you should visit http://www.ks.uiuc.edu/Research/namd/"
+cat << EOF
+
+To enable PLUMED in a NAMD simulation one should add the following lines in the NAMD configuration file
+(often named as xxx.namd or xxx.conf) and run the plumed-patched version of NAMD with it:
+
+plumed on
+plumed plumed.dat
+
+The first line tells NAMD to run with PLUMED and the second line specifies the PLUMED input file.
+
+\bug NAMD does not currently take into account virial contributions
+from PLUMED. Please use constant volume simulations only.
+
+For more information on NAMD you should visit http://www.ks.uiuc.edu/Research/namd/
+
+EOF
 }
 
 plumed_ignore_mpi=yes