diff --git a/src/QMCDrivers/DMC/DMC.cpp b/src/QMCDrivers/DMC/DMC.cpp
index a97ed1dc00..093721366a 100644
--- a/src/QMCDrivers/DMC/DMC.cpp
+++ b/src/QMCDrivers/DMC/DMC.cpp
@@ -69,7 +69,9 @@ DMC::DMC(MCWalkerConfiguration& w,
void DMC::resetUpdateEngines()
{
ReportEngine PRE("DMC", "resetUpdateEngines");
- bool fixW = (Reconfiguration == "yes");
+ bool fixW = (Reconfiguration == "runwhileincorrect");
+ if(Reconfiguration != "no" && Reconfiguration != "runwhileincorrect")
+ APP_ABORT("Reconfiguration is currently broken and gives incorrect results. Set reconfiguration=\"no\" or remove the reconfiguration option from the DMC input section. To run performance tests, please set reconfiguration to \"runwhileincorrect\" instead of \"yes\" to restore consistent behaviour.")
makeClones(W, Psi, H);
Timer init_timer;
if (Movers.empty())
diff --git a/src/QMCDrivers/DMC/DMCDriverInput.cpp b/src/QMCDrivers/DMC/DMCDriverInput.cpp
index 27b91c2303..85d70c5d08 100644
--- a/src/QMCDrivers/DMC/DMCDriverInput.cpp
+++ b/src/QMCDrivers/DMC/DMCDriverInput.cpp
@@ -20,7 +20,9 @@ void DMCDriverInput::readXML(xmlNodePtr node)
ParameterSet parameter_set_;
std::string reconfig_str;
parameter_set_.add(reconfig_str, "reconfiguration", "string");
- reconfiguration_ = (reconfig_str == "yes");
+ if (!reconfig_str.empty() && reconfig_str != "no" && reconfig_str != "runwhileincorrect")
+ throw std::runtime_error("Reconfiguration is currently broken and gives incorrect results. Set reconfiguration=\"no\" or remove the reconfiguration option from the DMC input section. To run performance tests, please set reconfiguration to \"runwhileincorrect\" instead of \"yes\" to restore consistent behaviour.");
+ reconfiguration_ = (reconfig_str == "runwhileincorrect");
parameter_set_.add(NonLocalMove, "nonlocalmove", "string");
parameter_set_.add(NonLocalMove, "nonlocalmoves", "string");
parameter_set_.add(max_age_, "MaxAge", "double");
diff --git a/src/QMCDrivers/DMC/WalkerControlFactory.cpp b/src/QMCDrivers/DMC/WalkerControlFactory.cpp
index 9dc81fd3d8..2c0a3c97cf 100644
--- a/src/QMCDrivers/DMC/WalkerControlFactory.cpp
+++ b/src/QMCDrivers/DMC/WalkerControlFactory.cpp
@@ -41,7 +41,10 @@ WalkerControlBase* createWalkerController(int nwtot, Communicate* comm, xmlNodeP
//if(nmin<0) nmin=nideal/2;
WalkerControlBase* wc = 0;
int ncontexts = comm->size();
- bool fixw = (reconfig || reconfigopt == "yes" || reconfigopt == "pure");
+ if(reconfigopt != "no" && reconfigopt != "runwhileincorrect")
+ APP_ABORT("Reconfiguration is currently broken and gives incorrect results. Set reconfiguration=\"no\" or remove the reconfiguration option from the DMC input section. To run performance tests, please set reconfiguration to \"runwhileincorrect\" instead of \"yes\" to restore consistent behaviour.")
+ //bool fixw = (reconfig || reconfigopt == "yes" || reconfigopt == "pure");
+ bool fixw = (reconfig || reconfigopt == "runwhileincorrect");
if (fixw)
{
int nwloc = std::max(omp_get_max_threads(), nwtot / ncontexts);
diff --git a/src/QMCDrivers/SimpleFixedNodeBranch.cpp b/src/QMCDrivers/SimpleFixedNodeBranch.cpp
index c7f06ce36c..7554d33156 100644
--- a/src/QMCDrivers/SimpleFixedNodeBranch.cpp
+++ b/src/QMCDrivers/SimpleFixedNodeBranch.cpp
@@ -743,11 +743,16 @@ int SimpleFixedNodeBranch::resetRun(xmlNodePtr cur)
std::string reconfig("no");
// method is actually IndexType so conceivably indicates much more that reconfig="yes" or "no"
if (WalkerController->get_method())
- reconfig = "yes";
+ reconfig = "runwhileincorrect"; // forces SR during warmup?
std::string reconfig_prev(reconfig);
ParameterSet p;
p.add(reconfig, "reconfiguration", "string");
p.put(cur);
+ if(reconfig != "no" && reconfig != "runwhileincorrect")
+ {
+ // remove this once bug is fixed
+ APP_ABORT("Reconfiguration is currently broken and gives incorrect results. Set reconfiguration=\"no\" or remove the reconfiguration option from the DMC input section. To run performance tests, please set reconfiguration to \"runwhileincorrect\" instead of \"yes\" to restore consistent behaviour.")
+ }
same_wc = (reconfig == reconfig_prev);
}
diff --git a/tests/performance/C-graphite/sample/dmc-a64-e256-cpu/C-graphite-S256-dmc.xml b/tests/performance/C-graphite/sample/dmc-a64-e256-cpu/C-graphite-S256-dmc.xml
index 6020f7a4ef..df1859b4bd 100644
--- a/tests/performance/C-graphite/sample/dmc-a64-e256-cpu/C-graphite-S256-dmc.xml
+++ b/tests/performance/C-graphite/sample/dmc-a64-e256-cpu/C-graphite-S256-dmc.xml
@@ -65,7 +65,7 @@
- yes
+ runwhileincorrect
250
0.001
80
diff --git a/tests/performance/C-graphite/sample/dmc-a64-e256-gpu/C-graphite-S256-dmc.xml b/tests/performance/C-graphite/sample/dmc-a64-e256-gpu/C-graphite-S256-dmc.xml
index 58b8bbdc2b..3dcbd62db5 100644
--- a/tests/performance/C-graphite/sample/dmc-a64-e256-gpu/C-graphite-S256-dmc.xml
+++ b/tests/performance/C-graphite/sample/dmc-a64-e256-gpu/C-graphite-S256-dmc.xml
@@ -66,7 +66,7 @@
256
- yes
+ runwhileincorrect
250
0.001
80
diff --git a/tests/performance/C-molecule/sample/dmc-C12-e48-pp/C12-dmc.xml b/tests/performance/C-molecule/sample/dmc-C12-e48-pp/C12-dmc.xml
index 24400ca215..ea1a4d5f40 100644
--- a/tests/performance/C-molecule/sample/dmc-C12-e48-pp/C12-dmc.xml
+++ b/tests/performance/C-molecule/sample/dmc-C12-e48-pp/C12-dmc.xml
@@ -96,7 +96,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/C-molecule/sample/dmc-C12-e72-ae/C12-dmc.xml b/tests/performance/C-molecule/sample/dmc-C12-e72-ae/C12-dmc.xml
index 55bbbde123..24140bde44 100644
--- a/tests/performance/C-molecule/sample/dmc-C12-e72-ae/C12-dmc.xml
+++ b/tests/performance/C-molecule/sample/dmc-C12-e72-ae/C12-dmc.xml
@@ -94,7 +94,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/C-molecule/sample/dmc-C18-e108-ae/C18-dmc.xml b/tests/performance/C-molecule/sample/dmc-C18-e108-ae/C18-dmc.xml
index aba65f8f06..f7c622ac93 100644
--- a/tests/performance/C-molecule/sample/dmc-C18-e108-ae/C18-dmc.xml
+++ b/tests/performance/C-molecule/sample/dmc-C18-e108-ae/C18-dmc.xml
@@ -100,7 +100,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/C-molecule/sample/dmc-C18-e72-pp/C18-dmc.xml b/tests/performance/C-molecule/sample/dmc-C18-e72-pp/C18-dmc.xml
index 2ecef892b8..d4de3c9ff6 100644
--- a/tests/performance/C-molecule/sample/dmc-C18-e72-pp/C18-dmc.xml
+++ b/tests/performance/C-molecule/sample/dmc-C18-e72-pp/C18-dmc.xml
@@ -102,7 +102,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/C-molecule/sample/dmc-C24-e144-ae/C24-dmc.xml b/tests/performance/C-molecule/sample/dmc-C24-e144-ae/C24-dmc.xml
index 3a19c2ce36..20155f86bb 100644
--- a/tests/performance/C-molecule/sample/dmc-C24-e144-ae/C24-dmc.xml
+++ b/tests/performance/C-molecule/sample/dmc-C24-e144-ae/C24-dmc.xml
@@ -106,7 +106,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/C-molecule/sample/dmc-C24-e96-pp/C24-dmc.xml b/tests/performance/C-molecule/sample/dmc-C24-e96-pp/C24-dmc.xml
index 6b22b8e922..b3b6076df7 100644
--- a/tests/performance/C-molecule/sample/dmc-C24-e96-pp/C24-dmc.xml
+++ b/tests/performance/C-molecule/sample/dmc-C24-e96-pp/C24-dmc.xml
@@ -108,7 +108,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/C-molecule/sample/dmc-C30-e120-pp/C30-dmc.xml b/tests/performance/C-molecule/sample/dmc-C30-e120-pp/C30-dmc.xml
index e9162236d8..470da7c606 100644
--- a/tests/performance/C-molecule/sample/dmc-C30-e120-pp/C30-dmc.xml
+++ b/tests/performance/C-molecule/sample/dmc-C30-e120-pp/C30-dmc.xml
@@ -114,7 +114,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/C-molecule/sample/dmc-C30-e180-ae/C30-dmc.xml b/tests/performance/C-molecule/sample/dmc-C30-e180-ae/C30-dmc.xml
index e227bd546e..1231916744 100644
--- a/tests/performance/C-molecule/sample/dmc-C30-e180-ae/C30-dmc.xml
+++ b/tests/performance/C-molecule/sample/dmc-C30-e180-ae/C30-dmc.xml
@@ -112,7 +112,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/C-molecule/sample/dmc-C60-e240-pp/C60-dmc.xml b/tests/performance/C-molecule/sample/dmc-C60-e240-pp/C60-dmc.xml
index 79d23b1851..19b1913f0e 100644
--- a/tests/performance/C-molecule/sample/dmc-C60-e240-pp/C60-dmc.xml
+++ b/tests/performance/C-molecule/sample/dmc-C60-e240-pp/C60-dmc.xml
@@ -144,7 +144,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a1024-e12288-cpu-J3/NiO-fcc-S256-dmc.xml b/tests/performance/NiO/sample/dmc-a1024-e12288-cpu-J3/NiO-fcc-S256-dmc.xml
index 9dd97ee5e2..05a65c2c08 100644
--- a/tests/performance/NiO/sample/dmc-a1024-e12288-cpu-J3/NiO-fcc-S256-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a1024-e12288-cpu-J3/NiO-fcc-S256-dmc.xml
@@ -1274,7 +1274,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a1024-e12288-cpu/NiO-fcc-S256-dmc.xml b/tests/performance/NiO/sample/dmc-a1024-e12288-cpu/NiO-fcc-S256-dmc.xml
index 28abf12731..9e5d9051c0 100644
--- a/tests/performance/NiO/sample/dmc-a1024-e12288-cpu/NiO-fcc-S256-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a1024-e12288-cpu/NiO-fcc-S256-dmc.xml
@@ -1261,7 +1261,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a1024-e12288-gpu/NiO-fcc-S256-dmc.xml b/tests/performance/NiO/sample/dmc-a1024-e12288-gpu/NiO-fcc-S256-dmc.xml
index ba55dce998..e07ad4e722 100644
--- a/tests/performance/NiO/sample/dmc-a1024-e12288-gpu/NiO-fcc-S256-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a1024-e12288-gpu/NiO-fcc-S256-dmc.xml
@@ -1260,7 +1260,7 @@
32
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a128-e1536-cpu-J3/NiO-fcc-S32-dmc.xml b/tests/performance/NiO/sample/dmc-a128-e1536-cpu-J3/NiO-fcc-S32-dmc.xml
index 0dccb93c22..e712452f6c 100644
--- a/tests/performance/NiO/sample/dmc-a128-e1536-cpu-J3/NiO-fcc-S32-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a128-e1536-cpu-J3/NiO-fcc-S32-dmc.xml
@@ -266,7 +266,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a128-e1536-cpu/NiO-fcc-S32-dmc.xml b/tests/performance/NiO/sample/dmc-a128-e1536-cpu/NiO-fcc-S32-dmc.xml
index 654edbcf27..d82f1c2af1 100644
--- a/tests/performance/NiO/sample/dmc-a128-e1536-cpu/NiO-fcc-S32-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a128-e1536-cpu/NiO-fcc-S32-dmc.xml
@@ -253,7 +253,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a128-e1536-gpu/NiO-fcc-S32-dmc.xml b/tests/performance/NiO/sample/dmc-a128-e1536-gpu/NiO-fcc-S32-dmc.xml
index 548bb3c768..849ff37491 100644
--- a/tests/performance/NiO/sample/dmc-a128-e1536-gpu/NiO-fcc-S32-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a128-e1536-gpu/NiO-fcc-S32-dmc.xml
@@ -252,7 +252,7 @@
32
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a16-e192-cpu-J3/NiO-fcc-S4-dmc.xml b/tests/performance/NiO/sample/dmc-a16-e192-cpu-J3/NiO-fcc-S4-dmc.xml
index 89504e4ee0..2267844f7c 100644
--- a/tests/performance/NiO/sample/dmc-a16-e192-cpu-J3/NiO-fcc-S4-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a16-e192-cpu-J3/NiO-fcc-S4-dmc.xml
@@ -140,7 +140,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a16-e192-cpu/NiO-fcc-S4-dmc.xml b/tests/performance/NiO/sample/dmc-a16-e192-cpu/NiO-fcc-S4-dmc.xml
index 26c845984c..02b1b89716 100644
--- a/tests/performance/NiO/sample/dmc-a16-e192-cpu/NiO-fcc-S4-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a16-e192-cpu/NiO-fcc-S4-dmc.xml
@@ -127,7 +127,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a16-e192-gpu/NiO-fcc-S4-dmc.xml b/tests/performance/NiO/sample/dmc-a16-e192-gpu/NiO-fcc-S4-dmc.xml
index 59f446d615..70f2b61672 100644
--- a/tests/performance/NiO/sample/dmc-a16-e192-gpu/NiO-fcc-S4-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a16-e192-gpu/NiO-fcc-S4-dmc.xml
@@ -126,7 +126,7 @@
32
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a192-e2304-cpu-J3/NiO-fcc-S48-dmc.xml b/tests/performance/NiO/sample/dmc-a192-e2304-cpu-J3/NiO-fcc-S48-dmc.xml
index d5cf27ddc0..7aa3795aa5 100644
--- a/tests/performance/NiO/sample/dmc-a192-e2304-cpu-J3/NiO-fcc-S48-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a192-e2304-cpu-J3/NiO-fcc-S48-dmc.xml
@@ -338,7 +338,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a192-e2304-cpu/NiO-fcc-S48-dmc.xml b/tests/performance/NiO/sample/dmc-a192-e2304-cpu/NiO-fcc-S48-dmc.xml
index 5133ddb586..5de59dcbb0 100644
--- a/tests/performance/NiO/sample/dmc-a192-e2304-cpu/NiO-fcc-S48-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a192-e2304-cpu/NiO-fcc-S48-dmc.xml
@@ -325,7 +325,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a192-e2304-gpu/NiO-fcc-S48-dmc.xml b/tests/performance/NiO/sample/dmc-a192-e2304-gpu/NiO-fcc-S48-dmc.xml
index 3f9ebb5170..d1b4b8f6b6 100644
--- a/tests/performance/NiO/sample/dmc-a192-e2304-gpu/NiO-fcc-S48-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a192-e2304-gpu/NiO-fcc-S48-dmc.xml
@@ -324,7 +324,7 @@
32
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a256-e3072-cpu-J3/NiO-fcc-S64-dmc.xml b/tests/performance/NiO/sample/dmc-a256-e3072-cpu-J3/NiO-fcc-S64-dmc.xml
index c5f1f60aed..4b7bfa3350 100644
--- a/tests/performance/NiO/sample/dmc-a256-e3072-cpu-J3/NiO-fcc-S64-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a256-e3072-cpu-J3/NiO-fcc-S64-dmc.xml
@@ -410,7 +410,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a256-e3072-cpu/NiO-fcc-S64-dmc.xml b/tests/performance/NiO/sample/dmc-a256-e3072-cpu/NiO-fcc-S64-dmc.xml
index 72ad5aec46..ccd9729845 100644
--- a/tests/performance/NiO/sample/dmc-a256-e3072-cpu/NiO-fcc-S64-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a256-e3072-cpu/NiO-fcc-S64-dmc.xml
@@ -397,7 +397,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a256-e3072-gpu/NiO-fcc-S64-dmc.xml b/tests/performance/NiO/sample/dmc-a256-e3072-gpu/NiO-fcc-S64-dmc.xml
index bb8e47a6de..dd25a45fec 100644
--- a/tests/performance/NiO/sample/dmc-a256-e3072-gpu/NiO-fcc-S64-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a256-e3072-gpu/NiO-fcc-S64-dmc.xml
@@ -396,7 +396,7 @@
32
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a32-e384-cpu-J3/NiO-fcc-S8-dmc.xml b/tests/performance/NiO/sample/dmc-a32-e384-cpu-J3/NiO-fcc-S8-dmc.xml
index 073e140ae0..657fbacfcf 100644
--- a/tests/performance/NiO/sample/dmc-a32-e384-cpu-J3/NiO-fcc-S8-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a32-e384-cpu-J3/NiO-fcc-S8-dmc.xml
@@ -158,7 +158,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a32-e384-cpu/NiO-fcc-S8-dmc.xml b/tests/performance/NiO/sample/dmc-a32-e384-cpu/NiO-fcc-S8-dmc.xml
index b5c22a8423..5e87002ecf 100644
--- a/tests/performance/NiO/sample/dmc-a32-e384-cpu/NiO-fcc-S8-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a32-e384-cpu/NiO-fcc-S8-dmc.xml
@@ -145,7 +145,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a32-e384-gpu/NiO-fcc-S8-dmc.xml b/tests/performance/NiO/sample/dmc-a32-e384-gpu/NiO-fcc-S8-dmc.xml
index 3bd1720ade..e7d2139ca1 100644
--- a/tests/performance/NiO/sample/dmc-a32-e384-gpu/NiO-fcc-S8-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a32-e384-gpu/NiO-fcc-S8-dmc.xml
@@ -144,7 +144,7 @@
32
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a4-e48-cpu-J3/NiO-fcc-S1-dmc.xml b/tests/performance/NiO/sample/dmc-a4-e48-cpu-J3/NiO-fcc-S1-dmc.xml
index 49cdb75803..7ff04f469a 100644
--- a/tests/performance/NiO/sample/dmc-a4-e48-cpu-J3/NiO-fcc-S1-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a4-e48-cpu-J3/NiO-fcc-S1-dmc.xml
@@ -127,7 +127,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a4-e48-cpu/NiO-fcc-S1-dmc.xml b/tests/performance/NiO/sample/dmc-a4-e48-cpu/NiO-fcc-S1-dmc.xml
index 36bfc6883d..f78aa706e1 100644
--- a/tests/performance/NiO/sample/dmc-a4-e48-cpu/NiO-fcc-S1-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a4-e48-cpu/NiO-fcc-S1-dmc.xml
@@ -114,7 +114,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a4-e48-gpu/NiO-fcc-S1-dmc.xml b/tests/performance/NiO/sample/dmc-a4-e48-gpu/NiO-fcc-S1-dmc.xml
index 95ae2e5a33..94b41f5728 100644
--- a/tests/performance/NiO/sample/dmc-a4-e48-gpu/NiO-fcc-S1-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a4-e48-gpu/NiO-fcc-S1-dmc.xml
@@ -113,7 +113,7 @@
32
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a512-e6144-cpu-J3/NiO-fcc-S128-dmc.xml b/tests/performance/NiO/sample/dmc-a512-e6144-cpu-J3/NiO-fcc-S128-dmc.xml
index 9e45472123..e824ce41c6 100644
--- a/tests/performance/NiO/sample/dmc-a512-e6144-cpu-J3/NiO-fcc-S128-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a512-e6144-cpu-J3/NiO-fcc-S128-dmc.xml
@@ -698,7 +698,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a512-e6144-cpu/NiO-fcc-S128-dmc.xml b/tests/performance/NiO/sample/dmc-a512-e6144-cpu/NiO-fcc-S128-dmc.xml
index 791f312557..29328b6601 100644
--- a/tests/performance/NiO/sample/dmc-a512-e6144-cpu/NiO-fcc-S128-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a512-e6144-cpu/NiO-fcc-S128-dmc.xml
@@ -685,7 +685,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a512-e6144-gpu/NiO-fcc-S128-dmc.xml b/tests/performance/NiO/sample/dmc-a512-e6144-gpu/NiO-fcc-S128-dmc.xml
index 193fc675cb..e92e6366fb 100644
--- a/tests/performance/NiO/sample/dmc-a512-e6144-gpu/NiO-fcc-S128-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a512-e6144-gpu/NiO-fcc-S128-dmc.xml
@@ -684,7 +684,7 @@
32
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a64-e768-cpu-J3/NiO-fcc-S16-dmc.xml b/tests/performance/NiO/sample/dmc-a64-e768-cpu-J3/NiO-fcc-S16-dmc.xml
index 007f0ff22a..54aabfda1f 100644
--- a/tests/performance/NiO/sample/dmc-a64-e768-cpu-J3/NiO-fcc-S16-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a64-e768-cpu-J3/NiO-fcc-S16-dmc.xml
@@ -194,7 +194,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a64-e768-cpu/NiO-fcc-S16-dmc.xml b/tests/performance/NiO/sample/dmc-a64-e768-cpu/NiO-fcc-S16-dmc.xml
index 45e2b0b30d..30716baa43 100644
--- a/tests/performance/NiO/sample/dmc-a64-e768-cpu/NiO-fcc-S16-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a64-e768-cpu/NiO-fcc-S16-dmc.xml
@@ -181,7 +181,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a64-e768-gpu/NiO-fcc-S16-dmc.xml b/tests/performance/NiO/sample/dmc-a64-e768-gpu/NiO-fcc-S16-dmc.xml
index 5cfecfbde2..759985a784 100644
--- a/tests/performance/NiO/sample/dmc-a64-e768-gpu/NiO-fcc-S16-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a64-e768-gpu/NiO-fcc-S16-dmc.xml
@@ -180,7 +180,7 @@
32
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a8-e96-cpu-J3/NiO-fcc-S2-dmc.xml b/tests/performance/NiO/sample/dmc-a8-e96-cpu-J3/NiO-fcc-S2-dmc.xml
index 2dd7a5a034..214f89b810 100644
--- a/tests/performance/NiO/sample/dmc-a8-e96-cpu-J3/NiO-fcc-S2-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a8-e96-cpu-J3/NiO-fcc-S2-dmc.xml
@@ -131,7 +131,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a8-e96-cpu/NiO-fcc-S2-dmc.xml b/tests/performance/NiO/sample/dmc-a8-e96-cpu/NiO-fcc-S2-dmc.xml
index 745f8d60a7..289113afc6 100644
--- a/tests/performance/NiO/sample/dmc-a8-e96-cpu/NiO-fcc-S2-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a8-e96-cpu/NiO-fcc-S2-dmc.xml
@@ -118,7 +118,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a8-e96-gpu/NiO-fcc-S2-dmc.xml b/tests/performance/NiO/sample/dmc-a8-e96-gpu/NiO-fcc-S2-dmc.xml
index 4011630ed1..a8cbcf83e1 100644
--- a/tests/performance/NiO/sample/dmc-a8-e96-gpu/NiO-fcc-S2-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a8-e96-gpu/NiO-fcc-S2-dmc.xml
@@ -117,7 +117,7 @@
32
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a96-e1152-cpu-J3/NiO-fcc-S24-dmc.xml b/tests/performance/NiO/sample/dmc-a96-e1152-cpu-J3/NiO-fcc-S24-dmc.xml
index c5c34c3731..5f5d841ab2 100644
--- a/tests/performance/NiO/sample/dmc-a96-e1152-cpu-J3/NiO-fcc-S24-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a96-e1152-cpu-J3/NiO-fcc-S24-dmc.xml
@@ -230,7 +230,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a96-e1152-cpu/NiO-fcc-S24-dmc.xml b/tests/performance/NiO/sample/dmc-a96-e1152-cpu/NiO-fcc-S24-dmc.xml
index de74661624..fabe2fa89b 100644
--- a/tests/performance/NiO/sample/dmc-a96-e1152-cpu/NiO-fcc-S24-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a96-e1152-cpu/NiO-fcc-S24-dmc.xml
@@ -217,7 +217,7 @@
1
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/performance/NiO/sample/dmc-a96-e1152-gpu/NiO-fcc-S24-dmc.xml b/tests/performance/NiO/sample/dmc-a96-e1152-gpu/NiO-fcc-S24-dmc.xml
index 07a96944ec..92566903f5 100644
--- a/tests/performance/NiO/sample/dmc-a96-e1152-gpu/NiO-fcc-S24-dmc.xml
+++ b/tests/performance/NiO/sample/dmc-a96-e1152-gpu/NiO-fcc-S24-dmc.xml
@@ -216,7 +216,7 @@
32
- yes
+ runwhileincorrect
250
0.001
5
diff --git a/tests/solids/diamondC_2x1x1_pp/qmc_long_vmc_dmc_reconf.in.xml b/tests/solids/diamondC_2x1x1_pp/qmc_long_vmc_dmc_reconf.in.xml
index eef435dea8..ca184eb5d6 100644
--- a/tests/solids/diamondC_2x1x1_pp/qmc_long_vmc_dmc_reconf.in.xml
+++ b/tests/solids/diamondC_2x1x1_pp/qmc_long_vmc_dmc_reconf.in.xml
@@ -96,7 +96,7 @@
256
- yes
+ runwhileincorrect
100
0.005
100
diff --git a/tests/solids/diamondC_2x1x1_pp/qmc_short_vmc_dmc_reconf.in.xml b/tests/solids/diamondC_2x1x1_pp/qmc_short_vmc_dmc_reconf.in.xml
index 8190d74e73..0d02ad93dc 100644
--- a/tests/solids/diamondC_2x1x1_pp/qmc_short_vmc_dmc_reconf.in.xml
+++ b/tests/solids/diamondC_2x1x1_pp/qmc_short_vmc_dmc_reconf.in.xml
@@ -96,7 +96,7 @@
256
- yes
+ runwhileincorrect
100
0.005
100