Merge branch 'release-4-5-patches' into rotation-4-5

[alexxy/gromacs.git] / src / kernel / readir.c

diff --git a/src/kernel/readir.c b/src/kernel/readir.c
index 6771c75a845d5e55548331628eb98e3e2e5472e6..6445b6a102970c4ca9013ce707414e818c1fe867 100644 (file)
--- a/src/kernel/readir.c
+++ b/src/kernel/readir.c
@@ -2532,11 +2532,10 @@ void check_chargegroup_radii(const gmx_mtop_t *mtop,const t_inputrec *ir,
              * not be zero at the cut-off.
              */
             if (EVDW_IS_ZERO_AT_CUTOFF(ir->vdwtype) &&
-                rvdw1 + rvdw2 > ir->rlistlong - ir->rvdw)
+                rvdw1 + rvdw2 > ir->rlist - ir->rvdw)
             {
-                sprintf(warn_buf,"The sum of the two largest charge group radii (%f) is larger than %s (%f) - rvdw (%f)\n",
+                sprintf(warn_buf,"The sum of the two largest charge group radii (%f) is larger than rlist (%f) - rvdw (%f)\n",
                         rvdw1+rvdw2,
-                        ir->rlistlong > ir->rlist ? "rlistlong" : "rlist",
                         ir->rlist,ir->rvdw);
                 if (ir_NVE(ir))
                 {