diff --git a/1_Cross_CarveBlocks/breport.sht b/1_Cross_CarveBlocks/breport.sht index 02e0212..59593ef 100644 --- a/1_Cross_CarveBlocks/breport.sht +++ b/1_Cross_CarveBlocks/breport.sht @@ -11,8 +11,6 @@ ls -l ../*/D*/xD*.e* > BlockErrs.txt -ls -l ../*/D*/xD*.o* > BlockOuts.txt - ls -l ../*/D*/make.down > BlockMakes.txt grep FAIL ../*/D*/cross_thisblock.log > BlockFAIL.txt diff --git a/1_Cross_CarveBlocks/cross_carveblocks.cpp b/1_Cross_CarveBlocks/cross_carveblocks.cpp index ee6b7c7..5f70102 100644 --- a/1_Cross_CarveBlocks/cross_carveblocks.cpp +++ b/1_Cross_CarveBlocks/cross_carveblocks.cpp @@ -167,7 +167,7 @@ static void WriteTestblockFile() fprintf( f, "\n" ); fprintf( f, "export MRC_TRIM=12\n" ); fprintf( f, "\n" ); - fprintf( f, "QSUB_1NODE.sht 7 \"x\" \"\" %d \"cross_thisblock -script=%s\"\n", + fprintf( f, "QSUB_1NODE.sht 7 \"x\" \"\" 1 %d \"cross_thisblock -script=%s\"\n", scr.blockslots, gArgs.script ); fprintf( f, "\n" ); @@ -224,7 +224,7 @@ static void WriteBSubFile() fprintf( f, "\t\tfor jb in $(ls -d * | grep -E 'D[0-9]{1,}_[0-9]{1,}')\n" ); fprintf( f, "\t\tdo\n" ); fprintf( f, "\t\t\tcd $jb\n" ); - fprintf( f, "\t\t\tQSUB_1NODE.sht 7 \"x$jb-$lyr\" \"\" %d \"cross_thisblock -script=%s\"\n", + fprintf( f, "\t\t\tQSUB_1NODE.sht 7 \"x$jb-$lyr\" \"\" 1 %d \"cross_thisblock -script=%s\"\n", scr.blockslots, gArgs.script ); fprintf( f, "\t\t\tcd ..\n" ); fprintf( f, "\t\tdone\n" ); @@ -319,8 +319,6 @@ static void WriteReportFiles() fprintf( f, "\n" ); fprintf( f, "ls -l ../*/D*/xD*.e* > BlockErrs.txt\n" ); fprintf( f, "\n" ); - fprintf( f, "ls -l ../*/D*/xD*.o* > BlockOuts.txt\n" ); - fprintf( f, "\n" ); fprintf( f, "ls -l ../*/D*/make.down > BlockMakes.txt\n" ); fprintf( f, "\n" ); fprintf( f, "grep FAIL ../*/D*/cross_thisblock.log > BlockFAIL.txt\n" ); diff --git a/1_Cross_ThisBlock/bsub.sht b/1_Cross_ThisBlock/bsub.sht index 3c2bd41..f6e1446 100644 --- a/1_Cross_ThisBlock/bsub.sht +++ b/1_Cross_ThisBlock/bsub.sht @@ -35,7 +35,7 @@ do for jb in $(ls -d * | grep -E 'D[0-9]{1,}_[0-9]{1,}') do cd $jb - QSUB_1NODE.sht 7 "x$jb-$lyr" "" 8 "cross_thisblock -script=../../scriptparams.txt" + QSUB_1NODE.sht 7 "x$jb-$lyr" "" 1 8 "cross_thisblock -script=../../scriptparams.txt" cd .. done diff --git a/1_Cross_ThisBlock/testblock.sht b/1_Cross_ThisBlock/testblock.sht index 938387f..62792f8 100644 --- a/1_Cross_ThisBlock/testblock.sht +++ b/1_Cross_ThisBlock/testblock.sht @@ -12,5 +12,5 @@ export MRC_TRIM=12 -QSUB_1NODE.sht 7 "x" "" 8 "cross_thisblock -script=../../scriptparams.txt" +QSUB_1NODE.sht 7 "x" "" 1 8 "cross_thisblock -script=../../scriptparams.txt" diff --git a/1_Cross_TopScripts/cross_topscripts.cpp b/1_Cross_TopScripts/cross_topscripts.cpp index e62656c..acd87c1 100644 --- a/1_Cross_TopScripts/cross_topscripts.cpp +++ b/1_Cross_TopScripts/cross_topscripts.cpp @@ -248,7 +248,7 @@ static void WriteSubscapes( vector &zlist ) for( int iz = 1; iz < nz; ++iz ) { fprintf( f, - "QSUB_1NODE.sht 5 \"sc-%d\" \"-j y -o out.txt\" %d" + "QSUB_1NODE.sht 5 \"sc-%d\" \"subscapes.out\" 0 %d" " \"scapeops %s -ab -za=%d -zb=%d\"\n", zlist[iz - 1], scr.stripslots, sopt, zlist[iz], zlist[iz - 1] ); @@ -260,7 +260,7 @@ static void WriteSubscapes( vector &zlist ) fprintf( f, "# Just montage last layer\n" ); fprintf( f, - "QSUB_1NODE.sht 6 \"sc-%d\" \"-j y -o out.txt\" %d" + "QSUB_1NODE.sht 6 \"sc-%d\" \"subscapes.out\" 0 %d" " \"scapeops %s -zb=%d\"\n", zlist[nz - 1], scr.stripslots, sopt, zlist[nz - 1] ); diff --git a/1_LSQi/lsq.cpp b/1_LSQi/lsq.cpp index 02ced43..e2f3fd0 100644 --- a/1_LSQi/lsq.cpp +++ b/1_LSQi/lsq.cpp @@ -344,7 +344,7 @@ void CArgs::LaunchWorkers( const vector &vL ) else { // qsub for desired slots sprintf( buf, - "QSUB_1NODE.sht 8 \"lsqw\" \"\" %d" + "QSUB_1NODE.sht 8 \"lsqw\" \"\" 1 %d" " \"lsqw -nwks=%d -temp=%s" " -cache=%s -prior=%s" " -mode=%s -Wr=%c,%g -Etol=%g -iters=%d" diff --git a/1_MRCSD1Lyr/submrcsd.sht b/1_MRCSD1Lyr/submrcsd.sht index 823f878..a2061e7 100644 --- a/1_MRCSD1Lyr/submrcsd.sht +++ b/1_MRCSD1Lyr/submrcsd.sht @@ -9,6 +9,6 @@ setenv MRC_TRIM 12 for i in $(seq $2 $3) do - QSUB_1NODE.sht 30 "sd-$i" "-j y -o out.txt" 1 "MRCSD1Lyr $1 -z=$i" + QSUB_1NODE.sht 30 "sd-$i" "out.txt" 0 1 "MRCSD1Lyr $1 -z=$i" done diff --git a/1_MakeIDB/fsub.sht b/1_MakeIDB/fsub.sht index 1cd4d4d..a2e64e7 100644 --- a/1_MakeIDB/fsub.sht +++ b/1_MakeIDB/fsub.sht @@ -24,7 +24,7 @@ do if [ -d "$lyr" ] then cd $lyr - QSUB_1NODE.sht 1 "makefm-$lyr" "-o /dev/null" $nslot "make -f make.fm -j $nproc EXTRA='""'" + QSUB_1NODE.sht 1 "makefm-$lyr" "" 1 $nslot "make -f make.fm -j $nproc EXTRA='""'" cd .. fi done diff --git a/1_MakeIDB/makeidb.cpp b/1_MakeIDB/makeidb.cpp index 2b35cf5..4c0ddaf 100644 --- a/1_MakeIDB/makeidb.cpp +++ b/1_MakeIDB/makeidb.cpp @@ -279,7 +279,7 @@ static void WriteFSubFile() fprintf( f, "\tif [ -d \"$lyr\" ]\n" ); fprintf( f, "\tthen\n" ); fprintf( f, "\t\tcd $lyr\n" ); - fprintf( f, "\t\tQSUB_1NODE.sht 1 \"makefm-$lyr\" \"-o /dev/null\" $nslot \"make -f make.fm -j $nproc EXTRA='\"\"'\"\n" ); + fprintf( f, "\t\tQSUB_1NODE.sht 1 \"makefm-$lyr\" \"\" 1 $nslot \"make -f make.fm -j $nproc EXTRA='\"\"'\"\n" ); fprintf( f, "\t\tcd ..\n" ); fprintf( f, "\tfi\n" ); fprintf( f, "done\n" ); diff --git a/1_MakeMontages/Retired/retired.cpp b/1_MakeMontages/Retired/retired.cpp index 82b3e50..860f322 100644 --- a/1_MakeMontages/Retired/retired.cpp +++ b/1_MakeMontages/Retired/retired.cpp @@ -20,7 +20,7 @@ static void WriteSFinishFile() fprintf( f, "# > ./sfinish.sht\n" ); fprintf( f, "\n" ); fprintf( f, "\n" ); - fprintf( f, "QSUB_1NODE.sht 9 \"finish\" \"\" 8 \"./finish.sht\"\n" ); + fprintf( f, "QSUB_1NODE.sht 9 \"finish\" \"\" 1 8 \"./finish.sht\"\n" ); fprintf( f, "\n" ); fclose( f ); @@ -199,7 +199,7 @@ static void WriteSubmonFile() fprintf( f, "\techo $lyr\n" ); fprintf( f, "\tif [ -d \"$lyr\" ]\n" ); fprintf( f, "\tthen\n" ); - fprintf( f, "\t\tQSUB_1NODE.sht 4 \"mon-$lyr\" \"\" 8 \"./montage1.sht $lyr\"\n" ); + fprintf( f, "\t\tQSUB_1NODE.sht 4 \"mon-$lyr\" \"\" 1 8 \"./montage1.sht $lyr\"\n" ); fprintf( f, "\tfi\n" ); fprintf( f, "done\n" ); fprintf( f, "\n" ); @@ -266,7 +266,7 @@ static void WriteSubmosFile() fprintf( f, "\techo $lyr\n" ); fprintf( f, "\tif [ -d \"$lyr\" ]\n" ); fprintf( f, "\tthen\n" ); - fprintf( f, "\t\tQSUB_1NODE.sht 10 \"mos-$lyr\" \"\" 8 \"mos ../stack/simple 0,0,-1,-1 $lyr,$lyr -warp%s > mos_$lyr.txt\"\n", + fprintf( f, "\t\tQSUB_1NODE.sht 10 \"mos-$lyr\" \"\" 1 8 \"mos ../stack/simple 0,0,-1,-1 $lyr,$lyr -warp%s > mos_$lyr.txt\"\n", (gArgs.NoFolds ? " -nf" : "") ); fprintf( f, "\tfi\n" ); fprintf( f, "done\n" ); diff --git a/1_MakeMontages/Retired/sfinish.sht b/1_MakeMontages/Retired/sfinish.sht index a8af0ba..3b5f5ae 100644 --- a/1_MakeMontages/Retired/sfinish.sht +++ b/1_MakeMontages/Retired/sfinish.sht @@ -6,5 +6,5 @@ # > ./sfinish.sht -QSUB_1NODE.sht 9 "finish" "" 8 "./finish.sht" +QSUB_1NODE.sht 9 "finish" "" 1 8 "./finish.sht" diff --git a/1_MakeMontages/Retired/submon.sht b/1_MakeMontages/Retired/submon.sht index fe05038..a7a3b48 100644 --- a/1_MakeMontages/Retired/submon.sht +++ b/1_MakeMontages/Retired/submon.sht @@ -19,7 +19,7 @@ do echo $lyr if [ -d "$lyr" ] then - QSUB_1NODE.sht 4 "mon-$lyr" "" 8 "./montage1.sht $lyr" + QSUB_1NODE.sht 4 "mon-$lyr" "" 1 8 "./montage1.sht $lyr" fi done diff --git a/1_MakeMontages/dsub.sht b/1_MakeMontages/dsub.sht index 77a3082..be9f675 100644 --- a/1_MakeMontages/dsub.sht +++ b/1_MakeMontages/dsub.sht @@ -32,7 +32,7 @@ do if [ -e make.down ] then - QSUB_1NODE.sht 3 "q$jb-$lyr" "-o /dev/null" $nslot "make -f make.down -j $nproc EXTRA='""'" + QSUB_1NODE.sht 3 "q$jb-$lyr" "" 1 $nslot "make -f make.down -j $nproc EXTRA='""'" fi cd .. diff --git a/1_MakeMontages/makemontages.cpp b/1_MakeMontages/makemontages.cpp index 958406e..2510afe 100644 --- a/1_MakeMontages/makemontages.cpp +++ b/1_MakeMontages/makemontages.cpp @@ -465,7 +465,7 @@ static void WriteSSubNFile() fprintf( f, "\t\tfor jb in $(ls -d * | grep -E 'S[0-9]{1,}_[0-9]{1,}')\n" ); fprintf( f, "\t\tdo\n" ); fprintf( f, "\t\t\tcd $jb\n" ); - fprintf( f, "\t\t\tQSUB_1NODE.sht 2 \"q$jb-$lyr\" \"-o /dev/null\" $nslot \"make -f make.same -j $nproc EXTRA='\"\"'\"\n" ); + fprintf( f, "\t\t\tQSUB_1NODE.sht 2 \"q$jb-$lyr\" \"\" 1 $nslot \"make -f make.same -j $nproc EXTRA='\"\"'\"\n" ); fprintf( f, "\t\t\tcd ..\n" ); fprintf( f, "\t\tdone\n" ); fprintf( f, "\n" ); @@ -526,7 +526,7 @@ static void WriteDSubNFile() fprintf( f, "\n" ); fprintf( f, "\t\t\tif [ -e make.down ]\n" ); fprintf( f, "\t\t\tthen\n" ); - fprintf( f, "\t\t\t\tQSUB_1NODE.sht 3 \"q$jb-$lyr\" \"-o /dev/null\" $nslot \"make -f make.down -j $nproc EXTRA='\"\"'\"\n" ); + fprintf( f, "\t\t\t\tQSUB_1NODE.sht 3 \"q$jb-$lyr\" \"\" 1 $nslot \"make -f make.down -j $nproc EXTRA='\"\"'\"\n" ); fprintf( f, "\t\t\tfi\n" ); fprintf( f, "\n" ); fprintf( f, "\t\t\tcd ..\n" ); @@ -683,7 +683,7 @@ static void WriteMSubFile() fprintf( f, "\tthen\n" ); fprintf( f, "\t\tcd $lyr/montage\n" ); fprintf( f, "\n" ); - fprintf( f, "\t\tQSUB_1NODE.sht 4 \"mon-$lyr\" \"\" 1 \"./runlsq.sht\"\n" ); + fprintf( f, "\t\tQSUB_1NODE.sht 4 \"mon-$lyr\" \"\" 1 1 \"./runlsq.sht\"\n" ); fprintf( f, "\n" ); fprintf( f, "\t\tcd ../..\n" ); fprintf( f, "\tfi\n" ); diff --git a/1_MakeMontages/msub.sht b/1_MakeMontages/msub.sht index c808dee..82ff439 100644 --- a/1_MakeMontages/msub.sht +++ b/1_MakeMontages/msub.sht @@ -20,7 +20,7 @@ do then cd $lyr/montage - QSUB_1NODE.sht 4 "mon-$lyr" "" 1 "./runlsq.sht" + QSUB_1NODE.sht 4 "mon-$lyr" "" 1 1 "./runlsq.sht" cd ../.. fi diff --git a/1_MakeMontages/ssub.sht b/1_MakeMontages/ssub.sht index d5e9f28..9a699ad 100644 --- a/1_MakeMontages/ssub.sht +++ b/1_MakeMontages/ssub.sht @@ -29,7 +29,7 @@ do for jb in $(ls -d * | grep -E 'S[0-9]{1,}_[0-9]{1,}') do cd $jb - QSUB_1NODE.sht 2 "q$jb-$lyr" "-o /dev/null" $nslot "make -f make.same -j $nproc EXTRA='""'" + QSUB_1NODE.sht 2 "q$jb-$lyr" "" 1 $nslot "make -f make.same -j $nproc EXTRA='""'" cd .. done diff --git a/1_Mosaic_current/submos.sht b/1_Mosaic_current/submos.sht index 8594fa0..02cb288 100644 --- a/1_Mosaic_current/submos.sht +++ b/1_Mosaic_current/submos.sht @@ -44,7 +44,7 @@ do echo $lyr if [ -d "$lyr" ] then - QSUB_1NODE.sht 10 "mos-$lyr" "" 8 "mos ../stack/simple 0,0,-1,-1 $lyr,$lyr -warp -nf > mos_$lyr.txt" + QSUB_1NODE.sht 10 "mos-$lyr" "" 1 8 "mos ../stack/simple 0,0,-1,-1 $lyr,$lyr -warp -nf > mos_$lyr.txt" fi done diff --git a/2_GrayRanger/GrayRanger.cpp b/2_GrayRanger/GrayRanger.cpp index f438ab0..b1c695e 100644 --- a/2_GrayRanger/GrayRanger.cpp +++ b/2_GrayRanger/GrayRanger.cpp @@ -193,7 +193,7 @@ static void WriteScript( vector &zlist ) for( int iz = 0; iz < nz; ++iz ) { fprintf( f, - "QSUB_1NODE.sht 31 \"gr-%d\" \"-j y -o out.txt\" 4" + "QSUB_1NODE.sht 31 \"gr-%d\" \"out.txt\" 0 4" " \"GraRan1Lyr '%s' -z=%d %s\"\n", zlist[iz], gArgs.infile, zlist[iz], sopt ); } diff --git a/2_HEQLayers/HEQLayers.cpp b/2_HEQLayers/HEQLayers.cpp index 1608ab9..4a79fc6 100644 --- a/2_HEQLayers/HEQLayers.cpp +++ b/2_HEQLayers/HEQLayers.cpp @@ -192,7 +192,7 @@ static void WriteScript( vector &zlist ) for( int iz = 0; iz < nz; ++iz ) { fprintf( f, - "QSUB_1NODE.sht 32 \"heq-%d\" \"-j y -o out.txt\" 4" + "QSUB_1NODE.sht 32 \"heq-%d\" \"out.txt\" 0 4" " \"HEQ1Lyr '%s' %s -z=%d %s\"\n", zlist[iz], gArgs.infile, gArgs.tag, zlist[iz], sopt ); } diff --git a/2_HistAll/HistAll.cpp b/2_HistAll/HistAll.cpp index e2da6ee..f13a91a 100644 --- a/2_HistAll/HistAll.cpp +++ b/2_HistAll/HistAll.cpp @@ -225,7 +225,7 @@ static void WriteScript( const vector &vp ) int chn = gArgs.chn[ic]; fprintf( f, - "QSUB_1NODE.sht 33 \"hst-%d-%d\" \"-j y -o out.txt\" 1" + "QSUB_1NODE.sht 33 \"hst-%d-%d\" \"out.txt\" 0 1" " \"Hist1 '%s_%d.tif' 'HST_%d_%d_%d.bin'\"\n", ip*nc+ic, np*nc, P.fname.c_str(), chn, P.z, P.id, chn ); diff --git a/2_RGBMerge/RGBMerge.cpp b/2_RGBMerge/RGBMerge.cpp index 6ca4a71..3b363ff 100644 --- a/2_RGBMerge/RGBMerge.cpp +++ b/2_RGBMerge/RGBMerge.cpp @@ -250,7 +250,7 @@ static void WriteScript( vector &zlist ) for( int iz = 0; iz < nz; ++iz ) { fprintf( f, - "QSUB_1NODE.sht 34 \"rgbm-%d\" \"-j y -o out.txt\" 4" + "QSUB_1NODE.sht 34 \"rgbm-%d\" \"out.txt\" 0 4" " \"RGBM1Lyr '%s' %s -z=%d %s\"\n", zlist[iz], gArgs.infile, gArgs.tag, zlist[iz], sopt ); } diff --git a/Retired_Proj/1_MakeALN/makealn.cpp b/Retired_Proj/1_MakeALN/makealn.cpp index c27225e..b59b6c0 100644 --- a/Retired_Proj/1_MakeALN/makealn.cpp +++ b/Retired_Proj/1_MakeALN/makealn.cpp @@ -323,7 +323,7 @@ static void WriteSubmosFile() fprintf( f, "\techo $lyr\n" ); fprintf( f, "\tif [ -d \"$lyr\" ]\n" ); fprintf( f, "\tthen\n" ); - fprintf( f, "\t\tQSUB_1NODE.sht 10 \"mos-$lyr\" \"\" 8 \"mos ../stack/simple 0,0,-1,-1 $lyr,$lyr -warp%s > mos_$lyr.txt\"\n", + fprintf( f, "\t\tQSUB_1NODE.sht 10 \"mos-$lyr\" \"\" 1 8 \"mos ../stack/simple 0,0,-1,-1 $lyr,$lyr -warp%s > mos_$lyr.txt\"\n", (gArgs.NoFolds ? " -nf" : "") ); fprintf( f, "\tfi\n" ); fprintf( f, "done\n" ); @@ -374,11 +374,11 @@ static void WriteSubNFile( int njobs ) fprintf( f, "\tif [ -d \"$lyr\" ]\n" ); fprintf( f, "\tthen\n" ); fprintf( f, "\t\tcd $lyr/S0_0\n" ); - fprintf( f, "\t\tQSUB_1NODE.sht 2 \"qS0_0-$lyr\" \"-o /dev/null\" $nslot \"make -f make.same -j $nproc EXTRA='\"\"'\"\n" ); + fprintf( f, "\t\tQSUB_1NODE.sht 2 \"qS0_0-$lyr\" \"\" 1 $nslot \"make -f make.same -j $nproc EXTRA='\"\"'\"\n" ); fprintf( f, "\t\tif (($lyr > $1))\n" ); fprintf( f, "\t\tthen\n" ); fprintf( f, "\t\t\tcd ../D0_0\n" ); - fprintf( f, "\t\t\tQSUB_1NODE.sht 3 \"qD0_0-$lyr\" \"-o /dev/null\" $nslot \"make -f make.down -j $nproc EXTRA='\"\"'\"\n" ); + fprintf( f, "\t\t\tQSUB_1NODE.sht 3 \"qD0_0-$lyr\" \"\" 1 $nslot \"make -f make.down -j $nproc EXTRA='\"\"'\"\n" ); fprintf( f, "\t\tfi\n" ); fprintf( f, "\t\tcd ../..\n" ); fprintf( f, "\tfi\n" ); @@ -521,7 +521,7 @@ static void WriteSFinishFile() fprintf( f, "# > ./sfinish.sht\n" ); fprintf( f, "\n" ); fprintf( f, "\n" ); - fprintf( f, "QSUB_1NODE.sht 9 \"finish\" \"\" 8 \"./finish.sht\"\n" ); + fprintf( f, "QSUB_1NODE.sht 9 \"finish\" \"\" 1 8 \"./finish.sht\"\n" ); fprintf( f, "\n" ); fclose( f ); diff --git a/Retired_Proj/1_MakeALN/sfinish.sht b/Retired_Proj/1_MakeALN/sfinish.sht index a8af0ba..3b5f5ae 100644 --- a/Retired_Proj/1_MakeALN/sfinish.sht +++ b/Retired_Proj/1_MakeALN/sfinish.sht @@ -6,5 +6,5 @@ # > ./sfinish.sht -QSUB_1NODE.sht 9 "finish" "" 8 "./finish.sht" +QSUB_1NODE.sht 9 "finish" "" 1 8 "./finish.sht" diff --git a/Retired_Proj/1_MakeALN/sub.sht b/Retired_Proj/1_MakeALN/sub.sht index 454a841..2a9b9d4 100644 --- a/Retired_Proj/1_MakeALN/sub.sht +++ b/Retired_Proj/1_MakeALN/sub.sht @@ -25,11 +25,11 @@ do if [ -d "$lyr" ] then cd $lyr/S0_0 - QSUB_1NODE.sht 2 "qS0_0-$lyr" "-o /dev/null" $nslot "make -f make.same -j $nproc EXTRA='""'" + QSUB_1NODE.sht 2 "qS0_0-$lyr" "" 1 $nslot "make -f make.same -j $nproc EXTRA='""'" if (($lyr > $1)) then cd ../D0_0 - QSUB_1NODE.sht 3 "qD0_0-$lyr" "-o /dev/null" $nslot "make -f make.down -j $nproc EXTRA='""'" + QSUB_1NODE.sht 3 "qD0_0-$lyr" "" 1 $nslot "make -f make.down -j $nproc EXTRA='""'" fi cd ../.. fi diff --git a/macros/newses.sht b/macros/newses.sht index d785948..7e8148d 100644 --- a/macros/newses.sht +++ b/macros/newses.sht @@ -1,5 +1,6 @@ #!/bin/sh +qlogin -l interactive=true -pe batch $1 -qlogin -l new=true,interactive=true -pe batch $1 +#bsub -n $1 -Is /bin/bash diff --git a/macros/subdel.sht b/macros/subdel.sht index 5c6e35f..47eac7d 100644 --- a/macros/subdel.sht +++ b/macros/subdel.sht @@ -3,5 +3,5 @@ # > ./subdel.sht dirname -QSUB_1NODE.sht 0 "del-$1" "" 1 "rm -rf "$1"" +QSUB_1NODE.sht 0 "del-$1" "" 0 1 "rm -rf "$1"" diff --git a/macros/tar.sht b/macros/tar.sht index fe0e07d..ab16ca8 100644 --- a/macros/tar.sht +++ b/macros/tar.sht @@ -53,7 +53,7 @@ else fi -#QSUB_1NODE.sht 0 "del-$srcdir" "" 8 "tar -zcf $dstdir/Plate1_0.tar.gz $srcdir/Plate1_0" +#QSUB_1NODE.sht 0 "del-$srcdir" "" 0 8 "tar -zcf $dstdir/Plate1_0.tar.gz $srcdir/Plate1_0" -#QSUB_1NODE.sht 0 "del-$srcdir" "" 8 "tar -zxf $srcdir/Plate1_0.tar.gz -C $dsttop" +#QSUB_1NODE.sht 0 "del-$srcdir" "" 0 8 "tar -zxf $srcdir/Plate1_0.tar.gz -C $dsttop" diff --git a/macros/thmdown.sht b/macros/thmdown.sht index 7e49f6b..f510b64 100644 --- a/macros/thmdown.sht +++ b/macros/thmdown.sht @@ -15,7 +15,7 @@ for i in $(seq $1 $last) do echo $i cd $i - QSUB_1NODE.sht 3 "lou-d-$i" "-o /dev/null" $nslot "make -f thumbs.down -j $nproc EXTRA='""'" + QSUB_1NODE.sht 3 "lou-d-$i" "" 1 $nslot "make -f thumbs.down -j $nproc EXTRA='""'" cd .. done diff --git a/macros/thmsame.sht b/macros/thmsame.sht index eeaaa95..17d0b51 100644 --- a/macros/thmsame.sht +++ b/macros/thmsame.sht @@ -15,7 +15,7 @@ for i in $(seq $1 $last) do echo $i cd $i - QSUB_1NODE.sht 2 "lou-s-$i" "-o /dev/null" $nslot "make -f thumbs.same -j $nproc EXTRA='""'" + QSUB_1NODE.sht 2 "lou-s-$i" "" 1 $nslot "make -f thumbs.same -j $nproc EXTRA='""'" cd .. done