Merge branch 'master' into crg

conf/vsc_kul_uhasselt.config

@@ -25,12 +25,12 @@ if (! tier1_project && (hostname.contains("genius") || hostname.contains("wice")
 }
 
 
-// Reduce the job submit rate to about 30 per minute, this way the server won't be bombarded with jobs
+// Reduce the job submit rate to about 50 per minute, this way the server won't be bombarded with jobs
 // Limit queueSize to keep job rate under control and avoid timeouts
 executor {
     submitRateLimit = '50/1min'
     queueSize = 30
-    exitReadTimeout = "3day"
+    exitReadTimeout = "10min"
 }
 
 // Add backoff strategy to catch cluster timeouts and proper symlinks of files in scratch to the work directory
@@ -39,7 +39,7 @@ process {
     stageOutMode = "rsync"
     errorStrategy = { sleep(Math.pow(2, task.attempt) * 200 as long); return 'retry' }
     maxRetries    = 5
-    array = 10
+    // array = 50
 }
 
 // Specify that singularity should be used and where the cache dir will be for the images
@@ -91,12 +91,13 @@ profiles {
                     }
                 }
             }
-            clusterOptions = { "--cluster genius --account=$tier1_project" }
+            clusterOptions = { "--clusters=genius --account=$tier1_project" }
             scratch = "$scratch_dir"
         }
     }
 
     wice {
+
         params {
             config_profile_description = 'HPC_WICE profile for use on the Wice cluster of the VSC HPC.'
             config_profile_contact = '[email protected]'
@@ -126,7 +127,7 @@ profiles {
                     }
                 }
             }
-            clusterOptions = { "--cluster wice --account=$tier1_project" }
+            clusterOptions = { "--clusters=wice --account=$tier1_project"}
             scratch = "$scratch_dir"
         }
     }
@@ -144,7 +145,7 @@ profiles {
         process {
             executor = 'slurm'
             queue = { task.time <= 72.h ? 'superdome' : 'superdome_long' }
-            clusterOptions = { "--cluster genius --account=$tier1_project" }
+            clusterOptions = {"--clusters=genius --account=$tier1_project"}
             scratch = "$scratch_dir"
         }
     }