Merge branch 'develop' of develop.openfoam.com:Development/OpenFOAM-plus into develop

tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun

@@ -7,10 +7,10 @@
 \cp ../lesFiles/fvS* ../lesFiles/controlDict system/
 \cp ../lesFiles/turbulenceProperties constant/
 
-# $1 for special test cases?
-\ls -d processor* | xargs -I {} \rm -rf ./{}/0 $1
-\ls -d processor* | xargs -I {} \mv ./{}/500 ./{}/0 $1
-\ls -d processor* | xargs -I {} \rm -rf ./{}/0/uniform $1
+# restart from iteration 500
+\ls -d processor* | xargs -I {} \rm -rf ./{}/0
+\ls -d processor* | xargs -I {} \mv ./{}/500 ./{}/0
+\ls -d processor* | xargs -I {} \rm -rf ./{}/0/uniform
 
 runParallel pisoFoam
 

tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun

@@ -20,9 +20,7 @@ runParallel snappyHexMesh -decomposeParDict system/decomposeParDict.ptscotch -pr
 find . -type f -iname "*level*" -exec rm {} \;
 
 #- set the initial fields
-# $1 for special test cases?
-\ls -d processor* | xargs -I {} \rm -rf ./{}/0 $1
-\ls -d processor* | xargs -I {} \cp -r 0.org ./{}/0 $1
+restore0Dir -processor
 
 runParallel renumberMesh -overwrite
 runParallel potentialFoam -initialiseUBCs

tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/T

@@ -46,8 +46,8 @@ boundaryField
     outlet
     {
         type            inletOutlet;
-        value           $internalField;
         inletValue      $internalField;
+        value           $internalField;
     }
 }
 

tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/U

@@ -35,7 +35,7 @@ boundaryField
     porosityWall
     {
         type            slip;
-        value           uniform (0 0 0);
+        value           $internalField;
     }
     inlet
     {
@@ -45,8 +45,8 @@ boundaryField
     outlet
     {
         type            inletOutlet;
-        value           uniform (0 0 0);
-        inletValue      uniform (0 0 0);
+        inletValue      $internalField;
+        value           $internalField;
     }
 }
 

tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/epsilon

@@ -24,39 +24,39 @@ boundaryField
     front
     {
         type            epsilonWallFunction;
-        value           uniform 200;
+        value           $internalField;
     }
 
     back
     {
         type            epsilonWallFunction;
-        value           uniform 200;
+        value           $internalField;
     }
 
     walls
     {
         type            epsilonWallFunction;
-        value           uniform 200;
+        value           $internalField;
     }
 
     porosityWall
     {
         type            epsilonWallFunction;
-        value           uniform 200;
+        value           $internalField;
     }
 
     inlet
     {
         type            turbulentMixingLengthDissipationRateInlet;
         mixingLength    0.005;
-        value           uniform 200;
+        value           $internalField;
     }
 
     outlet
     {
         type            inletOutlet;
-        inletValue      uniform 200;
-        value           uniform 200;
+        inletValue      $internalField;
+        value           $internalField;
     }
 }
 

tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/k

@@ -24,39 +24,39 @@ boundaryField
     front
     {
         type            kqRWallFunction;
-        value           uniform 1;
+        value           $internalField;
     }
 
     back
     {
         type            kqRWallFunction;
-        value           uniform 1;
+        value           $internalField;
     }
 
     walls
     {
         type            kqRWallFunction;
-        value           uniform 1;
+        value           $internalField;
     }
 
     porosityWall
     {
         type            kqRWallFunction;
-        value           uniform 1;
+        value           $internalField;
     }
 
     inlet
     {
         type            turbulentIntensityKineticEnergyInlet;
         intensity       0.05;
-        value           uniform 1;
+        value           $internalField;
     }
 
     outlet
     {
         type            inletOutlet;
         inletValue      uniform 1;
-        value           uniform 1;
+        value           $internalField;
     }
 }
 

tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/nut

