From 49e4475b46b513e9f98b516cd756314a87d93a98 Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 29 Jun 2016 10:43:36 +0100 Subject: [PATCH 1/6] STYLE: redistributePar: indentation --- .../parallelProcessing/redistributePar/redistributePar.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C index a02bf106a7..8dc2731d31 100644 --- a/applications/utilities/parallelProcessing/redistributePar/redistributePar.C +++ b/applications/utilities/parallelProcessing/redistributePar/redistributePar.C @@ -2579,7 +2579,7 @@ int main(int argc, char *argv[]) || procStat == fvMesh::TOPO_PATCH_CHANGE ) { - Info<< " Detected topology change; reconstructing addressing" + Info<< " Detected topology change; reconstructing addressing" << nl << endl; if (baseMeshPtr.valid()) From 820f809bd5cd918493b33ebfb678fe4ccde4686c Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 29 Jun 2016 13:34:36 +0200 Subject: [PATCH 2/6] STYLE: cleanup handling of 0.org directories (in parallel) - remove duplicate 0/ files from the repository --- bin/tools/RunFunctions | 25 +++++-- .../basic/potentialFoam/cylinder/Allclean | 2 +- .../compressible/rhoCentralFoam/shockTube/0/T | 34 --------- .../compressible/rhoCentralFoam/shockTube/0/U | 34 --------- .../compressible/rhoCentralFoam/shockTube/0/p | 34 --------- .../rhoCentralFoam/shockTube/Allclean | 3 +- .../rhoCentralFoam/shockTube/Allrun | 1 + .../sonicFoam/laminar/shockTube/0/T | 34 --------- .../sonicFoam/laminar/shockTube/0/U | 34 --------- .../sonicFoam/laminar/shockTube/0/magU | 34 --------- .../sonicFoam/laminar/shockTube/0/p | 34 --------- .../sonicFoam/laminar/shockTube/Allclean | 5 +- .../sonicFoam/laminar/shockTube/Allrun | 1 + .../pisoFoam/les/motorBike/lesFiles/Allrun | 8 +- .../pisoFoam/les/motorBike/motorBike/Allrun | 4 +- .../simpleFoam/motorBike/Allrun | 3 +- .../simpleFoam/turbineSiting/Allrun | 7 +- .../lagrangian/reactingParcelFoam/filter/0/G | 73 ------------------- .../reactingParcelFoam/filter/0/H2O | 60 --------------- .../lagrangian/reactingParcelFoam/filter/0/N2 | 60 --------------- .../lagrangian/reactingParcelFoam/filter/0/O2 | 60 --------------- .../lagrangian/reactingParcelFoam/filter/0/T | 61 ---------------- .../lagrangian/reactingParcelFoam/filter/0/U | 60 --------------- .../reactingParcelFoam/filter/0/alphat | 62 ---------------- .../reactingParcelFoam/filter/0/epsilon | 61 ---------------- .../lagrangian/reactingParcelFoam/filter/0/k | 61 ---------------- .../reactingParcelFoam/filter/0/nut | 62 ---------------- .../lagrangian/reactingParcelFoam/filter/0/p | 60 --------------- .../reactingParcelFoam/filter/Allclean | 7 +- .../reactingParcelFoam/filter/Allrun | 6 +- .../verticalChannel/0/H2O | 54 -------------- .../verticalChannel/0/T | 54 -------------- .../verticalChannel/0/U | 58 --------------- .../verticalChannel/0/air | 54 -------------- .../verticalChannel/0/alphat | 56 -------------- .../verticalChannel/0/k | 57 --------------- .../verticalChannel/0/nut | 58 --------------- .../verticalChannel/0/omega | 62 ---------------- .../verticalChannel/0/p | 52 ------------- .../verticalChannel/Allclean | 5 +- tutorials/mesh/parallel/filter/Allclean | 9 +-- tutorials/mesh/parallel/filter/Allrun | 6 +- .../interDyMFoam/ras/motorBike/Allrun.pre | 6 +- .../cavitatingBullet/Allclean | 4 +- 44 files changed, 51 insertions(+), 1474 deletions(-) delete mode 100644 tutorials/compressible/rhoCentralFoam/shockTube/0/T delete mode 100644 tutorials/compressible/rhoCentralFoam/shockTube/0/U delete mode 100644 tutorials/compressible/rhoCentralFoam/shockTube/0/p delete mode 100644 tutorials/compressible/sonicFoam/laminar/shockTube/0/T delete mode 100644 tutorials/compressible/sonicFoam/laminar/shockTube/0/U delete mode 100644 tutorials/compressible/sonicFoam/laminar/shockTube/0/magU delete mode 100644 tutorials/compressible/sonicFoam/laminar/shockTube/0/p delete mode 100644 tutorials/lagrangian/reactingParcelFoam/filter/0/G delete mode 100644 tutorials/lagrangian/reactingParcelFoam/filter/0/H2O delete mode 100644 tutorials/lagrangian/reactingParcelFoam/filter/0/N2 delete mode 100644 tutorials/lagrangian/reactingParcelFoam/filter/0/O2 delete mode 100644 tutorials/lagrangian/reactingParcelFoam/filter/0/T delete mode 100644 tutorials/lagrangian/reactingParcelFoam/filter/0/U delete mode 100644 tutorials/lagrangian/reactingParcelFoam/filter/0/alphat delete mode 100644 tutorials/lagrangian/reactingParcelFoam/filter/0/epsilon delete mode 100644 tutorials/lagrangian/reactingParcelFoam/filter/0/k delete mode 100644 tutorials/lagrangian/reactingParcelFoam/filter/0/nut delete mode 100644 tutorials/lagrangian/reactingParcelFoam/filter/0/p delete mode 100644 tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/H2O delete mode 100644 tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/T delete mode 100644 tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/U delete mode 100644 tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/air delete mode 100644 tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/alphat delete mode 100644 tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/k delete mode 100644 tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/nut delete mode 100644 tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega delete mode 100644 tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/p diff --git a/bin/tools/RunFunctions b/bin/tools/RunFunctions index 8bd7b2f5d1..bfbe53c9a3 100755 --- a/bin/tools/RunFunctions +++ b/bin/tools/RunFunctions @@ -180,16 +180,29 @@ cloneCase() fi } -# Overwrite 0/ with the contents of 0.org/ if it exists +# Overwrite 0/ with the contents of 0.org/ if it exists. +# The -processor option to do the processor directories instead +# restore0Dir() { - echo "Restore 0/ from 0.org/" - if [ -d 0.org ] + if [ "$1" = "-processor" ] then - \rm -rf 0 - \cp -r 0.org 0 > /dev/null 2>&1 + echo "Restore 0/ from 0.org/ for processor directories" + [ -d 0.org ] || echo " Warning: no 0.org/ found" + + # do nonetheless + \ls -d processor* | xargs -I {} \rm -rf ./{}/0 + \ls -d processor* | xargs -I {} \cp -r 0.org ./{}/0 > /dev/null 2>&1 + else - echo " Warning: no 0.org/ found" + echo "Restore 0/ from 0.org/" + if [ -d 0.org ] + then + \rm -rf 0 + \cp -r 0.org 0 > /dev/null 2>&1 + else + echo " Warning: no 0.org/ found" + fi fi } diff --git a/tutorials/basic/potentialFoam/cylinder/Allclean b/tutorials/basic/potentialFoam/cylinder/Allclean index 5734444f4e..7db36b267c 100755 --- a/tutorials/basic/potentialFoam/cylinder/Allclean +++ b/tutorials/basic/potentialFoam/cylinder/Allclean @@ -4,7 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -rm -rf 0 > /dev/null 2>&1 +\rm -rf 0 > /dev/null 2>&1 cleanCase diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/T b/tutorials/compressible/rhoCentralFoam/shockTube/0/T deleted file mode 100644 index be0ffe0686..0000000000 --- a/tutorials/compressible/rhoCentralFoam/shockTube/0/T +++ /dev/null @@ -1,34 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object T; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 1; - -boundaryField -{ - sides - { - type zeroGradient; - } - - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/U b/tutorials/compressible/rhoCentralFoam/shockTube/0/U deleted file mode 100644 index 6daaa08ce7..0000000000 --- a/tutorials/compressible/rhoCentralFoam/shockTube/0/U +++ /dev/null @@ -1,34 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volVectorField; - object U; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - sides - { - type zeroGradient; - } - - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/0/p b/tutorials/compressible/rhoCentralFoam/shockTube/0/p deleted file mode 100644 index 0ea4de322c..0000000000 --- a/tutorials/compressible/rhoCentralFoam/shockTube/0/p +++ /dev/null @@ -1,34 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object p; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - sides - { - type zeroGradient; - } - - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/Allclean b/tutorials/compressible/rhoCentralFoam/shockTube/Allclean index a52c67d9c5..6e94f2d9da 100755 --- a/tutorials/compressible/rhoCentralFoam/shockTube/Allclean +++ b/tutorials/compressible/rhoCentralFoam/shockTube/Allclean @@ -4,8 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions +# Remove 0.org/ copy \rm -rf 0 -\cp -r 0.org 0 + cleanCase cleanSamples diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/Allrun b/tutorials/compressible/rhoCentralFoam/shockTube/Allrun index ed61ac5435..4e1c0a9fbc 100755 --- a/tutorials/compressible/rhoCentralFoam/shockTube/Allrun +++ b/tutorials/compressible/rhoCentralFoam/shockTube/Allrun @@ -4,6 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions +restore0Dir runApplication blockMesh runApplication setFields runApplication $(getApplication) diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/T b/tutorials/compressible/sonicFoam/laminar/shockTube/0/T deleted file mode 100644 index be0ffe0686..0000000000 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/T +++ /dev/null @@ -1,34 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object T; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 1; - -boundaryField -{ - sides - { - type zeroGradient; - } - - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/U b/tutorials/compressible/sonicFoam/laminar/shockTube/0/U deleted file mode 100644 index 6daaa08ce7..0000000000 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/U +++ /dev/null @@ -1,34 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volVectorField; - object U; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - sides - { - type zeroGradient; - } - - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/magU b/tutorials/compressible/sonicFoam/laminar/shockTube/0/magU deleted file mode 100644 index 16667d2d54..0000000000 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/magU +++ /dev/null @@ -1,34 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object magU; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - sides - { - type calculated; - value uniform 0; - } - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/0/p b/tutorials/compressible/sonicFoam/laminar/shockTube/0/p deleted file mode 100644 index 0ea4de322c..0000000000 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/0/p +++ /dev/null @@ -1,34 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - object p; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - sides - { - type zeroGradient; - } - - empty - { - type empty; - } -} - -// ************************************************************************* // diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean index 298f96e299..6e94f2d9da 100755 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allclean @@ -4,9 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -cleanCase +# Remove 0.org/ copy \rm -rf 0 -\cp -r 0.org 0 + +cleanCase cleanSamples #------------------------------------------------------------------------------ diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun index e52180e06d..1280a8c6d7 100755 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/Allrun @@ -6,6 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory application=$(getApplication) +restore0Dir runApplication blockMesh runApplication setFields runApplication $application diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun b/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun index eb23f3566e..d6423dc58b 100755 --- a/tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/Allrun +++ b/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 diff --git a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun b/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun index 9d825fda18..1c2b06f78a 100755 --- a/tutorials/incompressible/pisoFoam/les/motorBike/motorBike/Allrun +++ b/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 diff --git a/tutorials/incompressible/simpleFoam/motorBike/Allrun b/tutorials/incompressible/simpleFoam/motorBike/Allrun index 7400dfe8c1..b2bee4f010 100755 --- a/tutorials/incompressible/simpleFoam/motorBike/Allrun +++ b/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 diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun b/tutorials/incompressible/simpleFoam/turbineSiting/Allrun index 1726168131..81d7b4c4e7 100755 --- a/tutorials/incompressible/simpleFoam/turbineSiting/Allrun +++ b/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) diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/G b/tutorials/lagrangian/reactingParcelFoam/filter/0/G deleted file mode 100644 index b7d5f8f6d2..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0/G +++ /dev/null @@ -1,73 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "1"; - object G; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 0 -3 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - walls - { - type MarshakRadiation; - T T; - emissivityMode lookup; - emissivity uniform 1; - value uniform 0; - refValue uniform 0; - refGradient uniform 0; - valueFraction uniform 0; - } - inlet - { - type MarshakRadiation; - T T; - emissivityMode lookup; - emissivity uniform 1; - value uniform 0; - refValue uniform 0; - refGradient uniform 0; - valueFraction uniform 0; - } - outlet - { - type zeroGradient; - } - cycLeft_half0 - { - type cyclic; - } - cycRight_half0 - { - type cyclic; - } - frontAndBack - { - type empty; - } - cycLeft_half1 - { - type cyclic; - } - cycRight_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/H2O b/tutorials/lagrangian/reactingParcelFoam/filter/0/H2O deleted file mode 100644 index 02b28984a1..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0/H2O +++ /dev/null @@ -1,60 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "1"; - object H2O; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - walls - { - type zeroGradient; - } - inlet - { - type fixedValue; - value uniform 0; - } - outlet - { - type zeroGradient; - } - cycLeft_half0 - { - type cyclic; - } - cycRight_half0 - { - type cyclic; - } - frontAndBack - { - type empty; - } - cycLeft_half1 - { - type cyclic; - } - cycRight_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/N2 b/tutorials/lagrangian/reactingParcelFoam/filter/0/N2 deleted file mode 100644 index 4945cb5afa..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0/N2 +++ /dev/null @@ -1,60 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "1"; - object N2; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0.79; - -boundaryField -{ - walls - { - type zeroGradient; - } - inlet - { - type fixedValue; - value uniform 0.79; - } - outlet - { - type zeroGradient; - } - cycLeft_half0 - { - type cyclic; - } - cycRight_half0 - { - type cyclic; - } - frontAndBack - { - type empty; - } - cycLeft_half1 - { - type cyclic; - } - cycRight_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/O2 b/tutorials/lagrangian/reactingParcelFoam/filter/0/O2 deleted file mode 100644 index 59ea6e8917..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0/O2 +++ /dev/null @@ -1,60 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "1"; - object O2; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0.21; - -boundaryField -{ - walls - { - type zeroGradient; - } - inlet - { - type fixedValue; - value uniform 0.21; - } - outlet - { - type zeroGradient; - } - cycLeft_half0 - { - type cyclic; - } - cycRight_half0 - { - type cyclic; - } - frontAndBack - { - type empty; - } - cycLeft_half1 - { - type cyclic; - } - cycRight_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/T b/tutorials/lagrangian/reactingParcelFoam/filter/0/T deleted file mode 100644 index 331e1795f0..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0/T +++ /dev/null @@ -1,61 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "1"; - object T; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 350; - -boundaryField -{ - walls - { - type fixedValue; - value uniform 400; - } - inlet - { - type fixedValue; - value uniform 350; - } - outlet - { - type zeroGradient; - } - cycLeft_half0 - { - type cyclic; - } - cycRight_half0 - { - type cyclic; - } - frontAndBack - { - type empty; - } - cycLeft_half1 - { - type cyclic; - } - cycRight_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/U b/tutorials/lagrangian/reactingParcelFoam/filter/0/U deleted file mode 100644 index 3e05c93586..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0/U +++ /dev/null @@ -1,60 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volVectorField; - location "1"; - object U; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - walls - { - type noSlip; - } - inlet - { - type fixedValue; - value uniform (5 0 0); - } - outlet - { - type zeroGradient; - } - cycLeft_half0 - { - type cyclic; - } - cycRight_half0 - { - type cyclic; - } - frontAndBack - { - type empty; - } - cycLeft_half1 - { - type cyclic; - } - cycRight_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/alphat b/tutorials/lagrangian/reactingParcelFoam/filter/0/alphat deleted file mode 100644 index b570921ead..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0/alphat +++ /dev/null @@ -1,62 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "1"; - object alphat; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - walls - { - type compressible::alphatWallFunction; - value uniform 0; - } - inlet - { - type calculated; - value uniform 0; - } - outlet - { - type calculated; - value uniform 0; - } - cycLeft_half0 - { - type cyclic; - } - cycRight_half0 - { - type cyclic; - } - frontAndBack - { - type empty; - } - cycLeft_half1 - { - type cyclic; - } - cycRight_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/epsilon b/tutorials/lagrangian/reactingParcelFoam/filter/0/epsilon deleted file mode 100644 index 088ff10228..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0/epsilon +++ /dev/null @@ -1,61 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "1"; - object epsilon; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -3 0 0 0 0]; - -internalField uniform 0.0449; - -boundaryField -{ - walls - { - type epsilonWallFunction; - value uniform 0.0449; - } - inlet - { - type fixedValue; - value uniform 0.0449; - } - outlet - { - type zeroGradient; - } - cycLeft_half0 - { - type cyclic; - } - cycRight_half0 - { - type cyclic; - } - frontAndBack - { - type empty; - } - cycLeft_half1 - { - type cyclic; - } - cycRight_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/k b/tutorials/lagrangian/reactingParcelFoam/filter/0/k deleted file mode 100644 index 3f150e3b03..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0/k +++ /dev/null @@ -1,61 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "1"; - object k; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -2 0 0 0 0]; - -internalField uniform 0.0938; - -boundaryField -{ - walls - { - type kqRWallFunction; - value uniform 0.0938; - } - inlet - { - type fixedValue; - value uniform 0.0938; - } - outlet - { - type zeroGradient; - } - cycLeft_half0 - { - type cyclic; - } - cycRight_half0 - { - type cyclic; - } - frontAndBack - { - type empty; - } - cycLeft_half1 - { - type cyclic; - } - cycRight_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/nut b/tutorials/lagrangian/reactingParcelFoam/filter/0/nut deleted file mode 100644 index 39ecc08b76..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0/nut +++ /dev/null @@ -1,62 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "1"; - object nut; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - walls - { - type nutkWallFunction; - value uniform 0; - } - inlet - { - type calculated; - value uniform 0; - } - outlet - { - type calculated; - value uniform 0; - } - cycLeft_half0 - { - type cyclic; - } - cycRight_half0 - { - type cyclic; - } - frontAndBack - { - type empty; - } - cycLeft_half1 - { - type cyclic; - } - cycRight_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/0/p b/tutorials/lagrangian/reactingParcelFoam/filter/0/p deleted file mode 100644 index 0438b1fa57..0000000000 --- a/tutorials/lagrangian/reactingParcelFoam/filter/0/p +++ /dev/null @@ -1,60 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "1"; - object p; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 100000; - -boundaryField -{ - walls - { - type zeroGradient; - } - inlet - { - type zeroGradient; - } - outlet - { - type fixedValue; - value uniform 100000; - } - cycLeft_half0 - { - type cyclic; - } - cycRight_half0 - { - type cyclic; - } - frontAndBack - { - type empty; - } - cycLeft_half1 - { - type cyclic; - } - cycRight_half1 - { - type cyclic; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean index 0949f3df04..eddae4496c 100755 --- a/tutorials/lagrangian/reactingParcelFoam/filter/Allclean +++ b/tutorials/lagrangian/reactingParcelFoam/filter/Allclean @@ -4,12 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -cleanCase - -# remove 0 directory and post-processing directories +# Remove 0.org/ copy and post-processing directories \rm -rf 0 postProcessing -# restore 0/ directory from 0.org/ -\cp -r 0.org 0 +cleanCase #------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/Allrun b/tutorials/lagrangian/reactingParcelFoam/filter/Allrun index 268fd14d4d..2c976e023b 100755 --- a/tutorials/lagrangian/reactingParcelFoam/filter/Allrun +++ b/tutorials/lagrangian/reactingParcelFoam/filter/Allrun @@ -4,9 +4,7 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application=$(getApplication) - -# create mesh +restore0Dir runApplication blockMesh # create sets @@ -15,6 +13,6 @@ runApplication topoSet # create baffles and fields runApplication createBaffles -overwrite -runApplication $application +runApplication $(getApplication) #------------------------------------------------------------------------------ diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/H2O b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/H2O deleted file mode 100644 index 802c5d44b5..0000000000 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/H2O +++ /dev/null @@ -1,54 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object H2O; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0.01; - -boundaryField -{ - back - { - type symmetryPlane; - } - front - { - type symmetryPlane; - } - walls - { - type zeroGradient; - } - outlet - { - type inletOutlet; - inletValue uniform 0.0; - } - inletSides - { - type fixedValue; - value uniform 0.01; - } - inletCentral - { - type fixedValue; - value uniform 0.01; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/T b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/T deleted file mode 100644 index 5e3608010f..0000000000 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/T +++ /dev/null @@ -1,54 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object T; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 1 0 0 0]; - -internalField uniform 473.0; - -boundaryField -{ - back - { - type symmetryPlane; - } - front - { - type symmetryPlane; - } - walls - { - type zeroGradient; - } - outlet - { - type inletOutlet; - inletValue uniform 473.0; - } - inletSides - { - type fixedValue; - value uniform 473.0; - } - inletCentral - { - type fixedValue; - value uniform 573.0; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/U b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/U deleted file mode 100644 index 94158b3fe6..0000000000 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/U +++ /dev/null @@ -1,58 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volVectorField; - location "0"; - object U; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 1 -1 0 0 0 0]; - -internalField uniform (0 0 0); - -boundaryField -{ - back - { - type symmetryPlane; - } - front - { - type symmetryPlane; - } - inletCentral - { - type flowRateInletVelocity; - rhoInlet 1.2; - massFlowRate constant 0.00379; - value uniform (0 14.68 0); - } - inletSides - { - type flowRateInletVelocity; - rhoInlet 1.2; - massFlowRate constant 0.00832; - value uniform (0 17.79 0); - } - outlet - { - type inletOutlet; - inletValue uniform (0 0 0); - } - walls - { - type noSlip; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/air b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/air deleted file mode 100644 index 29cc2be2dd..0000000000 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/air +++ /dev/null @@ -1,54 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object air; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 0 0 0 0 0]; - -internalField uniform 0.99; - -boundaryField -{ - back - { - type symmetryPlane; - } - front - { - type symmetryPlane; - } - walls - { - type zeroGradient; - } - outlet - { - type inletOutlet; - inletValue uniform 1.0; - } - inletSides - { - type fixedValue; - value uniform 0.99; - } - inletCentral - { - type fixedValue; - value uniform 0.99; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/alphat b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/alphat deleted file mode 100644 index 97f4ec8f38..0000000000 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/alphat +++ /dev/null @@ -1,56 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object alphat; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - back - { - type symmetryPlane; - } - front - { - type symmetryPlane; - } - inletCentral - { - type calculated; - value uniform 0; - } - inletSides - { - type calculated; - value uniform 0; - } - outlet - { - type calculated; - value uniform 0; - } - walls - { - type compressible::alphatWallFunction; - Prt 0.85; - value uniform 0; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/k b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/k deleted file mode 100644 index d5f5819e48..0000000000 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/k +++ /dev/null @@ -1,57 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object k; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -2 0 0 0 0]; - -internalField uniform 3.75e-9; - -boundaryField -{ - back - { - type symmetryPlane; - } - front - { - type symmetryPlane; - } - inletCentral - { - type turbulentIntensityKineticEnergyInlet; - intensity 0.15; - value uniform 3.75e-9; - } - inletSides - { - type turbulentIntensityKineticEnergyInlet; - intensity 0.16; - value uniform 3.75e-9; - } - outlet - { - type inletOutlet; - inletValue uniform 3.75e-9; - } - walls - { - type kqRWallFunction; - value uniform 0; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/nut b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/nut deleted file mode 100644 index c89f6e4044..0000000000 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/nut +++ /dev/null @@ -1,58 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object nut; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 2 -1 0 0 0 0]; - -internalField uniform 0; - -boundaryField -{ - back - { - type symmetryPlane; - } - front - { - type symmetryPlane; - } - inletCentral - { - type calculated; - value uniform 0; - } - inletSides - { - type calculated; - value uniform 0; - } - outlet - { - type calculated; - value uniform 0; - } - walls - { - type nutkWallFunction; - Cmu 0.09; - kappa 0.41; - E 9.8; - value uniform 0; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega deleted file mode 100644 index 26af2dccdd..0000000000 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/omega +++ /dev/null @@ -1,62 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object omega; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [0 0 -1 0 0 0 0]; - -internalField uniform 4.5e-3; - -boundaryField -{ - back - { - type symmetryPlane; - } - front - { - type symmetryPlane; - } - inletCentral - { - type turbulentMixingLengthFrequencyInlet; - mixingLength 0.007; - k k; - value uniform 4.5e-3; - } - inletSides - { - type turbulentMixingLengthFrequencyInlet; - mixingLength 0.007; - k k; - value uniform 4.5e-3; - } - outlet - { - type inletOutlet; - inletValue uniform 4.5e-3; - } - walls - { - type omegaWallFunction; - Cmu 0.09; - kappa 0.41; - E 9.8; - value $internalField; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/p b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/p deleted file mode 100644 index bef7aaa77a..0000000000 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/0/p +++ /dev/null @@ -1,52 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: plus | -| \\ / A nd | Web: www.OpenFOAM.com | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class volScalarField; - location "0"; - object p; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -dimensions [1 -1 -2 0 0 0 0]; - -internalField uniform 100000; - -boundaryField -{ - back - { - type symmetryPlane; - } - front - { - type symmetryPlane; - } - inletCentral - { - type zeroGradient; - } - inletSides - { - type zeroGradient; - } - outlet - { - type fixedValue; - value uniform 100000; - } - walls - { - type zeroGradient; - } -} - - -// ************************************************************************* // diff --git a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean index dae58cf5bc..b47f1dd6cc 100755 --- a/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean +++ b/tutorials/lagrangian/simpleReactingParcelFoam/verticalChannel/Allclean @@ -4,12 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions -# remove old time and post-processing directories +# Remove old time, 0.org/ copy and post-processing directories \rm -rf 0 *[1-9]* processor* postProcessing -# restore 0/ directory from 0.org/ -\cp -r 0.org 0 - cleanCase #------------------------------------------------------------------------------ diff --git a/tutorials/mesh/parallel/filter/Allclean b/tutorials/mesh/parallel/filter/Allclean index 4d4ba35b8b..eddae4496c 100755 --- a/tutorials/mesh/parallel/filter/Allclean +++ b/tutorials/mesh/parallel/filter/Allclean @@ -4,12 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions +# Remove 0.org/ copy and post-processing directories +\rm -rf 0 postProcessing + cleanCase -# remove 0 directory -rm -rf 0 - -# remove post-processing directory -rm -rf postProcessing - #------------------------------------------------------------------------------ diff --git a/tutorials/mesh/parallel/filter/Allrun b/tutorials/mesh/parallel/filter/Allrun index e1c37c3dd1..8a0978f43f 100755 --- a/tutorials/mesh/parallel/filter/Allrun +++ b/tutorials/mesh/parallel/filter/Allrun @@ -4,12 +4,10 @@ cd ${0%/*} || exit 1 # Run from this directory # Source tutorial run functions . $WM_PROJECT_DIR/bin/tools/RunFunctions -application=$(getApplication) - # Create mesh runApplication blockMesh -# Copy 0.org to 0 +# Restore 0/ from 0.org/ restore0Dir # Create sets @@ -18,7 +16,7 @@ runApplication topoSet # Create baffles and fields runApplication createBaffles -overwrite -runApplication $application +runApplication $(getApplication) #- RedistributePar to do decomposition runParallel redistributePar -decompose -cellDist diff --git a/tutorials/multiphase/interDyMFoam/ras/motorBike/Allrun.pre b/tutorials/multiphase/interDyMFoam/ras/motorBike/Allrun.pre index 5a68a5bd0c..5b7c3d7bc2 100755 --- a/tutorials/multiphase/interDyMFoam/ras/motorBike/Allrun.pre +++ b/tutorials/multiphase/interDyMFoam/ras/motorBike/Allrun.pre @@ -23,9 +23,9 @@ runApplication blockMesh # -------- runApplication decomposePar -force runParallel snappyHexMesh -overwrite -\ls -d processor* | xargs -I {} rm -f ./{}/constant/polyMesh/refinementHistory +\ls -d processor* | xargs -I {} \rm -f ./{}/constant/polyMesh/refinementHistory # - 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 setFields diff --git a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean index b6885c65f1..dd89f3d3da 100755 --- a/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean +++ b/tutorials/multiphase/interPhaseChangeFoam/cavitatingBullet/Allclean @@ -7,8 +7,8 @@ cd ${0%/*} || exit 1 # Run from this directory # Remove surface \rm -f constant/triSurface/bullet.stl.gz -# Remove copy of 0.org -rm -rf 0 +# Remove 0.org/ copy +\rm -rf 0 cleanCase From 6e6ed0ca9462b561a07536a1816a19b47ba08ded Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 29 Jun 2016 14:21:02 +0200 Subject: [PATCH 3/6] 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 From 5de8c1538f20013383ceb4202703feda46662219 Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 29 Jun 2016 14:34:35 +0100 Subject: [PATCH 4/6] BUG: motorBike: starting off with correct controlDict --- .../interDyMFoam/ras/motorBike/system/controlDict | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tutorials/multiphase/interDyMFoam/ras/motorBike/system/controlDict b/tutorials/multiphase/interDyMFoam/ras/motorBike/system/controlDict index fa46cc601d..caab84a9c0 100644 --- a/tutorials/multiphase/interDyMFoam/ras/motorBike/system/controlDict +++ b/tutorials/multiphase/interDyMFoam/ras/motorBike/system/controlDict @@ -22,11 +22,11 @@ FoamFile application interDyMFoam; -startFrom latestTime; +startFrom startTime; startTime 0; -stopAt nextWrite; +stopAt endTime; endTime 2; @@ -56,5 +56,11 @@ maxCo 0.5; maxAlphaCo 0.5; maxDeltaT 1; +functions +{ + // Print stats + #include "minMax" +} + // ************************************************************************* // From b2234f19e5b3865250e2325c26052af3ef024574 Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 29 Jun 2016 16:06:48 +0200 Subject: [PATCH 5/6] BUG: could not set system clang (issue #166) - gcc/g++ always being used STYLE: spurious unsetenv WM_COMPILER_TYPE (csh only) - more stringent cleanup of ThirdParty settings for wmUNSET --- etc/config.csh/compiler | 12 +++++++++--- etc/config.csh/settings | 13 +++++-------- etc/config.csh/unset | 11 +++++++++++ etc/config.sh/compiler | 11 ++++++++--- etc/config.sh/settings | 11 +++++------ etc/config.sh/unset | 11 +++++++++++ 6 files changed, 49 insertions(+), 20 deletions(-) diff --git a/etc/config.csh/compiler b/etc/config.csh/compiler index 6c457e763a..3e28c20b71 100644 --- a/etc/config.csh/compiler +++ b/etc/config.csh/compiler @@ -71,9 +71,6 @@ case ThirdParty: set gcc_version=gcc-6.1.0 breaksw case Clang: - # Using clang - not gcc - setenv WM_CC 'clang' - setenv WM_CXX 'clang++' set clang_version=llvm-3.7.0 # set clang_version=llvm-3.8.0 breaksw @@ -87,4 +84,13 @@ case ThirdParty: endsw endsw +# common settings (system or ThirdParty) +switch ("$WM_COMPILER") +case Clang: + # Using clang - not gcc + setenv WM_CC 'clang' + setenv WM_CXX 'clang++' + breaksw +endsw + #------------------------------------------------------------------------------ diff --git a/etc/config.csh/settings b/etc/config.csh/settings index ed6227d58d..24ef70ab9d 100644 --- a/etc/config.csh/settings +++ b/etc/config.csh/settings @@ -253,26 +253,21 @@ case ThirdParty: # Add ThirdParty gmp/mpfr/mpc libraries to run-time environment if ( "${gmpDir:t}" != "gmp-system" ) then _foamAddLib $gmpDir/lib$WM_COMPILER_LIB_ARCH + setenv GMP_ARCH_PATH $gmpDir # For ThirdParty CGAL endif if ( "${mpfrDir:t}" != "mpfr-system" ) then _foamAddLib $mpfrDir/lib$WM_COMPILER_LIB_ARCH + setenv MPFR_ARCH_PATH $mpfrDir # For ThirdParty CGAL endif if ( "${mpcDir:t}" != "mpc-system" ) then _foamAddLib $mpcDir/lib$WM_COMPILER_LIB_ARCH endif - # Used by boost/CGAL: - setenv GMP_ARCH_PATH $gmpDir - setenv MPFR_ARCH_PATH $mpfrDir - if ($?FOAM_VERBOSE && $?prompt) then echo "Using ThirdParty compiler" echo " ${gccDir:t} (${gmpDir:t} ${mpfrDir:t} ${mpcDir:t})" endif endif - unset gcc_version gccDir - unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir - if ( $?clang_version ) then set clangDir=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER_ARCH/$clang_version @@ -295,6 +290,9 @@ case ThirdParty: echo " ${clangDir:t}" endif endif + + unset gcc_version gccDir + unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir unset clang_version clangDir breaksw @@ -308,6 +306,5 @@ endsw # Cleanup environment: # ~~~~~~~~~~~~~~~~~~~~ #- keep _foamAddPath _foamAddLib _foamAddMan -unsetenv WM_COMPILER_TYPE #------------------------------------------------------------------------------ diff --git a/etc/config.csh/unset b/etc/config.csh/unset index c076d82e12..c9b59a7345 100644 --- a/etc/config.csh/unset +++ b/etc/config.csh/unset @@ -64,6 +64,7 @@ unsetenv WM_ARCH_OPTION unsetenv WM_CC unsetenv WM_CFLAGS unsetenv WM_COMPILER +unsetenv WM_COMPILER_ARCH unsetenv WM_COMPILER_LIB_ARCH unsetenv WM_COMPILE_OPTION unsetenv WM_CXX @@ -128,6 +129,16 @@ unsetenv ParaView_DIR unsetenv ParaView_INCLUDE_DIR unsetenv PV_PLUGIN_PATH +#------------------------------------------------------------------------------ +# unset other ThirdParty environment variables + +unsetenv BOOST_ARCH_PATH +unsetenv CCMIO_ARCH_PATH +unsetenv CGAL_ARCH_PATH +unsetenv FFTW_ARCH_PATH +unsetenv GMP_ARCH_PATH +unsetenv MPFR_ARCH_PATH +unsetenv SCOTCH_ARCH_PATH #------------------------------------------------------------------------------ # cleanup environment diff --git a/etc/config.sh/compiler b/etc/config.sh/compiler index 876fe2b7fb..0e577e1426 100644 --- a/etc/config.sh/compiler +++ b/etc/config.sh/compiler @@ -69,9 +69,6 @@ OpenFOAM | ThirdParty) gcc_version=gcc-6.1.0 ;; Clang) - # Using clang - not gcc - export WM_CC='clang' - export WM_CXX='clang++' clang_version=llvm-3.7.0 # clang_version=llvm-3.8.0 ;; @@ -84,7 +81,15 @@ OpenFOAM | ThirdParty) ;; esac ;; +esac +# common settings (system or ThirdParty) +case "$WM_COMPILER" in +Clang) + # Using clang - not gcc + export WM_CC='clang' + export WM_CXX='clang++' + ;; esac #------------------------------------------------------------------------------ diff --git a/etc/config.sh/settings b/etc/config.sh/settings index 53cb221e00..6b0d602138 100644 --- a/etc/config.sh/settings +++ b/etc/config.sh/settings @@ -246,28 +246,24 @@ OpenFOAM | ThirdParty) if [ "${gmpDir##*-}" != system ] then _foamAddLib $gmpDir/lib$WM_COMPILER_LIB_ARCH + export GMP_ARCH_PATH=$gmpDir # For ThirdParty CGAL fi if [ "${mpfrDir##*-}" != system ] then _foamAddLib $mpfrDir/lib$WM_COMPILER_LIB_ARCH + export MPFR_ARCH_PATH=$mpfrDir # For ThirdParty CGAL fi if [ "${mpcDir##*-}" != system ] then _foamAddLib $mpcDir/lib$WM_COMPILER_LIB_ARCH fi - # Used by boost/CGAL: - export GMP_ARCH_PATH=$gmpDir - export MPFR_ARCH_PATH=$mpfrDir - if [ "$FOAM_VERBOSE" -a "$PS1" ] then echo "Using ThirdParty compiler" echo " ${gccDir##*/} (${gmpDir##*/} $${mpfrDir##*/} ${mpcDir##*/})" fi fi - unset gcc_version gccDir - unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir if [ -n "$clang_version" ] then @@ -293,6 +289,9 @@ OpenFOAM | ThirdParty) echo " ${clangDir##*/}" fi fi + + unset gcc_version gccDir + unset gmp_version gmpDir mpfr_version mpfrDir mpc_version mpcDir unset clang_version clangDir ;; *) diff --git a/etc/config.sh/unset b/etc/config.sh/unset index 7a8ee309a9..b9a4d16e03 100644 --- a/etc/config.sh/unset +++ b/etc/config.sh/unset @@ -51,6 +51,7 @@ unset WM_ARCH_OPTION unset WM_CC unset WM_CFLAGS unset WM_COMPILER +unset WM_COMPILER_ARCH unset WM_COMPILER_LIB_ARCH unset WM_COMPILE_OPTION unset WM_CXX @@ -115,6 +116,16 @@ unset ParaView_DIR unset ParaView_INCLUDE_DIR unset PV_PLUGIN_PATH +#------------------------------------------------------------------------------ +# unset other ThirdParty environment variables + +unset BOOST_ARCH_PATH +unset CCMIO_ARCH_PATH +unset CGAL_ARCH_PATH +unset FFTW_ARCH_PATH +unset GMP_ARCH_PATH +unset MPFR_ARCH_PATH +unset SCOTCH_ARCH_PATH #------------------------------------------------------------------------------ # cleanup environment From 5c673119ada6f4f0f93a05a2fdde0a235da0cb0e Mon Sep 17 00:00:00 2001 From: mattijs Date: Wed, 29 Jun 2016 17:58:38 +0100 Subject: [PATCH 6/6] BUG: ensightFile: does not handle writeKeyword since no virtual for const word& Related to #132. --- src/conversion/ensight/file/ensightFile.C | 1 - src/conversion/ensight/file/ensightFile.H | 12 ++++++------ src/conversion/ensight/file/ensightGeoFile.C | 7 ++++++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/conversion/ensight/file/ensightFile.C b/src/conversion/ensight/file/ensightFile.C index 46809d4ebe..700b39c014 100644 --- a/src/conversion/ensight/file/ensightFile.C +++ b/src/conversion/ensight/file/ensightFile.C @@ -182,7 +182,6 @@ Foam::Ostream& Foam::ensightFile::write(const char* value) } return *this; - } diff --git a/src/conversion/ensight/file/ensightFile.H b/src/conversion/ensight/file/ensightFile.H index faf07bd265..03cbdcd703 100644 --- a/src/conversion/ensight/file/ensightFile.H +++ b/src/conversion/ensight/file/ensightFile.H @@ -144,7 +144,7 @@ public: using Ostream::write; //- Binary write - virtual Ostream& write(const char* buf, std::streamsize count); + virtual Ostream& write(const char*, std::streamsize count); //- Write element keyword with trailing newline, optionally with undef virtual Ostream& writeKeyword(const keyType&); @@ -156,19 +156,19 @@ public: Ostream& writeUndef(); //- Write C-string as "%79s" or as binary (max 80 chars) - Ostream& write(const char* value); + Ostream& write(const char*); //- Write string as "%79s" or as binary (max 80 chars) - Ostream& write(const string& value); + Ostream& write(const string&); //- Write integer as "%10d" or as binary - Ostream& write(const label value); + Ostream& write(const label); //- Write integer with specified width or as binary - Ostream& write(const label value, const label fieldWidth); + Ostream& write(const label, const label fieldWidth); //- Write float as "%12.5e" or as binary - Ostream& write(const scalar value); + Ostream& write(const scalar); //- Add carriage return to ascii stream void newline(); diff --git a/src/conversion/ensight/file/ensightGeoFile.C b/src/conversion/ensight/file/ensightGeoFile.C index 214a882a5e..9c0ceecdf9 100644 --- a/src/conversion/ensight/file/ensightGeoFile.C +++ b/src/conversion/ensight/file/ensightGeoFile.C @@ -25,6 +25,8 @@ License #include "ensightGeoFile.H" +#include "IOstreams.H" + // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // void Foam::ensightGeoFile::initialize() @@ -74,7 +76,10 @@ Foam::ensightGeoFile::~ensightGeoFile() Foam::Ostream& Foam::ensightGeoFile::writeKeyword(const keyType& key) { - write(key); newline(); + // Note: make sure to hit ensightFile::write(const string&) + write(string(key)); + + newline(); return *this; }