Merge origin/release-4-6 into master

[alexxy/gromacs.git] / src / gromacs / mdlib / minimize.c

diff --git a/src/gromacs/mdlib/minimize.c b/src/gromacs/mdlib/minimize.c
index 7acf363ed32587f98df2ce38b27a0a96bf6ea25a..196c439947268084a5befe6d5e45dc7b99f6856f 100644 (file)
--- a/src/gromacs/mdlib/minimize.c
+++ b/src/gromacs/mdlib/minimize.c
@@ -705,7 +705,7 @@ static void evaluate_energy(FILE *fplog,gmx_bool bVerbose,t_commrec *cr,
              ems->s.lambda,graph,fr,vsite,mu_tot,t,NULL,NULL,TRUE,
              GMX_FORCE_STATECHANGED | GMX_FORCE_ALLFORCES |
              GMX_FORCE_VIRIAL | GMX_FORCE_ENERGY |
-             (bNS ? GMX_FORCE_NS | GMX_FORCE_DOLR : 0));
+             (bNS ? GMX_FORCE_NS | GMX_FORCE_DO_LR : 0));
 
     /* Clear the unused shake virial and pressure */
     clear_mat(shake_vir);