From e7400ef27161d6783ae52100faf9e19339d4be1a Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 10 Dec 2018 21:05:27 +0100
Subject: [PATCH] TUT: split off an Allrun.pre for windAroundBuildings
---
.../simpleFoam/windAroundBuildings/{0 => 0.orig}/U | 0
.../windAroundBuildings/{0 => 0.orig}/epsilon | 0
.../simpleFoam/windAroundBuildings/{0 => 0.orig}/k | 0
.../simpleFoam/windAroundBuildings/{0 => 0.orig}/nut | 0
.../simpleFoam/windAroundBuildings/{0 => 0.orig}/p | 0
.../simpleFoam/windAroundBuildings/Allclean | 2 +-
.../simpleFoam/windAroundBuildings/Allrun | 5 ++---
.../simpleFoam/windAroundBuildings/Allrun-parallel | 7 +++----
.../simpleFoam/windAroundBuildings/Allrun.pre | 11 +++++++++++
9 files changed, 17 insertions(+), 8 deletions(-)
rename tutorials/incompressible/simpleFoam/windAroundBuildings/{0 => 0.orig}/U (100%)
rename tutorials/incompressible/simpleFoam/windAroundBuildings/{0 => 0.orig}/epsilon (100%)
rename tutorials/incompressible/simpleFoam/windAroundBuildings/{0 => 0.orig}/k (100%)
rename tutorials/incompressible/simpleFoam/windAroundBuildings/{0 => 0.orig}/nut (100%)
rename tutorials/incompressible/simpleFoam/windAroundBuildings/{0 => 0.orig}/p (100%)
create mode 100755 tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun.pre
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/U b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/U
similarity index 100%
rename from tutorials/incompressible/simpleFoam/windAroundBuildings/0/U
rename to tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/U
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/epsilon b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/epsilon
similarity index 100%
rename from tutorials/incompressible/simpleFoam/windAroundBuildings/0/epsilon
rename to tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/epsilon
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/k b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/k
similarity index 100%
rename from tutorials/incompressible/simpleFoam/windAroundBuildings/0/k
rename to tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/k
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/nut b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/nut
similarity index 100%
rename from tutorials/incompressible/simpleFoam/windAroundBuildings/0/nut
rename to tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/nut
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/0/p b/tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/p
similarity index 100%
rename from tutorials/incompressible/simpleFoam/windAroundBuildings/0/p
rename to tutorials/incompressible/simpleFoam/windAroundBuildings/0.orig/p
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean
index 53afd7eaead..98ff9b6209a 100755
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allclean
@@ -2,7 +2,7 @@
cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions
-cleanCase
+cleanCase0
rm -rf constant/extendedFeatureEdgeMesh > /dev/null 2>&1
rm -f constant/triSurface/buildings.eMesh > /dev/null 2>&1
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun
index cc32f55043d..30cbfe82f6f 100755
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun
@@ -2,10 +2,9 @@
cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
-runApplication surfaceFeatureExtract
+runApplication ./Allrun.pre
-runApplication blockMesh
-runApplication snappyHexMesh -overwrite
+restore0Dir
runApplication $(getApplication)
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun-parallel b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun-parallel
index 444dc97cc96..87dec4ec716 100755
--- a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun-parallel
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun-parallel
@@ -2,13 +2,12 @@
cd ${0%/*} || exit 1 # Run from this directory
. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
-runApplication surfaceFeatureExtract
-
-runApplication blockMesh
-runApplication snappyHexMesh -overwrite
+runApplication ./Allrun.pre
runApplication decomposePar
+restore0Dir -processor
+
runParallel $(getApplication)
runApplication reconstructPar
diff --git a/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun.pre b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun.pre
new file mode 100755
index 00000000000..162f1e5f74a
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/windAroundBuildings/Allrun.pre
@@ -0,0 +1,11 @@
+#!/bin/sh
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
+
+runApplication surfaceFeatureExtract
+
+runApplication blockMesh
+
+runApplication snappyHexMesh -overwrite
+
+#------------------------------------------------------------------------------
--
GitLab