diff --git a/script/network/bts1gensub.sh b/script/network/bts1gensub.sh index c4a3b05..503b4fd 100755 --- a/script/network/bts1gensub.sh +++ b/script/network/bts1gensub.sh @@ -76,7 +76,6 @@ echo "sbatch -W sub$CHUNK.sh &" >> qsub1.sh fi walltime_s=$(echo $walltime | awk -F: '{ print (3600 * $1) + (60 * $2) + $3 }') -echo "progress_bar $walltime_s 100 40 params $NJOBS slurm &" >> qsub1.sh echo "wait" >> qsub1.sh #tmpqueue=($(slist|grep $queue)) @@ -90,9 +89,10 @@ echo -e "\n" grep "^sbatch" qsub1.sh > job1_command if [[ $interactive == "T" || $interactive == "True" || $interactive == "TRUE" ]];then -sed -i 's/sbatch -W/srun -n1 bash/g;s/&//g' qsub1.sh +sed -i 's/sbatch -W/srun -n1 bash/g;s/&/>\/dev\/null/g' qsub1.sh echo -e "Running $(wc -l < job1_command) jobs ... \n" else +echo "progress_bar $walltime_s 100 40 params $NJOBS slurm &" >> qsub1.sh echo -e "Submitting $(wc -l < job1_command) jobs ... \n" fi diff --git a/script/network/bts2gensub.sh b/script/network/bts2gensub.sh index 5fbaa57..412596c 100755 --- a/script/network/bts2gensub.sh +++ b/script/network/bts2gensub.sh @@ -80,7 +80,6 @@ echo "sbatch -W sub$CHUNK.sh &" >> qsub2.sh fi walltime_s=$(echo $walltime | awk -F: '{ print (3600 * $1) + (60 * $2) + $3 }') -echo "progress_bar $walltime_s 100 40 params $NJOBS slurm &" >> qsub2.sh echo "wait" >> qsub2.sh #tmpqueue=($(slist|grep $queue)) @@ -94,9 +93,10 @@ echo -e "\n" grep "^sbatch" qsub2.sh > job2_command if [[ $interactive == "T" || $interactive == "True" || $interactive == "TRUE" ]];then -sed -i 's/sbatch -W/srun -n1 bash/g;s/&//g' qsub2.sh +sed -i 's/sbatch -W/srun -n1 bash/g;s/&/>\/dev\/null/g' qsub2.sh echo -e "Running $(wc -l < job2_command) jobs ... \n" else +echo "progress_bar $walltime_s 100 40 params $NJOBS slurm &" >> qsub2.sh echo -e "Submitting $(wc -l < job2_command) jobs ... \n" fi