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