diff --git a/cbatch.tsh b/cbatch.tsh index 5e75199..bb54bc0 100644 --- a/cbatch.tsh +++ b/cbatch.tsh @@ -9,6 +9,9 @@ #SBATCH -e tmp/stderr.log #SBATCH --partition=ll_verylong +module unload intel +module load intel + setenv CURRENT_VERSION $1 setenv CONTINUE_VERSION $2 #"`/usr/bin/git describe --tags --long`" diff --git a/csubmit b/csubmit index 32a34e6..f0c7e78 100755 --- a/csubmit +++ b/csubmit @@ -15,7 +15,17 @@ if ( ! git diff-index --quiet --cached HEAD -- ) || ( ! git diff-files --quiet ) esac fi -sbatch cbatch.tsh "`/usr/bin/git describe --tags --long`" $1 +CURRENT_VERSION=`git describe --tags --long` +CONTINUE_VERSION=${1:-$CURRENT_VERSION} +if [ ! -f "runs/e2-estia_$CONTINUE_VERSION.run" ]; then + # get describe from previous version + echo "No run for revision $CONTINUE_VERSION, try to use previous version" + PREV_ID=`git log -n 2 --oneline --pretty=format:"%h" | tail -1` + CONTINUE_VERSION=`git describe --tags --long $PREV_ID` +fi + + +sbatch cbatch.tsh $CURRENT_VERSION $CONTINUE_VERSION # waiting for batch job to start and send all output directly to terminal sleep 2 diff --git a/results/e2-estia_S1doses_1-5-g0310721.out.gz b/results/e2-estia_S1doses_1-5-g0310721.out.gz new file mode 100644 index 0000000..2b8b79a Binary files /dev/null and b/results/e2-estia_S1doses_1-5-g0310721.out.gz differ