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