LoopControl: Make selftest conditional on a parameter

Make selftest conditional on a new parameter do_selftest.
Use atomic OpenMP statements in selftest.

1 files changed, 14 insertions, 9 deletions

diff --git a/Carpet/LoopControl/schedule.ccl b/Carpet/LoopControl/schedule.ccl
index c8eb1233c..c1b74863a 100644
--- a/Carpet/LoopControl/schedule.ccl
+++ b/Carpet/LoopControl/schedule.ccl
@@ -8,16 +8,21 @@ if (check_type_sizes) {
   } "Check that sizes of control structures are identical in C and Fortran"
 }
 
-SCHEDULE lc_selftest AT basegrid
-{
-  LANG: C
+if (do_selftest) {
   STORAGE: selftest
-} "Perform some self-checks"
-SCHEDULE lc_selftest AT postregrid
-{
-  LANG: C
-  STORAGE: selftest
-} "Perform some self-checks"
+  
+  SCHEDULE lc_selftest AT basegrid
+  {
+    LANG: C
+    OPTIONS: global loop-local
+  } "Perform some self-checks"
+  
+  SCHEDULE lc_selftest AT postregrid
+  {
+    LANG: C
+    OPTIONS: global loop-local
+  } "Perform some self-checks"
+}
 
 if (printstats) {
   SCHEDULE lc_printstats_analysis AT analysis