diff --git a/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/BiopetJavaCommandLineFunction.scala b/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/BiopetJavaCommandLineFunction.scala index 070056c6ece69957c9a3509e579def35c4fc0fae..b6544969b232db6d48e7f584304231e3d7b9e423 100644 --- a/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/BiopetJavaCommandLineFunction.scala +++ b/biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/BiopetJavaCommandLineFunction.scala @@ -24,6 +24,7 @@ trait BiopetJavaCommandLineFunction extends JavaCommandLineFunction with BiopetC javaGCHeapFreeLimit = config("java_gc_heap_freelimit", default = 10) javaGCTimeLimit = config("java_gc_timelimit", default = 50) + override def defaultResidentFactor: Double = 1.5 override def defaultVmemFactor: Double = 2.0 /** Constructs java opts, this adds scala threads */ 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 92626a859f5c5594148cd1eb541cc8c797cac890..25374b4354f4dc3474db6d1d04d615a269edfeb3 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 @@ -37,9 +37,10 @@ trait CommandLineResources extends CommandLineFunction with Configurable { var vmem: Option[String] = config("vmem") def defaultCoreMemory: Double = 2.0 def defaultVmemFactor: Double = 1.4 + def defaultResidentFactor: Double = 1.2 var vmemFactor: Double = config("vmem_factor", default = defaultVmemFactor) - var residentFactor: Double = config("resident_factor", default = 1.2) + var residentFactor: Double = config("resident_factor", default = defaultResidentFactor) private var _coreMemory: Double = 2.0 def coreMemory = _coreMemory diff --git a/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/Picard.scala b/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/Picard.scala index ad8ba8918722ee1abcc2b933739da210569f319b..167e0007a15596789a2d95203ca022e0dd3fbdda 100644 --- a/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/Picard.scala +++ b/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/Picard.scala @@ -60,7 +60,7 @@ abstract class Picard extends BiopetJavaCommandLineFunction with Version { def versionRegex = """Version: (.*)""".r override def versionExitcode = List(0, 1) - override def defaultCoreMemory = 3.0 + override def defaultCoreMemory = 4.0 override def getVersion = { if (jarFile == null) Picard.getBiopetPicardVersion