Update Ganymede queues

conf/utd_ganymede.config

@@ -6,39 +6,44 @@ params {
 }
 
 env {
-    TMPDIR = '/home/$USER/scratch/tmp'
-    SINGULARITY_CACHEDIR = '/home/$USER/scratch/tmp'
+    TMPDIR = "/home/$USER/scratch/tmp"
+    SINGULARITY_CACHEDIR="/home/$USER/scratch/singularity"
 }
 
 singularity {
   enabled = true
   envWhitelist='SINGULARITY_BINDPATH,LD_LIBRARY_PATH'
   autoMounts = true
-  // TODO cacheDir = '/home/${USER}/scratch/tmp/singularity'
+  cacheDir = "/home/$USER/scratch/singularity"
 }
 
+def membership = "groups".execute().text
+
 def select_queue = { memory, cpu ->
-    // HACK The smallmem queue is clogged and takes forever to submit a job to right now
-    // if (memory <= 12.GB && cpu <= 8) {
-    //     return 'smallmem'
-    // }
-    if (memory <= 28.GB && cpu <= 16) {
-        return 'genomics'
+    if (memory <= 32.GB && cpu <= 16 && membership.contains('genomics')) {
+        return 'genomics,normal'
     }
-    if (memory > 22.GB && memory <= 86.GB && cpu <= 8) {
-        return '96n'
+    if (memory > 32.GB && memory <= 125.GB && cpu <= 12 && membership.contains('kim')) {
+        return 'Kim,128s'
     }
-    //if (memory > 22.GB && memory <= 120.GB && cpu <= 12) {
-    //    return 'Kim'
-    //}
-    if (memory > 22.GB && memory <= 120.GB && cpu <= 16) {
+    if (memory > 32.GB && memory <= 125.GB && cpu <= 16) {
         return '128s'
     }
-    if (memory <= 246.GB && cpu <= 16) {
-        return '256h'
+    if (memory <= 250.GB && cpu <= 28) {
+        return '256i,256h'
     }
 }
 
+// Submit up to 300 concurrent jobs
+// pollInterval and queueStatInterval of every 5 minutes
+// submitRateLimit of 20 per minute
+executor {
+    queueSize = 300
+    pollInterval = '5 min'
+    queueStatInterval = '5 min'
+    submitRateLimit = '20 min'
+}
+
 process {
   beforeScript = 'module load singularity/3.2.1'
   executor = 'slurm'
@@ -64,7 +69,7 @@ process {
 }
 
 params {
-  max_memory = 240.GB
-  max_cpus = 16
+  max_memory = 250.GB
+  max_cpus = 28
   max_time = 96.h
 }