Merge remote-tracking branch 'gerrit/release-4-6'

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

diff --git a/src/gromacs/mdlib/forcerec.c b/src/gromacs/mdlib/forcerec.c
index 9a7222fc78fa181990502372b225d94362a4572d..5d45b7b141e144e58166ed04d23909428e396bbb 100644 (file)
--- a/src/gromacs/mdlib/forcerec.c
+++ b/src/gromacs/mdlib/forcerec.c
@@ -1385,7 +1385,7 @@ void init_forcerec(FILE *fp,
         bNoSolvOpt         = TRUE;
     }
     
-    if( (getenv("GMX_DISABLE_ACCELERATION") != NULL) || (getenv("GMX_NOOPTIMIZEDKERNELS") != NULL) )
+    if (getenv("GMX_DISABLE_ACCELERATION") != NULL)
     {
         fr->use_acceleration = FALSE;
         if (fp != NULL)
@@ -1424,7 +1424,7 @@ void init_forcerec(FILE *fp,
     fr->bcoultab   = (!(fr->eeltype == eelCUT || EEL_RF(fr->eeltype)) ||
                       fr->eeltype == eelRF_ZERO);
     
-    if (getenv("GMX_FORCE_TABLES"))
+    if (getenv("GMX_REQUIRE_TABLES"))
     {
         fr->bvdwtab  = TRUE;
         fr->bcoultab = TRUE;