diff --git a/.gitignore b/.gitignore index 8d628c8729cc93edc06c6b61d1495f3116bdbf39..c3de72e755a00b713cf97307de32cfaf5a60b206 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,7 @@ -.log/ +LOGS/ .snakemake/ DATA/ work/ report/ +.Rproj.user +.Rhistory diff --git a/DADA2.Rproj b/DADA2.Rproj new file mode 100644 index 0000000000000000000000000000000000000000..8e3c2ebc99e2e337f7d69948b93529a437590b27 --- /dev/null +++ b/DADA2.Rproj @@ -0,0 +1,13 @@ +Version: 1.0 + +RestoreWorkspace: Default +SaveWorkspace: Default +AlwaysSaveHistory: Default + +EnableCodeIndexing: Yes +UseSpacesForTab: Yes +NumSpacesForTab: 2 +Encoding: UTF-8 + +RnwWeave: Sweave +LaTeX: pdfLaTeX diff --git a/RunSnake.sh b/RunSnake.sh index 77636ab89b812337af962c82341e54b90a365b72..b7945965d03ee01ee360fcc231329a30b7726023 100755 --- a/RunSnake.sh +++ b/RunSnake.sh @@ -3,7 +3,7 @@ export PYTHONPATH='' source /usr/local/genome/Anaconda2-5.1.0/etc/profile.d/conda.sh conda activate snakemake-5.7.4 -mkdir -p ./.log/out/ ./.log/err/ +mkdir -p LOGS/ snakemake \ --snakefile $1 \ diff --git a/cluster.json b/cluster.json index 90ebd3683fd10e9036469bad0edee69062fddd94..a79100f9607c71a7cd3598310dc94b2175525300 100644 --- a/cluster.json +++ b/cluster.json @@ -1,9 +1,9 @@ { "__default__" : { - "out" : "./.log/out/", - "err" : "./.log/err/", - "queue" : "short.q", + "out" : "LOGS/", + "err" : "LOGS/", + "queue" : "maiage.q", "cluster" : "" } } diff --git a/global.smk b/global.smk index cff37ee7198c54e9aa0cc0a7cf3c60cfc8413953..3818bb983cb957825a55e4aa0852955e81c8a365 100644 --- a/global.smk +++ b/global.smk @@ -15,7 +15,8 @@ rule all: "report/clusters_metrics.html", "report/affiliations_metrics.html", "report/abundance.biom", - "report/abundance.tsv" + "report/abundance.tsv", + "report/tree.nwk" include: "quality.smk" include: "preprocess.smk" diff --git a/qsubSnake.sh b/qsubSnake.sh index c45cd044f1139e4b310c4cdf0ac5559a4826f351..7dc75b2ad9bd3ad560a9c209712e0317a8dafb6b 100755 --- a/qsubSnake.sh +++ b/qsubSnake.sh @@ -1,2 +1,2 @@ -mkdir -p ./.log/out/ ./.log/err/ -qsub -V -cwd -o ./.log/out/ -e ./.log/err/ -q maiage.q,long.q -N `basename $1` RunSnake.sh $1 +mkdir -p LOGS/ +qsub -V -cwd -o LOGS/ -e LOGS/ -q maiage.q,long.q -N `basename $1` RunSnake.sh $1