From 6e6ed0ca9462b561a07536a1816a19b47ba08ded Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 29 Jun 2016 14:21:02 +0200 Subject: [PATCH] STYLE: cleanup rhoPorousSimpleFoam tutorial case - better cleanup, avoid collisions between implicit and explicit cases --- .../0 => angledDuct/common/0.org}/T | 2 +- .../0 => angledDuct/common/0.org}/U | 8 ++++---- .../0 => angledDuct/common/0.org}/alphat | 12 ++++++------ .../0 => angledDuct/common/0.org}/epsilon | 14 +++++++------- .../0 => angledDuct/common/0.org}/k | 14 +++++++------- .../0 => angledDuct/common/0.org}/nut | 12 ++++++------ .../0 => angledDuct/common/0.org}/p | 0 .../common}/blockMeshDict.m4 | 0 .../common}/constant/fvOptions | 0 .../common}/constant/porosityProperties | 0 .../common}/constant/thermophysicalProperties | 0 .../common}/constant/turbulenceProperties | 0 .../angledDuct/explicit/Allclean | 12 ++++++++++++ .../explicit}/Allrun | 11 +++++++---- .../angledDuct/explicit/system/blockMeshDict.m4 | 1 + .../explicit}/system/controlDict | 0 .../explicit}/system/fvSchemes | 0 .../explicit}/system/fvSolution | 0 .../angledDuct/implicit/Allclean | 12 ++++++++++++ .../angledDuct/implicit}/Allrun | 10 ++++++++-- .../angledDuct/implicit/system/blockMeshDict.m4 | 1 + .../implicit}/system/controlDict | 0 .../implicit}/system/fvSchemes | 0 .../implicit}/system/fvSolution | 0 .../rhoPorousSimpleFoam/angledDuctExplicit/0 | 1 - .../angledDuctExplicit/Allrun | 1 - .../angledDuctExplicit/constant | 1 - .../angledDuctExplicit/system/blockMeshDict.m4 | 1 - .../0 => angledDuct/common/0.org}/T | 2 +- .../0 => angledDuct/common/0.org}/U | 6 +++--- .../0 => angledDuct/common/0.org}/epsilon | 14 +++++++------- .../0 => angledDuct/common/0.org}/k | 12 ++++++------ .../0 => angledDuct/common/0.org}/nut | 12 ++++++------ .../0 => angledDuct/common/0.org}/p | 0 .../common}/blockMeshDict.m4 | 0 .../common}/constant/porosityProperties | 0 .../common}/constant/transportProperties | 0 .../common}/constant/turbulenceProperties | 0 .../angledDuct/explicit/Allclean | 12 ++++++++++++ .../porousSimpleFoam/angledDuct/explicit/Allrun | 17 +++++++++++++++++ .../angledDuct/explicit/system/blockMeshDict.m4 | 1 + .../explicit}/system/controlDict | 0 .../explicit}/system/fvSchemes | 0 .../explicit}/system/fvSolution | 0 .../angledDuct/implicit/Allclean | 12 ++++++++++++ .../porousSimpleFoam/angledDuct/implicit/Allrun | 17 +++++++++++++++++ .../angledDuct/implicit/system/blockMeshDict.m4 | 1 + .../implicit}/system/controlDict | 0 .../implicit}/system/fvSchemes | 0 .../implicit}/system/fvSolution | 0 .../porousSimpleFoam/angledDuctExplicit/0 | 1 - .../porousSimpleFoam/angledDuctExplicit/Allrun | 1 - .../angledDuctExplicit/constant | 1 - .../angledDuctExplicit/system/blockMeshDict.m4 | 1 - 54 files changed, 155 insertions(+), 68 deletions(-) rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctImplicit/0 => angledDuct/common/0.org}/T (100%) rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctImplicit/0 => angledDuct/common/0.org}/U (88%) rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctImplicit/0 => angledDuct/common/0.org}/alphat (85%) rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctImplicit/0 => angledDuct/common/0.org}/epsilon (83%) rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctImplicit/0 => angledDuct/common/0.org}/k (83%) rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctImplicit/0 => angledDuct/common/0.org}/nut (84%) rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctImplicit/0 => angledDuct/common/0.org}/p (100%) rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctImplicit/system => angledDuct/common}/blockMeshDict.m4 (100%) rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctImplicit => angledDuct/common}/constant/fvOptions (100%) rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctImplicit => angledDuct/common}/constant/porosityProperties (100%) rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctImplicit => angledDuct/common}/constant/thermophysicalProperties (100%) rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctImplicit => angledDuct/common}/constant/turbulenceProperties (100%) create mode 100755 tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allclean rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctImplicit => angledDuct/explicit}/Allrun (63%) create mode 120000 tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/blockMeshDict.m4 rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctExplicit => angledDuct/explicit}/system/controlDict (100%) rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctExplicit => angledDuct/explicit}/system/fvSchemes (100%) rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctExplicit => angledDuct/explicit}/system/fvSolution (100%) create mode 100755 tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allclean rename tutorials/{incompressible/porousSimpleFoam/angledDuctImplicit => compressible/rhoPorousSimpleFoam/angledDuct/implicit}/Allrun (52%) create mode 120000 tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/blockMeshDict.m4 rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctImplicit => angledDuct/implicit}/system/controlDict (100%) rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctImplicit => angledDuct/implicit}/system/fvSchemes (100%) rename tutorials/compressible/rhoPorousSimpleFoam/{angledDuctImplicit => angledDuct/implicit}/system/fvSolution (100%) delete mode 120000 tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0 delete mode 120000 tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/Allrun delete mode 120000 tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/constant delete mode 120000 tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/blockMeshDict.m4 rename tutorials/incompressible/porousSimpleFoam/{angledDuctImplicit/0 => angledDuct/common/0.org}/T (100%) rename tutorials/incompressible/porousSimpleFoam/{angledDuctImplicit/0 => angledDuct/common/0.org}/U (91%) rename tutorials/incompressible/porousSimpleFoam/{angledDuctImplicit/0 => angledDuct/common/0.org}/epsilon (83%) rename tutorials/incompressible/porousSimpleFoam/{angledDuctImplicit/0 => angledDuct/common/0.org}/k (85%) rename tutorials/incompressible/porousSimpleFoam/{angledDuctImplicit/0 => angledDuct/common/0.org}/nut (84%) rename tutorials/incompressible/porousSimpleFoam/{angledDuctImplicit/0 => angledDuct/common/0.org}/p (100%) rename tutorials/incompressible/porousSimpleFoam/{angledDuctImplicit/system => angledDuct/common}/blockMeshDict.m4 (100%) rename tutorials/incompressible/porousSimpleFoam/{angledDuctImplicit => angledDuct/common}/constant/porosityProperties (100%) rename tutorials/incompressible/porousSimpleFoam/{angledDuctImplicit => angledDuct/common}/constant/transportProperties (100%) rename tutorials/incompressible/porousSimpleFoam/{angledDuctImplicit => angledDuct/common}/constant/turbulenceProperties (100%) create mode 100755 tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allclean create mode 100755 tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allrun create mode 120000 tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/blockMeshDict.m4 rename tutorials/incompressible/porousSimpleFoam/{angledDuctExplicit => angledDuct/explicit}/system/controlDict (100%) rename tutorials/incompressible/porousSimpleFoam/{angledDuctExplicit => angledDuct/explicit}/system/fvSchemes (100%) rename tutorials/incompressible/porousSimpleFoam/{angledDuctExplicit => angledDuct/explicit}/system/fvSolution (100%) create mode 100755 tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allclean create mode 100755 tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allrun create mode 120000 tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/blockMeshDict.m4 rename tutorials/incompressible/porousSimpleFoam/{angledDuctImplicit => angledDuct/implicit}/system/controlDict (100%) rename tutorials/incompressible/porousSimpleFoam/{angledDuctImplicit => angledDuct/implicit}/system/fvSchemes (100%) rename tutorials/incompressible/porousSimpleFoam/{angledDuctImplicit => angledDuct/implicit}/system/fvSolution (100%) delete mode 120000 tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/0 delete mode 120000 tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/Allrun delete mode 120000 tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/constant delete mode 120000 tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/blockMeshDict.m4 diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/T similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/T index b89d0e399d..cc59e28139 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/T @@ -46,8 +46,8 @@ boundaryField outlet { type inletOutlet; - value $internalField; inletValue $internalField; + value $internalField; } } diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/U similarity index 88% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/U index 38d820b97a..9aabb27fcd 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/U @@ -35,19 +35,19 @@ boundaryField porosityWall { type slip; - value uniform (0 0 0); + value $internalField; } inlet { type flowRateInletVelocity; massFlowRate constant 0.1; - value uniform (0 0 0); + value $internalField; } outlet { type inletOutlet; - value uniform (0 0 0); - inletValue uniform (0 0 0); + inletValue $internalField; + value $internalField; } } diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/alphat similarity index 85% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/alphat index 558b85f7d1..df8b021b40 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/alphat @@ -24,32 +24,32 @@ boundaryField front { type compressible::alphatWallFunction; - value uniform 0; + value $internalField; } back { type compressible::alphatWallFunction; - value uniform 0; + value $internalField; } walls { type compressible::alphatWallFunction; - value uniform 0; + value $internalField; } porosityWall { type compressible::alphatWallFunction; - value uniform 0; + value $internalField; } inlet { type calculated; - value uniform 0; + value $internalField; } outlet { type calculated; - value uniform 0; + value $internalField; } } diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/epsilon similarity index 83% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/epsilon index 495ca71638..3f8a67dcb3 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon +++ b/tutorials/compressible/rhoPorousSimpleFoam/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; } } diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/k similarity index 83% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/k index 098e959469..747fee8678 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k +++ b/tutorials/compressible/rhoPorousSimpleFoam/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; + inletValue $internalField; + value $internalField; } } diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/nut similarity index 84% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/nut index ccfea96c5a..83d86e46c1 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/nut +++ b/tutorials/compressible/rhoPorousSimpleFoam/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; } } diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/p similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/0.org/p diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4 b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/blockMeshDict.m4 similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4 rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/blockMeshDict.m4 diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/fvOptions b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/fvOptions similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/fvOptions rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/fvOptions diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porosityProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/porosityProperties similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porosityProperties rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/porosityProperties diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/thermophysicalProperties similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/thermophysicalProperties diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/turbulenceProperties similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/common/constant/turbulenceProperties diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allclean b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allclean new file mode 100755 index 0000000000..97591ced32 --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/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 + +#------------------------------------------------------------------------------ diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allrun similarity index 63% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allrun index bb18fc3feb..749a4c91c5 100755 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/Allrun @@ -1,14 +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 -application=$(getApplication) +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 $application +runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/blockMeshDict.m4 b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/blockMeshDict.m4 new file mode 120000 index 0000000000..55f23c148b --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/blockMeshDict.m4 @@ -0,0 +1 @@ +../../common/blockMeshDict.m4 \ No newline at end of file diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/controlDict similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/controlDict diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/fvSchemes similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/fvSchemes diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/fvSolution similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/explicit/system/fvSolution diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allclean b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allclean new file mode 100755 index 0000000000..97591ced32 --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/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 + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allrun similarity index 52% rename from tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/Allrun index 45b119cf09..749a4c91c5 100755 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/Allrun +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/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) +#------------------------------------------------------------------------------ diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/blockMeshDict.m4 b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/blockMeshDict.m4 new file mode 120000 index 0000000000..55f23c148b --- /dev/null +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/blockMeshDict.m4 @@ -0,0 +1 @@ +../../common/blockMeshDict.m4 \ No newline at end of file diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/controlDict similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/controlDict diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/fvSchemes similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/fvSchemes diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/fvSolution similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution rename to tutorials/compressible/rhoPorousSimpleFoam/angledDuct/implicit/system/fvSolution diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0 b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0 deleted file mode 120000 index f1c4a884b5..0000000000 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0 +++ /dev/null @@ -1 +0,0 @@ -../angledDuctImplicit/0 \ No newline at end of file diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/Allrun b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/Allrun deleted file mode 120000 index 09efeaf930..0000000000 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/Allrun +++ /dev/null @@ -1 +0,0 @@ -../angledDuctImplicit/Allrun \ No newline at end of file diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/constant b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/constant deleted file mode 120000 index 28205c782b..0000000000 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/constant +++ /dev/null @@ -1 +0,0 @@ -../angledDuctImplicit/constant \ No newline at end of file diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/blockMeshDict.m4 b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/blockMeshDict.m4 deleted file mode 120000 index baa86f23b9..0000000000 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/blockMeshDict.m4 +++ /dev/null @@ -1 +0,0 @@ -../../angledDuctImplicit/system/blockMeshDict.m4 \ No newline at end of file diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/T similarity index 100% rename from tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T rename to tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/T index b89d0e399d..cc59e28139 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/T +++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/T @@ -46,8 +46,8 @@ boundaryField outlet { type inletOutlet; - value $internalField; inletValue $internalField; + value $internalField; } } diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/U similarity index 91% rename from tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U rename to tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/U index c5fcae4973..1dc9751040 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/U +++ b/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; } } diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/epsilon similarity index 83% rename from tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon rename to tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/epsilon index 495ca71638..3f8a67dcb3 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/epsilon +++ b/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; } } diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/k similarity index 85% rename from tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k rename to tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/k index 098e959469..7f2371baf1 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/k +++ b/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; } } diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/nut similarity index 84% rename from tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut rename to tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/nut index ccfea96c5a..83d86e46c1 100644 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/nut +++ b/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; } } diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/p similarity index 100% rename from tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/0/p rename to tutorials/incompressible/porousSimpleFoam/angledDuct/common/0.org/p diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4 b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/blockMeshDict.m4 similarity index 100% rename from tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/blockMeshDict.m4 rename to tutorials/incompressible/porousSimpleFoam/angledDuct/common/blockMeshDict.m4 diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porosityProperties b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/porosityProperties similarity index 100% rename from tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/porosityProperties rename to tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/porosityProperties diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/transportProperties b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/transportProperties similarity index 100% rename from tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/transportProperties rename to tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/transportProperties diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties b/tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/turbulenceProperties similarity index 100% rename from tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/constant/turbulenceProperties rename to tutorials/incompressible/porousSimpleFoam/angledDuct/common/constant/turbulenceProperties diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allclean b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allclean new file mode 100755 index 0000000000..97591ced32 --- /dev/null +++ b/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 + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allrun b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/Allrun new file mode 100755 index 0000000000..749a4c91c5 --- /dev/null +++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/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) + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/blockMeshDict.m4 b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/blockMeshDict.m4 new file mode 120000 index 0000000000..55f23c148b --- /dev/null +++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/blockMeshDict.m4 @@ -0,0 +1 @@ +../../common/blockMeshDict.m4 \ No newline at end of file diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/controlDict similarity index 100% rename from tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/controlDict rename to tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/controlDict diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/fvSchemes similarity index 100% rename from tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes rename to tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/fvSchemes diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/fvSolution similarity index 100% rename from tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSolution rename to tutorials/incompressible/porousSimpleFoam/angledDuct/explicit/system/fvSolution diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allclean b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allclean new file mode 100755 index 0000000000..97591ced32 --- /dev/null +++ b/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 + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allrun b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/Allrun new file mode 100755 index 0000000000..749a4c91c5 --- /dev/null +++ b/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) + +#------------------------------------------------------------------------------ diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/blockMeshDict.m4 b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/blockMeshDict.m4 new file mode 120000 index 0000000000..55f23c148b --- /dev/null +++ b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/blockMeshDict.m4 @@ -0,0 +1 @@ +../../common/blockMeshDict.m4 \ No newline at end of file diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/controlDict similarity index 100% rename from tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/controlDict rename to tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/controlDict diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/fvSchemes similarity index 100% rename from tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes rename to tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/fvSchemes diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/fvSolution similarity index 100% rename from tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSolution rename to tutorials/incompressible/porousSimpleFoam/angledDuct/implicit/system/fvSolution diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/0 b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/0 deleted file mode 120000 index f1c4a884b5..0000000000 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/0 +++ /dev/null @@ -1 +0,0 @@ -../angledDuctImplicit/0 \ No newline at end of file diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/Allrun b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/Allrun deleted file mode 120000 index 09efeaf930..0000000000 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/Allrun +++ /dev/null @@ -1 +0,0 @@ -../angledDuctImplicit/Allrun \ No newline at end of file diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/constant b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/constant deleted file mode 120000 index 28205c782b..0000000000 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/constant +++ /dev/null @@ -1 +0,0 @@ -../angledDuctImplicit/constant \ No newline at end of file diff --git a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/blockMeshDict.m4 b/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/blockMeshDict.m4 deleted file mode 120000 index baa86f23b9..0000000000 --- a/tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/blockMeshDict.m4 +++ /dev/null @@ -1 +0,0 @@ -../../angledDuctImplicit/system/blockMeshDict.m4 \ No newline at end of file