diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetCommandLineFunctionTrait.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetCommandLineFunctionTrait.scala index 614aed75942f4adc80a58bd85c08383d9b125bfc..e732abbfad7e762436178aa7492fa1c64c87571e 100644 --- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetCommandLineFunctionTrait.scala +++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetCommandLineFunctionTrait.scala @@ -37,7 +37,8 @@ trait BiopetCommandLineFunctionTrait extends CommandLineFunction with Configurab var vmem: Option[String] = config("vmem") protected val defaultCoreMemory: Double = 1.0 - var vmemFactor: Double = config("vmem_factor", default = 1.5) + protected val defaultVmemFactor: Double = 1.4 + var vmemFactor: Double = config("vmem_factor", default = defaultVmemFactor) var residentFactor: Double = config("resident_factor", default = 1.2) diff --git a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetJavaCommandLineFunction.scala b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetJavaCommandLineFunction.scala index d0d4496e9a2dd08c15d38565bd01efe8938a6843..6904cdcd07a15181cef54e9e33b7b0bdbeb78387 100644 --- a/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetJavaCommandLineFunction.scala +++ b/public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetJavaCommandLineFunction.scala @@ -25,6 +25,8 @@ trait BiopetJavaCommandLineFunction extends JavaCommandLineFunction with BiopetC javaGCHeapFreeLimit = config("java_gc_heap_freelimit") javaGCTimeLimit = config("java_gc_timelimit") + override protected val defaultVmemFactor: Double = 2.0 + /** Constructs java opts, this adds scala threads */ override def javaOpts = super.javaOpts + optional("-Dscala.concurrent.context.numThreads=", threads, spaceSeparated = false, escape = false)