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

[alexxy/gromacs.git] / src / tools / gmx_bar.c

diff --git a/src/tools/gmx_bar.c b/src/tools/gmx_bar.c
index e5fdc0335bfa895893bec8ec42962c572dfe8146..a82661235d87d11557b941c2f5fc91ccef55d609 100644 (file)
--- a/src/tools/gmx_bar.c
+++ b/src/tools/gmx_bar.c
@@ -2030,7 +2030,7 @@ static void read_bar_xvg(char *fn, real *temp, lambda_t *lambda_head)
         gmx_fatal(FARGS,"File '%s' contains fewer than two columns", fn);
     }
 
-    if ( ( *temp != barsim->temp) && (*temp > 0) )
+    if ( !gmx_within_tol(*temp,barsim->temp,GMX_FLOAT_EPS) && (*temp > 0) )
     {
         gmx_fatal(FARGS,"Temperature in file %s different from earlier files or setting\n", fn);
     }