diff --git a/CHANGELOG.md b/CHANGELOG.md index b3dbc7f6a1e23f3317820d112a95e6c2348e4da6..a6df930780ffd05e33e2f7ab146da4a4c48b0f39 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ that users understand how the changes affect the new version. --> version 5.0.1 --------------------------- ++ Smoove: enable genotyping + add runtime memory to number of tasks. version 5.0.0 diff --git a/bcftools.wdl b/bcftools.wdl index 4dc4edb5e4cccd9559fa5b260d83db79354e3a09..02a02563f622766f2481ecfd27c6668c6f0b27d1 100644 --- a/bcftools.wdl +++ b/bcftools.wdl @@ -43,7 +43,7 @@ task Annotate { File? regionsFile File? renameChrs File? samplesFile - + Int threads = 0 String memory = "256M" Int timeMinutes = 1 + ceil(size(inputFile, "G")) @@ -53,7 +53,7 @@ task Annotate { Boolean compressed = basename(outputPath) != basename(outputPath, ".gz") command { - set -e + set -e mkdir -p "$(dirname ~{outputPath})" bcftools annotate \ -o ~{outputPath} \ @@ -154,7 +154,7 @@ task Sort { File outputVcf = outputPath File? outputVcfIndex = outputPath + ".tbi" } - + runtime { memory: memory time_minutes: timeMinutes diff --git a/smoove.wdl b/smoove.wdl index e5c5348f365fe56ad9bbbec9e075b44a42f9fd90..d1011f6cd3623e13377af67d000639b1c438bdaa 100644 --- a/smoove.wdl +++ b/smoove.wdl @@ -41,11 +41,13 @@ task Call { --outdir ~{outputDir} \ --name ~{sample} \ --fasta ~{referenceFasta} \ + --removepr \ + --genotype \ ~{bamFile} } output { - File smooveVcf = outputDir + "/" + sample + "-smoove.vcf.gz" + File smooveVcf = outputDir + "/" + sample + "-smoove.genotyped.vcf.gz" } runtime {