diff --git a/macros/CCEScan/batch/submitHamburg.sh b/macros/CCEScan/batch/submitHamburg.sh index 846d037..939eb9f 100644 --- a/macros/CCEScan/batch/submitHamburg.sh +++ b/macros/CCEScan/batch/submitHamburg.sh @@ -2,7 +2,7 @@ # @Author: Elena Graverini # @Date: 2016-01-13 10:52:22 # @Last Modified by: Elena Graverini -# @Last Modified time: 2017-05-29 15:21:46 +# @Last Modified time: 2017-09-01 19:26:46 # Locations swsource=$HOME/STAging/macros/CCEScan @@ -20,7 +20,7 @@ # Prepare script scriptname="hamburg_allTT_allIT" -cp $scripts/base.sh $scripts/temp_scripts/${scriptname}.sh +cp $scripts/base.sh $scripts/temp_scripts/${scriptname}.slurm echo "Preparing running conditions:" @@ -40,31 +40,31 @@ # Temperature # =========== # Make sure you run "python getTempFromPlus.py 2016" from lxplus first -echo "${runCondSw}/tempExtract -b" >> $scripts/temp_scripts/${scriptname}.sh +echo "${runCondSw}/tempExtract -b" >> $scripts/temp_scripts/${scriptname}.slurm # Fluence # ======= # This is the slowest part (fluence extract) -echo "${runCondSw}/fluenceExtract -b" >> $scripts/temp_scripts/${scriptname}.sh +echo "${runCondSw}/fluenceExtract -b" >> $scripts/temp_scripts/${scriptname}.slurm for rad in "${rads[@]}" do - echo "${runCondSw}/fluenceExtract -d TT -r ${rad} -b" >> $scripts/temp_scripts/${scriptname}.sh + echo "${runCondSw}/fluenceExtract -d TT -r ${rad} -b" >> $scripts/temp_scripts/${scriptname}.slurm done -echo "${runCondSw}/fluenceExtract -d IT -b" >> $scripts/temp_scripts/${scriptname}.sh -echo "${runCondSw}/fluenceExtract -d IT -r 175 -b" >> $scripts/temp_scripts/${scriptname}.sh +echo "${runCondSw}/fluenceExtract -d IT -b" >> $scripts/temp_scripts/${scriptname}.slurm +echo "${runCondSw}/fluenceExtract -d IT -r 175 -b" >> $scripts/temp_scripts/${scriptname}.slurm # TT Hamburg model predictions # ============================ echo "Preparing TT:" for sector in `cat $swsource/TTsectors.dat` do - echo "${swsource}/Hamburg -d TT -l TTaU -s ${sector} -b" >> $scripts/temp_scripts/${scriptname}.sh + echo "${swsource}/Hamburg -d TT -l TTaU -s ${sector} -b" >> $scripts/temp_scripts/${scriptname}.slurm done for sector in `cat $swsource/TTinner.dat` do for rad in "${rads[@]}" do - echo "${swsource}/Hamburg -d TT -l TTaU -s ${sector} -r ${rad} -b" >> $scripts/temp_scripts/${scriptname}.sh + echo "${swsource}/Hamburg -d TT -l TTaU -s ${sector} -r ${rad} -b" >> $scripts/temp_scripts/${scriptname}.slurm done done @@ -73,21 +73,23 @@ echo "Preparing IT:" for sector in `cat $swsource/ITsectors.dat` do - echo "${swsource}/Hamburg -d IT -l T3X2 -s ${sector} -b" >> $scripts/temp_scripts/${scriptname}.sh + echo "${swsource}/Hamburg -d IT -l T3X2 -s ${sector} -b" >> $scripts/temp_scripts/${scriptname}.slurm done for sector in `cat $swsource/ITinner.dat` do - echo "${swsource}/Hamburg -d IT -l T3X2 -s ${sector} -r 175 -b" >> $scripts/temp_scripts/${scriptname}.sh + echo "${swsource}/Hamburg -d IT -l T3X2 -s ${sector} -r 175 -b" >> $scripts/temp_scripts/${scriptname}.slurm done # Submit job -# ========== -# 66 TT sectors -# 27 IT sectors -# 5 TT inner sectors * 3 radii -# 7 IT inner sectors -# --> total of 115 sectors to run. -# Hamburg alone = 100 s per sector --> 11500 s -# Full TT issue of fluenceExtract = ~20 min (1210 s) -# --> total ~6*1210 s = 7260 s -qsub -l cput=250000 $scripts/temp_scripts/${scriptname}.sh -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log -j oe +# # ========== +# # 66 TT sectors +# # 27 IT sectors +# # 5 TT inner sectors * 3 radii +# # 7 IT inner sectors +# # --> total of 115 sectors to run. +# # Hamburg alone = 100 s per sector --> 11500 s +# # Full TT issue of fluenceExtract = ~20 min (1210 s) +# # --> total ~6*1210 s = 7260 s +# qsub -l cput=250000 $scripts/temp_scripts/${scriptname}.sh -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log -j oe + +sbatch -p verylong $scripts/temp_scripts/${scriptname}.slurm -o ${logs}/${scriptname}.log -e ${logs}/${scriptname}.log \ No newline at end of file