Merge branch 'master' into master

nf-core · Dec 19, 2024 · e3a2dfc · e3a2dfc
2 parents 5e299e1 + 553f2c7
commit e3a2dfc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/conf/eva.config b/conf/eva.config
@@ -25,14 +25,14 @@ profiles {
         params {
             igenomes_base              = "/mnt/archgen/public_data/igenomes"
             config_profile_description = 'MPI-EVA archgen profile, provided by nf-core/configs.'
-            max_memory                 = 256.GB
+            max_memory                 = 370.GB
             max_cpus                   = 32
             max_time                   = 365.d
         }
 
         process {
             resourceLimits = [
-                memory: 256.GB,
+                memory: 370.GB,
                 cpus: 32,
                 time: 365.d
             ]

diff --git a/conf/pdc_kth.config b/conf/pdc_kth.config
@@ -40,7 +40,7 @@ def clusterOptionsCreator = { mem, time, cpus ->
         case "dardel":
             String extra = ''
 
-            if (time < 7.d && mem <= 111.GB && cpus < 256) {
+            if (time <= 7.d && mem <= 111.GB && cpus <= 256) {
                 extra += ' -p shared '
             }
             else if (time < 1.d) {