From 3e026783aba68ccd3b29916bca99dcfa7eeb8070 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Mon, 18 Oct 2021 15:26:52 +0200 Subject: [PATCH] TUT: update keywords, create finiteArea in parallel --- .../dsmcFoam/supersonicCorner/Allrun | 2 +- .../dsmcFoam/wedge15Ma5/Allrun | 2 +- .../liquidFilmFoam/cylinder/Allrun-parallel | 2 +- .../sphereTransport/Allrun-parallel | 22 +++++++++++++++---- .../planeTransport/Allrun-parallel | 14 ++++++------ 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun index 135da2aee1..479d79ff0a 100755 --- a/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun +++ b/tutorials/discreteMethods/dsmcFoam/supersonicCorner/Allrun @@ -13,6 +13,6 @@ runParallel dsmcInitialise runParallel $(getApplication) -runApplication reconstructPar -noLagrangian +runApplication reconstructPar -no-lagrangian #------------------------------------------------------------------------------ diff --git a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun index 135da2aee1..479d79ff0a 100755 --- a/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun +++ b/tutorials/discreteMethods/dsmcFoam/wedge15Ma5/Allrun @@ -13,6 +13,6 @@ runParallel dsmcInitialise runParallel $(getApplication) -runApplication reconstructPar -noLagrangian +runApplication reconstructPar -no-lagrangian #------------------------------------------------------------------------------ diff --git a/tutorials/finiteArea/liquidFilmFoam/cylinder/Allrun-parallel b/tutorials/finiteArea/liquidFilmFoam/cylinder/Allrun-parallel index 1a6a193a11..0876a09fcf 100755 --- a/tutorials/finiteArea/liquidFilmFoam/cylinder/Allrun-parallel +++ b/tutorials/finiteArea/liquidFilmFoam/cylinder/Allrun-parallel @@ -7,7 +7,7 @@ restore0Dir runApplication blockMesh -runApplication decomposePar +runApplication decomposePar -no-finite-area runParallel makeFaMesh diff --git a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun-parallel b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun-parallel index e30b40dd6e..432466830b 100755 --- a/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun-parallel +++ b/tutorials/finiteArea/sphereSurfactantFoam/sphereTransport/Allrun-parallel @@ -3,16 +3,30 @@ cd "${0%/*}" || exit # Run from this directory . ${WM_PROJECT_DIR:?}/bin/tools/RunFunctions # Tutorial run functions #------------------------------------------------------------------------------ +fileHandler="-fileHandler collated" +unset reconstruct +# reconstruct=true +convertVTK=true + restore0Dir #NO blockMesh (pre-meshed geometry and pre-calculated U field) -runApplication makeFaMesh +runApplication decomposePar $fileHandler -no-finite-area -runApplication decomposePar +runParallel makeFaMesh $fileHandler -runParallel $(getApplication) +runParallel $(getApplication) $fileHandler -runApplication reconstructPar +if [ "$convertVTK" = true ] +then + runParallel foamToVTK $fileHandler -finite-area -no-internal -no-boundary +fi + +case "$reconstruct" in + (true) runApplication reconstructPar $fileHandler ;; + (latest*) runApplication reconstructPar $fileHandler -latestTime ;; + (*) echo "Skipping reconstructPar $fileHandler" ;; +esac #------------------------------------------------------------------------------ diff --git a/tutorials/finiteArea/surfactantFoam/planeTransport/Allrun-parallel b/tutorials/finiteArea/surfactantFoam/planeTransport/Allrun-parallel index aca8d95243..6b0f24420b 100755 --- a/tutorials/finiteArea/surfactantFoam/planeTransport/Allrun-parallel +++ b/tutorials/finiteArea/surfactantFoam/planeTransport/Allrun-parallel @@ -5,13 +5,14 @@ cd "${0%/*}" || exit # Run from this directory decompDict="-decomposeParDict system/decomposeParDict-procBoundary8" fileHandler="-fileHandler collated" +unset reconstruct # reconstruct=true restore0Dir runApplication blockMesh -runApplication $decompDict decomposePar $fileHandler +runApplication $decompDict decomposePar $fileHandler -no-finite-area runParallel $decompDict makeFaMesh $fileHandler @@ -19,11 +20,10 @@ runParallel $decompDict $(getApplication) $fileHandler runParallel $decompDict foamToEnsight -finite-area -if [ "$reconstruct" = true ] -then - runApplication reconstructPar $fileHandler -else - echo "Skipping reconstructPar $fileHandler" -fi +case "$reconstruct" in + (true) runApplication reconstructPar $fileHandler ;; + (latest*) runApplication reconstructPar $fileHandler -latestTime ;; + (*) echo "Skipping reconstructPar $fileHandler" ;; +esac #------------------------------------------------------------------------------