ENH: Tutorial script update

This commit is contained in:
Andrew Heather
2016-12-15 17:46:37 +00:00
parent 38e40ffb95
commit 501ad5a607
2 changed files with 36 additions and 38 deletions

View File

@ -6,28 +6,24 @@ cd ${0%/*} || exit 1 # run from this directory
eulerianCase=../eulerianInjection eulerianCase=../eulerianInjection
checkPrecursorCase() { copyLagrangianData()
if [ ! -f ${1}/system/controlDict ] {
then
echo "Error: unable to find precursor Eulerian case $eulerianCase"
exit 1
fi
}
copyLagrangianData() {
dir=$1 dir=$1
latestTime=$(\cd $dir && foamListTimes -latestTime) latestTime=$(\cd $dir && foamListTimes -latestTime)
if [ ! "$latestTime" ] if [ -z $latestTime ]
then
if [ -d $dir/processor0 ]
then then
# Try a processor directory # Try a processor directory
latestTime=$(\cd $dir && foamListTimes -latestTime -processor) latestTime=$(\cd $dir && foamListTimes -latestTime -processor)
if [ "$latestTime" ] if [ -n $latestTime ]
then then
dir="${dir}/processor0" dir="${dir}/processor0"
fi fi
fi fi
fi
if [ ! "$latestTime" ] if [ -z $latestTime ]
then then
echo "Error: unable to find Lagrangian data in case $eulerianCase" echo "Error: unable to find Lagrangian data in case $eulerianCase"
exit 1 exit 1
@ -35,13 +31,16 @@ copyLagrangianData() {
dir=$dir/${latestTime}/lagrangian dir=$dir/${latestTime}/lagrangian
if [ -d $dir ]
then
echo "Copying lagrangian data from $dir to 0 directory" echo "Copying lagrangian data from $dir to 0 directory"
\cp -r $dir 0 \cp -r $dir 0
else
echo "Error: unable to find Lagrangian data in case $dir"
fi
} }
checkPrecursorCase ${eulerianCase}
restore0Dir; restore0Dir;
copyLagrangianData ${eulerianCase} copyLagrangianData ${eulerianCase}

View File

@ -6,28 +6,24 @@ cd ${0%/*} || exit 1 # run from this directory
eulerianCase=../eulerianInjection eulerianCase=../eulerianInjection
checkPrecursorCase() { copyLagrangianData()
if [ ! -f ${1}/system/controlDict ] {
then
echo "Error: unable to find precursor Eulerian case $eulerianCase"
exit 1
fi
}
copyLagrangianData() {
dir=$1 dir=$1
latestTime=$(\cd $dir && foamListTimes -latestTime) latestTime=$(\cd $dir && foamListTimes -latestTime)
if [ ! "$latestTime" ] if [ -z $latestTime ]
then
if [ -d $dir/processor0 ]
then then
# Try a processor directory # Try a processor directory
latestTime=$(\cd $dir && foamListTimes -latestTime -processor) latestTime=$(\cd $dir && foamListTimes -latestTime -processor)
if [ "$latestTime" ] if [ -n $latestTime ]
then then
dir="${dir}/processor0" dir="${dir}/processor0"
fi fi
fi fi
fi
if [ ! "$latestTime" ] if [ -z $latestTime ]
then then
echo "Error: unable to find Lagrangian data in case $eulerianCase" echo "Error: unable to find Lagrangian data in case $eulerianCase"
exit 1 exit 1
@ -35,13 +31,16 @@ copyLagrangianData() {
dir=$dir/${latestTime}/lagrangian dir=$dir/${latestTime}/lagrangian
if [ -d $dir ]
then
echo "Copying lagrangian data from $dir to 0 directory" echo "Copying lagrangian data from $dir to 0 directory"
\cp -r $dir 0 \cp -r $dir 0
else
echo "Error: unable to find Lagrangian data in case $dir"
fi
} }
checkPrecursorCase ${eulerianCase}
restore0Dir; restore0Dir;
copyLagrangianData ${eulerianCase} copyLagrangianData ${eulerianCase}