From a403e72277db9f8268e7260558fd6d48ce7b2c6d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 20 Dec 2018 10:26:18 +0100
Subject: [PATCH] TUT: tidying of periodicHill
---
.../pimpleFoam/LES/periodicHill/Allrun | 4 +++-
.../LES/periodicHill/steadyState/Allrun | 8 +++----
.../steadyState/system/blockMeshDict | 4 ++--
.../steadyState/system/decomposeParDict | 7 +++---
.../steadyState/system/topoSetDict | 22 +++++--------------
.../LES/periodicHill/transient/Allclean | 9 +++-----
.../LES/periodicHill/transient/Allrun | 14 +++++++-----
.../LES/periodicHill/transient/createPlots | 7 +++---
.../transient/system/blockMeshDict | 4 ++--
.../transient/system/cuttingPlane | 1 +
.../transient/system/decomposeParDict | 7 +++---
11 files changed, 38 insertions(+), 49 deletions(-)
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun b/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun
index 6b20878d493..cc19a5cc50a 100755
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/Allrun
@@ -1,7 +1,9 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
(cd steadyState && ./Allrun)
(cd transient && ./Allrun)
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/Allrun b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/Allrun
index c4486609352..76bc1a00885 100755
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/Allrun
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/Allrun
@@ -1,8 +1,6 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
-
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
runApplication blockMesh
@@ -12,4 +10,4 @@ runApplication decomposePar
runParallel simpleFoam
-
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/blockMeshDict
index b0ae540c1f9..87ecabe6c8c 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/blockMeshDict
@@ -71,8 +71,8 @@ edges #codeStream
{
profile[i].y() =
25.07355893131
- + 0.9754803562315*x
- - 1.016116352781E-01*x*x
+ + 0.9754803562315*x
+ - 1.016116352781E-01*x*x
+ 1.889794677828E-03*x*x*x;
}
else if (x >= 14 && x < 20)
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/decomposeParDict
index 107af56b2be..736dcb002d9 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/decomposeParDict
@@ -10,18 +10,17 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- note "mesh decomposition control dictionary";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
numberOfSubdomains 16;
-method simple;
+method simple;
-simpleCoeffs
+coeffs
{
- n (4 2 2);
+ n (4 2 2);
}
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/topoSetDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/topoSetDict
index eeb32c7eb5a..40331457d69 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/topoSetDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/steadyState/system/topoSetDict
@@ -22,41 +22,29 @@ actions
type faceSet;
action new;
source patchToFace;
- sourceInfo
- {
- name inlet;
- }
+ patch inlet;
}
{
name inletCellSet;
type cellSet;
action new;
source faceToCell;
- sourceInfo
- {
- set inletFaceSet;
- option any;
- }
+ set inletFaceSet;
+ option any;
}
{
name inletCellSet;
type cellSet;
action subset;
source boxToCell;
- sourceInfo
- {
- box (-100 -100 -100)(0.1 100 100);
- }
+ box (-100 -100 -100)(0.1 100 100);
}
{
name inletCellZone;
type cellZoneSet;
action new;
source setToCellZone;
- sourceInfo
- {
- set inletCellSet;
- }
+ set inletCellSet;
}
);
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean
index 282a9d3da2f..be7ddb06884 100755
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allclean
@@ -1,10 +1,7 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
-
-
-# Source tutorial clean functions
-. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions # Tutorial clean functions
cleanCase
-rm -rf processor*
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allrun b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allrun
index 4ae78b09746..e9f619eed0e 100755
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allrun
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/Allrun
@@ -1,9 +1,13 @@
#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
+cd ${0%/*} || exit 1 # Run from this directory
+. $WM_PROJECT_DIR/bin/tools/RunFunctions # Tutorial run functions
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
+echo "Linking processor*/ directory"
+for proc in $(\ls -d ../steadyState/processor*)
+do
+ [ -d "$proc" ] && ln -sf "$proc" .
+done
-ln -s $(echo ../steadyState/processor*) .
+runParallel pimpleFoam
-runParallel pimpleFoam
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/createPlots b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/createPlots
index 399b42b5df5..33c37ce3564 100755
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/createPlots
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/createPlots
@@ -1,7 +1,7 @@
-#!/bin/sh
-cd ${0%/*} || exit 1 # run from this directory
+#!/bin/bash
+cd ${0%/*} || exit 1 # Run from this directory
-time=$(foamListTimes -latestTime -processor)
+time="$(foamListTimes -latestTime -processor)"
echo "Creating plots for time $time"
@@ -73,3 +73,4 @@ do
gnuplot<<<$(plotStr $i $exp)
done
+#------------------------------------------------------------------------------
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict
index 4561141323e..5e1805b4f66 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/blockMeshDict
@@ -71,8 +71,8 @@ edges #codeStream
{
profile[i].y() =
25.07355893131
- + 0.9754803562315*x
- - 1.016116352781E-01*x*x
+ + 0.9754803562315*x
+ - 1.016116352781E-01*x*x
+ 1.889794677828E-03*x*x*x;
}
else if (x >= 14 && x < 20)
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/cuttingPlane b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/cuttingPlane
index 3dd7512839f..886daaa0ebb 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/cuttingPlane
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/cuttingPlane
@@ -45,3 +45,4 @@ cuttingPlane
}
}
+// ************************************************************************* //
diff --git a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/decomposeParDict b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/decomposeParDict
index 107af56b2be..736dcb002d9 100644
--- a/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/decomposeParDict
+++ b/tutorials/incompressible/pimpleFoam/LES/periodicHill/transient/system/decomposeParDict
@@ -10,18 +10,17 @@ FoamFile
version 2.0;
format ascii;
class dictionary;
- note "mesh decomposition control dictionary";
object decomposeParDict;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
numberOfSubdomains 16;
-method simple;
+method simple;
-simpleCoeffs
+coeffs
{
- n (4 2 2);
+ n (4 2 2);
}
--
GitLab