diff --git a/input.json b/input.json index 2b3ee69..1e1244a 100755 --- a/input.json +++ b/input.json @@ -1,6 +1,6 @@ { - "jgi_metaAssembly.input_files":["/global/cfs/cdirs/m3408/www/test_data/SRR13128014.pacbio.subsample.ccs.fastq.gz"], - "jgi_metaAssembly.proj":"nmdc:503125_160870", + "jgi_metaAssembly.input_files":["https://portal.nersc.gov/project/m3408//test_data/SRR13128014.pacbio.subsample.ccs.fastq.gz"], + "jgi_metaAssembly.proj":"nmdc:XXXXXXXXX", "jgi_metaAssembly.memory": "105G", "jgi_metaAssembly.threads": "16", "jgi_metaAssembly.shortRead": false diff --git a/jgi_assembly.wdl b/jgi_assembly.wdl index 2b9a163..c5101bb 100644 --- a/jgi_assembly.wdl +++ b/jgi_assembly.wdl @@ -12,7 +12,7 @@ workflow jgi_metaAssembly { String? memory String? threads # longReads parameters - Array[String] input_files + Array[File] input_files String flye_container = "staphb/flye:2.9.2" String flye_parameters = "--meta -o flye -t 32 --pacbio-hifi" String smrtlink_container = "bryce911/smrtlink:12.0.0.177059" @@ -24,7 +24,6 @@ workflow jgi_metaAssembly { String spades_container="staphb/spades:4.0.0" } - if (shortRead) { if (length(input_files) > 1) { call int.make_interleaved_reads { diff --git a/shortReads_assembly.wdl b/shortReads_assembly.wdl index 22c92bc..b691099 100755 --- a/shortReads_assembly.wdl +++ b/shortReads_assembly.wdl @@ -4,7 +4,7 @@ workflow jgi_metaASM { # String? outdir String? memory String? threads - String? input_file + File? input_file String proj String prefix=sub(proj, ":", "_") String rename_contig_prefix="scaffold" @@ -119,7 +119,7 @@ workflow jgi_metaASM { task stage { input { String container - String? input_file + File? input_file String memory = "4G" String target = "staged.fastq.gz" String output1 = "input.left.fastq.gz" @@ -150,6 +150,7 @@ task stage { } runtime { cpu: 2 + memory: "4 GiB" maxRetries: 1 docker: container } @@ -341,7 +342,7 @@ task create_agp { runtime { docker: container memory: "120 GiB" - cpu: 16 + cpu: 16 } command<<< set -euo pipefail