Merge pull request #847 from jiawku/master

Update seadragon.config

conf/seadragon.config

@@ -24,33 +24,16 @@ singularity {
 def membership = "groups".execute().text
 
 def select_queue = { memory, cpu, walltime ->
-    // Cdragon queues
-    if (memory <= 168.GB && cpu <= 28) {
+    if (memory <= 950.GB && cpu <= 80) {
         if (walltime <= 3.h) return 'short'
         if (walltime <= 24.h) return 'medium'
         if (walltime <= 240.h) return 'long'
-    }
-
-    // Edragon E40 queues
-    if (memory <= 475.GB && cpu <= 40) {
-        if (walltime <= 3.h) return 'e40short'
-        if (walltime <= 24.h) return 'e40medium'
-        if (walltime <= 240.h) return 'e40long'
-    }
-
-    // Edragon E80 queues
-    if (memory <= 950.GB && cpu <= 80) {
-        if (walltime <= 3.h) return 'e80short'
-        if (walltime <= 24.h) return 'e80medium'
-        if (walltime <= 240.h) return 'e80long'
+        if (walltime <= 504.h) return 'vlong'
     }
 
     // High memory queues
-    if (memory <= 1900.GB && cpu <= 35) {
-        if (walltime <= 240.h) return 'highmem'
-    }
-    if (memory <= 2900.GB && cpu <= 24) {
-        if (walltime <= 240.h) return 'vhighmem'
+    if (memory <= 3900.GB && cpu <= 80 && walltime <= 504.h) {
+        if (walltime <= 240.h) return 'evhighmem'
     }
 
     throw new IllegalArgumentException("No matching queue for memory=${memory}, cpu=${cpu}, time=${time}")
@@ -72,9 +55,9 @@ executor {
 
 process {
     resourceLimits = [
-        memory: 2900.GB, // Max memory based on vhighmem node
+        memory: 3900.GB, // Max memory based on vhighmem node
         cpus: 80,       // Max CPUs based on E80 node
-        time: 240.h     // Max time for long queues
+        time: 504.h     // Max time for long queues
     ]
 
     executor = 'lsf' // Use LSF executor
@@ -98,10 +81,13 @@ process {
 }
 
 params {
-    max_memory = 2900.GB  // Maximum memory based on vhighmem nodes
+    max_memory = 3900.GB  // Maximum memory based on evhighmem nodes
     max_cpus = 80        // Maximum CPUs based on E80 nodes
-    max_time = 240.h     // Maximum runtime for long queues
+    max_time = 504.h     // Maximum runtime for evlong queues
     igenomes_base = '/rsrch3/scratch/reflib/REFLIB_data/AWS-iGenomes'
+    default_memory = 42.GB
+    default_cpus =  7
+    default_time = 3.h
 }
 
 cleanup = true