moved closure to queue input

Author: lianov

conf/cheaha.config

@@ -1,8 +1,7 @@
 // Prevent schemas warnings for profile parameters
 validation {
     ignoreParams = [
-        'cheaha_scratch_dir',
-        'cheaha_getQueues'
+        'cheaha_scratch_dir'
     ]
 }
 
@@ -27,33 +26,6 @@ singularity {
     runOptions = "--contain --workdir ${params.cheaha_scratch_dir} -B /scratch"
 }
 
-params.cheaha_getQueues = { time, memory ->
-    def queue_list = ["long"]
-
-    if (time <= 2.h) {
-        queue_list.add("express")
-    }
-
-    if (time <= 12.h) {
-        queue_list.add("short")
-    }
-
-    if (time <= 50.h) {
-        queue_list.add("medium")
-    }
-
-    if (memory >= 300.GB) {
-        queue_list.add("largemem-long")
-
-        if (time <= 50.h) {
-            queue_list.add("largemem")
-        }
-    }
-
-    return queue_list.join(",")
-}
-//Note .call() above did not resolve current warning for Nextflow plugin (for queue process below).
-
 process {
     resourceLimits = [
         memory: 750.GB,
@@ -63,5 +35,29 @@ process {
     executor = 'slurm'
     maxRetries = 3
     beforeScript = 'module load Singularity/3.5.2-GCC-5.4.0-2.26'
-    queue = { params.cheaha_getQueues( task.time, task.memory ) }
-}
+    queue = { 
+        def queue_list = ["long"]
+        
+        if (task.time <= 2.h) {
+            queue_list.add("express")
+        }
+
+        if (task.time <= 12.h) {
+            queue_list.add("short")
+        }
+
+        if (task.time <= 50.h) {
+            queue_list.add("medium")
+        }
+
+        if (task.memory >= 300.GB) {
+            queue_list.add("largemem-long")
+
+            if (task.time <= 50.h) {
+                queue_list.add("largemem")
+            }
+        }
+
+        return queue_list.join(",")        
+    }
+}