From 78b4579857f862042bde36a16c9c1d5f7a298aef Mon Sep 17 00:00:00 2001
From: Peter van 't Hof <p.j.van_t_hof@lumc.nl>
Date: Thu, 21 Jul 2016 13:28:45 +0200
Subject: [PATCH] Fixed memory correction
---
.../scala/nl/lumc/sasc/biopet/core/CommandLineResources.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/CommandLineResources.scala b/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/CommandLineResources.scala
index 33e581a8b..92626a859 100644
--- a/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/CommandLineResources.scala
+++ b/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/CommandLineResources.scala
@@ -87,10 +87,10 @@ trait CommandLineResources extends CommandLineFunction with Configurable {
else memoryLimit = Some(_coreMemory * threads)
if (config.contains("resident_limit")) residentLimit = config("resident_limit")
- else residentLimit = Some((_coreMemory + (0.5 * retryMultipler)) * residentFactor * (if (multiplyRssThreads) 1 else threads))
+ else residentLimit = Some((_coreMemory + (0.5 * retryMultipler)) * residentFactor * (if (multiplyRssThreads) threads else 1))
if (!config.contains("vmem"))
- vmem = Some((_coreMemory * (vmemFactor + (0.5 * retryMultipler)) * (if (multiplyVmemThreads) 1 else threads)) + "G")
+ vmem = Some((_coreMemory * (vmemFactor + (0.5 * retryMultipler)) * (if (multiplyVmemThreads) threads else 1)) + "G")
jobName = configNamespace + ":" + (if (firstOutput != null) firstOutput.getName else jobOutputFile)
}
--
GitLab