Merge branch release-2021

[alexxy/gromacs.git] / src / programs / mdrun / tests / exactcontinuation.cpp

diff --git a/src/programs/mdrun/tests/exactcontinuation.cpp b/src/programs/mdrun/tests/exactcontinuation.cpp
index 8c922b8e6cc68cba1902ad687555b1ddb03e11b2..d23f3925fde55778d3223c3f5686a90ace35b8f0 100644 (file)
--- a/src/programs/mdrun/tests/exactcontinuation.cpp
+++ b/src/programs/mdrun/tests/exactcontinuation.cpp
@@ -362,8 +362,11 @@ TEST_P(MdrunNoAppendContinuationIsExact, WithinTolerances)
     const bool isTCouplingCompatibleWithModularSimulator =
             (temperatureCoupling == "no" || temperatureCoupling == "v-rescale"
              || temperatureCoupling == "berendsen");
+    // GPU update is not compatible with modular simulator
+    const bool isGpuUpdateRequested = (getenv("GMX_FORCE_UPDATE_DEFAULT_GPU") != nullptr);
     if (integrator == "md-vv" && pressureCoupling == "parrinello-rahman"
-        && (isModularSimulatorExplicitlyDisabled || !isTCouplingCompatibleWithModularSimulator))
+        && (isModularSimulatorExplicitlyDisabled || !isTCouplingCompatibleWithModularSimulator
+            || isGpuUpdateRequested))
     {
         // Under md-vv, Parrinello-Rahman is only implemented for the modular simulator
         return;