@@ -24,37 +24,37 @@ boundaryField
     front
     {
         type            nutkWallFunction;
-        value           uniform 0;
+        value           $internalField;
     }
 
     back
     {
         type            nutkWallFunction;
-        value           uniform 0;
+        value           $internalField;
     }
 
     walls
     {
         type            nutkWallFunction;
-        value           uniform 0;
+        value           $internalField;
     }
 
     porosityWall
     {
         type            nutkWallFunction;
-        value           uniform 0;
+        value           $internalField;
     }
 
     inlet
     {
         type            calculated;
-        value           uniform 0;
+        value           $internalField;
     }
 
     outlet
     {
         type            calculated;
-        value           uniform 0;
+        value           $internalField;
     }
 }
 

tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allclean

@@ -0,0 +1,12 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+# Remove copies of common files
+\rm -rf 0 constant
+
+cleanCase
+
+#------------------------------------------------------------------------------

tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allrun

@@ -1,11 +1,17 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # Run from this directory
 
-m4 system/blockMeshDict.m4 > system/blockMeshDict
-
 # Source tutorial run functions
 . $WM_PROJECT_DIR/bin/tools/RunFunctions
 
+echo "Use common files for 0/, constant/ and blockMeshDict"
+\rm -rf 0 constant
+\cp -r ../common/0.org 0
+\cp -r ../common/constant constant
+
+m4 system/blockMeshDict.m4 > system/blockMeshDict
+
 runApplication blockMesh
 runApplication $(getApplication)
 
+#------------------------------------------------------------------------------

tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/blockMeshDict.m4

@@ -0,0 +1 @@
+../../common/blockMeshDict.m4

tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allclean

@@ -0,0 +1,12 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+# Remove copies of common files
+\rm -rf 0 constant
+
+cleanCase
+
+#------------------------------------------------------------------------------

tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allrun

@@ -0,0 +1,17 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+echo "Use common files for 0/, constant/ and blockMeshDict"
+\rm -rf 0 constant
+\cp -r ../common/0.org 0
+\cp -r ../common/constant constant
+
+m4 system/blockMeshDict.m4 > system/blockMeshDict
+
+runApplication blockMesh
+runApplication $(getApplication)
+
+#------------------------------------------------------------------------------

tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/blockMeshDict.m4

@@ -0,0 +1 @@
+../../common/blockMeshDict.m4

tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/0

@@ -1 +0,0 @@
-../angledDuctImplicit/0

tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/Allrun

@@ -1 +0,0 @@
-../angledDuctImplicit/Allrun

tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/constant

@@ -1 +0,0 @@
-../angledDuctImplicit/constant

tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/blockMeshDict.m4

@@ -1 +0,0 @@
-../../angledDuctImplicit/system/blockMeshDict.m4

tutorials/incompressible/simpleFoam/motorBike/Allrun

@@ -17,8 +17,7 @@ runParallel snappyHexMesh -overwrite
 # restore0Dir
 
 #- For parallel running: set the initial fields
-\ls -d processor* | xargs -I {} \rm -rf ./{}/0
-\ls -d processor* | xargs -I {} \cp -r 0.org ./{}/0
+restore0Dir -processor
 
 runParallel patchSummary
 runParallel potentialFoam

tutorials/incompressible/simpleFoam/turbineSiting/Allrun

@@ -8,17 +8,16 @@ cd ${0%/*} || exit 1    # Run from this directory
 mkdir 0
 
 runApplication blockMesh
-cp system/decomposeParDict.hierarchical system/decomposeParDict
+\cp system/decomposeParDict.hierarchical system/decomposeParDict
 runApplication decomposePar
 
-cp system/decomposeParDict.ptscotch system/decomposeParDict
+\cp system/decomposeParDict.ptscotch system/decomposeParDict
 runParallel snappyHexMesh -overwrite
 
 find . -type f -iname "*level*" -exec rm {} \;
 
 # - set the initial fields
-\ls -d processor* | xargs -I {} \rm -rf ./{}/0
-\ls -d processor* | xargs -I {} \cp -r 0.org ./{}/0
+restore0Dir -processor
 
 runParallel topoSet
 runParallel $(getApplication)