MRG: resolved merge conflicts from merge from develop branch

This commit is contained in:
Andrew Heather
2017-05-19 16:29:54 +01:00
308 changed files with 2914 additions and 1667 deletions

View File

@ -62,6 +62,8 @@ fi
SETSDIRT="../postProcessing/thermoCouple"
[ -d $SETSDIRT ] || echo "No probe data available to create graphs" && exit 1
arr=(`ls $SETSDIRT`)
OFDATAROOTT="$SETSDIRT/${arr[0]}"