fixing some thor functionality

This commit is contained in:
caes 2016-08-04 14:13:23 -04:00
parent c0004fdab2
commit fed8b849da

View File

@ -114,28 +114,28 @@ do
echo -n "1000 50 400 mcmc_${echo_band}.dat" >> tmp.psdlagargs echo -n "1000 50 400 mcmc_${echo_band}.dat" >> tmp.psdlagargs
# Run psdlag with inputs # Run psdlag with inputs
if [[ -e $outputfile ]] if [[ $1 == "thor" || $(hostname) == "thor.cs.wmich.edu"]]
then then
echo -n " Analysis already exists; skipping." echo_band_noUTF=$(echo $echo_band|
else #sed 's|𝛌||g'|
if [[ $1 == "thor" ]] #sed 's|(|_|g'|
#sed 's|)|_|g'|
sed 's|||g'|
sed 's|Å|A|g')
outputfile_noUTF=$(echo $outputfile|
#sed 's|𝛌||g'|
#sed 's|(|_|g'|
#sed 's|)|_|g'|
sed 's|||g'|
sed 's|[{}]|_|g'|
sed 's|;|_|'|
sed 's|Å|A|g'|
sed 's|_≺_|_|g'|
sed 's|σ∊|err|')
if [[ -e $outputfile_noUTF ]]
then then
echo_band_noUTF=$(echo $echo_band| echo -n " Analysis already exists; skipping."
#sed 's|𝛌||g'| else
#sed 's|(|_|g'|
#sed 's|)|_|g'|
sed 's|||g'|
sed 's|Å|A|g')
outputfile_noUTF=$(echo $outputfile|
#sed 's|𝛌||g'|
#sed 's|(|_|g'|
#sed 's|)|_|g'|
sed 's|||g'|
sed 's|[{}]|_|g'|
sed 's|;|_|'|
sed 's|Å|A|g'|
sed 's|_≺_|_|g'|
sed 's|σ∊|err|')
argsfile="thor/arguments/$echo_band_noUTF.args" argsfile="thor/arguments/$echo_band_noUTF.args"
submitscript="thor/${echo_band_noUTF}.pbs" submitscript="thor/${echo_band_noUTF}.pbs"
cp tmp.psdlagargs $argsfile cp tmp.psdlagargs $argsfile
@ -147,9 +147,13 @@ do
cd thor cd thor
qsub $(basename $submitscript) >> submissions qsub $(basename $submitscript) >> submissions
cd .. cd ..
fi
else
if [[ -e $outputfile ]]
then
echo -n " Analysis already exists; skipping."
else else
time bin/psdlag tmp.psdlagargs > $outputfile time bin/psdlag tmp.psdlagargs > $outputfile
fi
fi fi
echo "" echo ""
done done