From 93effde8e98c041f66352502a976c2fa89e08481 Mon Sep 17 00:00:00 2001 From: Hrvoje Jasak Date: Wed, 13 Oct 2010 12:38:34 +0100 Subject: [PATCH] Tutorial update --- tutorials/basic/sixDOFSolver/Allclean | 14 -- tutorials/basic/sixDOFSolver/Allrun | 13 -- .../basic/sixDOFSolver/sixDOFmotion/Allclean | 7 + .../basic/sixDOFSolver/sixDOFmotion/Allrun | 7 + .../basic/sixDOFSolver/springDamper/Allclean | 7 + .../basic/sixDOFSolver/springDamper/Allrun | 7 + .../mixer2D/constant/polyMesh/boundary | 52 ------- .../icoDyMFoam/mixer2D/system/fvSolution | 60 +++----- .../icoDyMFoam/mixerGgi/Allclean | 2 +- .../icoDyMFoam/mixerGgi/system/controlDict | 2 +- .../icoDyMFoam/mixerGgi/system/fvSolution | 33 ++--- .../RBFMotionFunctionObject.C | 17 ++- .../RBFMotionFunctionObject.H | 17 +-- .../movingBlockRBF/constant/polyMesh/boundary | 8 +- .../movingBlockRBF/system/controlDict | 8 +- .../movingBlockRBF/system/fvSolution | 27 ++-- .../movingCone/constant/polyMesh/boundary | 7 +- .../icoDyMFoam/movingCone/system/fvSolution | 12 +- .../movingCone/system/tetFemSolution | 22 --- .../icoDyMFoam/movingConeMotion/Allclean | 8 ++ .../icoDyMFoam/movingConeMotion/Allrun | 11 ++ .../constant/polyMesh/boundary | 128 ++++++++---------- .../movingConeMotion/system/fvSolution | 54 ++------ .../movingConeMotion/system/tetFemSolution | 3 +- .../movingConeTopo/constant/polyMesh/boundary | 6 +- .../movingConeTopo/system/fvSolution | 32 ++--- .../icoFoam/cavity/constant/polyMesh/boundary | 7 +- .../cavityClipped/constant/polyMesh/boundary | 7 +- .../cavityGrade/constant/polyMesh/boundary | 7 +- .../icoFoam/elbow/constant/polyMesh/boundary | 7 +- .../viscoelasticFluidFoam/Allclean | 56 -------- .../viscoelastic/viscoelasticFluidFoam/Allrun | 55 -------- .../viscoelasticFluidFoam/DCPP/Allclean | 6 +- .../viscoelasticFluidFoam/FENE-CR/Allclean | 3 +- .../viscoelasticFluidFoam/FENE-P/Allclean | 5 +- .../viscoelasticFluidFoam/Feta-PTT/Allclean | 3 +- .../viscoelasticFluidFoam/Giesekus/Allclean | 5 +- .../viscoelasticFluidFoam/Leonov/Allclean | 4 +- .../viscoelasticFluidFoam/Oldroyd-B/Allclean | 5 +- .../PTT-Exponential/Allclean | 3 +- .../viscoelasticFluidFoam/PTT-Linear/Allclean | 5 +- .../viscoelasticFluidFoam/S-MDCPP/Allclean | 3 +- .../viscoelasticFluidFoam/XPP_DE/Allclean | 3 +- .../viscoelasticFluidFoam/XPP_SE/Allclean | 1 - 44 files changed, 247 insertions(+), 502 deletions(-) delete mode 100755 tutorials/basic/sixDOFSolver/Allclean delete mode 100755 tutorials/basic/sixDOFSolver/Allrun create mode 100755 tutorials/basic/sixDOFSolver/sixDOFmotion/Allclean create mode 100755 tutorials/basic/sixDOFSolver/sixDOFmotion/Allrun create mode 100755 tutorials/basic/sixDOFSolver/springDamper/Allclean create mode 100755 tutorials/basic/sixDOFSolver/springDamper/Allrun delete mode 100644 tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/boundary delete mode 100644 tutorials/incompressible/icoDyMFoam/movingCone/system/tetFemSolution create mode 100755 tutorials/incompressible/icoDyMFoam/movingConeMotion/Allclean create mode 100755 tutorials/incompressible/icoDyMFoam/movingConeMotion/Allrun delete mode 100755 tutorials/viscoelastic/viscoelasticFluidFoam/Allclean delete mode 100755 tutorials/viscoelastic/viscoelasticFluidFoam/Allrun diff --git a/tutorials/basic/sixDOFSolver/Allclean b/tutorials/basic/sixDOFSolver/Allclean deleted file mode 100755 index a4dd41e90..000000000 --- a/tutorials/basic/sixDOFSolver/Allclean +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh - -currDir=`pwd` -application=`basename $currDir` -cases="springDamper sixDOFmotion" - -tutorialPath=`dirname $0`/.. -. $WM_PROJECT_DIR/bin/tools/CleanFunctions - -for case in $cases -do - cleanCase $case - rm $case/*.dat -done diff --git a/tutorials/basic/sixDOFSolver/Allrun b/tutorials/basic/sixDOFSolver/Allrun deleted file mode 100755 index d028eaf4a..000000000 --- a/tutorials/basic/sixDOFSolver/Allrun +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -currDir=`pwd` -application=`basename $currDir` -cases="springDamper sixDOFmotion" - -tutorialPath=`dirname $0`/.. -. $WM_PROJECT_DIR/bin/tools/RunFunctions - -for case in $cases -do - (cd $case; runApplication $application) -done diff --git a/tutorials/basic/sixDOFSolver/sixDOFmotion/Allclean b/tutorials/basic/sixDOFSolver/sixDOFmotion/Allclean new file mode 100755 index 000000000..baa1c8da8 --- /dev/null +++ b/tutorials/basic/sixDOFSolver/sixDOFmotion/Allclean @@ -0,0 +1,7 @@ +#!/bin/sh + +# Source tutorial clean functions +. $WM_PROJECT_DIR/bin/tools/CleanFunctions + +cleanCase +rm -f *.dat diff --git a/tutorials/basic/sixDOFSolver/sixDOFmotion/Allrun b/tutorials/basic/sixDOFSolver/sixDOFmotion/Allrun new file mode 100755 index 000000000..4332c2541 --- /dev/null +++ b/tutorials/basic/sixDOFSolver/sixDOFmotion/Allrun @@ -0,0 +1,7 @@ +#!/bin/sh +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +application="sixDOFSolver" + +runApplication $application diff --git a/tutorials/basic/sixDOFSolver/springDamper/Allclean b/tutorials/basic/sixDOFSolver/springDamper/Allclean new file mode 100755 index 000000000..baa1c8da8 --- /dev/null +++ b/tutorials/basic/sixDOFSolver/springDamper/Allclean @@ -0,0 +1,7 @@ +#!/bin/sh + +# Source tutorial clean functions +. $WM_PROJECT_DIR/bin/tools/CleanFunctions + +cleanCase +rm -f *.dat diff --git a/tutorials/basic/sixDOFSolver/springDamper/Allrun b/tutorials/basic/sixDOFSolver/springDamper/Allrun new file mode 100755 index 000000000..4332c2541 --- /dev/null +++ b/tutorials/basic/sixDOFSolver/springDamper/Allrun @@ -0,0 +1,7 @@ +#!/bin/sh +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +application="sixDOFSolver" + +runApplication $application diff --git a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/boundary b/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/boundary deleted file mode 100644 index d229dca29..000000000 --- a/tutorials/incompressible/icoDyMFoam/mixer2D/constant/polyMesh/boundary +++ /dev/null @@ -1,52 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5-dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class polyBoundaryMesh; - location "constant/polyMesh"; - object boundary; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -5 -( - impellerWall - { - type wall; - nFaces 68; - startFace 1040; - } - baffleWall - { - type wall; - nFaces 84; - startFace 1108; - } - insideSlider - { - type patch; - nFaces 36; - startFace 1192; - } - outsideSlider - { - type patch; - nFaces 36; - startFace 1228; - } - defaultFaces - { - type empty; - nFaces 1152; - startFace 1264; - } -) - -// ************************************************************************* // diff --git a/tutorials/incompressible/icoDyMFoam/mixer2D/system/fvSolution b/tutorials/incompressible/icoDyMFoam/mixer2D/system/fvSolution index 6e99f2828..bba0e468b 100644 --- a/tutorials/incompressible/icoDyMFoam/mixer2D/system/fvSolution +++ b/tutorials/incompressible/icoDyMFoam/mixer2D/system/fvSolution @@ -10,12 +10,6 @@ FoamFile { version 2.0; format ascii; - - root ""; - case ""; - instance ""; - local ""; - class dictionary; object fvSolution; } @@ -24,12 +18,10 @@ FoamFile solvers { - pcorr PCG + pcorr { - preconditioner - { - type DIC; - } + solver BiCGStab; + preconditioner DILU; minIter 0; maxIter 1000; @@ -37,59 +29,41 @@ solvers relTol 0; }; - p PCG + p { - preconditioner - { - type DIC; - } + solver CG; + preconditioner Cholesky; minIter 0; maxIter 1000; - tolerance 1e-06; - relTol 0.05; + tolerance 1e-07; + relTol 0.0; }; - pFinal PCG + pFinal { - preconditioner - { - type DIC; - } + solver CG; + preconditioner Cholesky; minIter 0; maxIter 1000; - tolerance 1e-06; + tolerance 1e-07; relTol 0; }; - U PBiCG + U { - preconditioner - { - type DILU; - } + solver BiCGStab; + preconditioner DILU; minIter 0; maxIter 1000; - tolerance 1e-05; - relTol 0; - }; - - cellMotionUx PCG - { - preconditioner - { - type DIC; - } - - minIter 0; - maxIter 1000; - tolerance 1e-08; + tolerance 1e-07; relTol 0; }; } + PISO { nCorrectors 4; diff --git a/tutorials/incompressible/icoDyMFoam/mixerGgi/Allclean b/tutorials/incompressible/icoDyMFoam/mixerGgi/Allclean index b8e76f777..1892bfc36 100755 --- a/tutorials/incompressible/icoDyMFoam/mixerGgi/Allclean +++ b/tutorials/incompressible/icoDyMFoam/mixerGgi/Allclean @@ -5,5 +5,5 @@ cleanCase rm -rf VTK -rm constant/polyMesh/boundary +rm -f constant/polyMesh/boundary rm -rf constant/polyMesh/sets \ No newline at end of file diff --git a/tutorials/incompressible/icoDyMFoam/mixerGgi/system/controlDict b/tutorials/incompressible/icoDyMFoam/mixerGgi/system/controlDict index eeeea40ff..e4bd520e2 100644 --- a/tutorials/incompressible/icoDyMFoam/mixerGgi/system/controlDict +++ b/tutorials/incompressible/icoDyMFoam/mixerGgi/system/controlDict @@ -62,7 +62,7 @@ functions phi phi; // Where to load it from (if not already in solver) - functionObjectLibs ("libsampling.so"); + functionObjectLibs ("libcheckFunctionObjects.so"); } ); diff --git a/tutorials/incompressible/icoDyMFoam/mixerGgi/system/fvSolution b/tutorials/incompressible/icoDyMFoam/mixerGgi/system/fvSolution index afa0988fb..8ec6bae19 100644 --- a/tutorials/incompressible/icoDyMFoam/mixerGgi/system/fvSolution +++ b/tutorials/incompressible/icoDyMFoam/mixerGgi/system/fvSolution @@ -18,12 +18,10 @@ FoamFile solvers { - pcorr BiCGStab + pcorr { - preconditioner - { - type DILU; - } + solver BiCGStab; + preconditioner DILU; minIter 0; maxIter 1000; @@ -31,12 +29,10 @@ solvers relTol 0; }; - p BiCGStab + p { - preconditioner - { - type DILU; - } + solver CG; + preconditioner Cholesky; minIter 0; maxIter 1000; @@ -44,12 +40,10 @@ solvers relTol 0.0; }; - pFinal BiCGStab + pFinal { - preconditioner - { - type DILU; - } + solver CG; + preconditioner Cholesky; minIter 0; maxIter 1000; @@ -57,12 +51,10 @@ solvers relTol 0; }; - U BiCGStab + U { - preconditioner - { - type DILU; - } + solver BiCGStab; + preconditioner DILU; minIter 0; maxIter 1000; @@ -71,6 +63,7 @@ solvers }; } + PISO { nCorrectors 4; diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/RBFMotionFunctionObject.C b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/RBFMotionFunctionObject.C index e32b02c78..322546055 100644 --- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/RBFMotionFunctionObject.C +++ b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/RBFMotionFunctionObject.C @@ -25,7 +25,7 @@ License Author Frank Bos, TU Delft. All rights reserved. -\*----------------------------------------------------------------------------*/ +\*---------------------------------------------------------------------------*/ #include "RBFMotionFunctionObject.H" #include "addToRunTimeSelectionTable.H" @@ -56,15 +56,14 @@ Foam::RBFMotionFunctionObject::RBFMotionFunctionObject const dictionary& dict ) : - functionObject(), - name_(name), + functionObject(name), time_(t), regionName_(polyMesh::defaultRegion), - rotationAmplitude_(readScalar(dict.lookup("rotationAmplitude"))), - rotationFrequency_(readScalar(dict.lookup("rotationFrequency"))), - translationAmplitude_(dict.lookup("translationAmplitude")), - translationFrequency_(dict.lookup("translationFrequency")), - initialRotationOrigin_(dict.lookup("initialRotationOrigin")), + rotationAmplitude_(readScalar(dict.lookup("rotationAmplitude"))), + rotationFrequency_(readScalar(dict.lookup("rotationFrequency"))), + translationAmplitude_(dict.lookup("translationAmplitude")), + translationFrequency_(dict.lookup("translationFrequency")), + initialRotationOrigin_(dict.lookup("initialRotationOrigin")), statPoints_() { @@ -86,7 +85,7 @@ bool Foam::RBFMotionFunctionObject::start() mesh.lookupObject("dynamicMeshDict") ); - statPoints_ = ms.movingPoints(); + statPoints_ = ms.movingPoints(); return true; } diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/RBFMotionFunctionObject.H b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/RBFMotionFunctionObject.H index 2e5446064..8b430483e 100644 --- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/RBFMotionFunctionObject.H +++ b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/RBFMotionFunction/RBFMotionFunctionObject.H @@ -58,20 +58,17 @@ class RBFMotionFunctionObject { // Private data - //- Name - const word name_; - //- Reference to main object registry const Time& time_; //- Region name word regionName_; - scalar rotationAmplitude_; - scalar rotationFrequency_; - vector translationAmplitude_; - vector translationFrequency_; - vector initialRotationOrigin_; + scalar rotationAmplitude_; + scalar rotationFrequency_; + vector translationAmplitude_; + vector translationFrequency_; + vector initialRotationOrigin_; //- Stationary points pointField statPoints_; @@ -113,8 +110,8 @@ public: //- Read and set the function object if its data has changed virtual bool read(const dictionary& dict); - - //- Update for changes of mesh + + //- Update for changes of mesh virtual void movePoints(const pointField&) {} }; diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/constant/polyMesh/boundary b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/constant/polyMesh/boundary index 42d43b7c0..7dc5fb95e 100644 --- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/constant/polyMesh/boundary +++ b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/constant/polyMesh/boundary @@ -1,9 +1,9 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5-dev | -| \\ / A nd | Revision: 1708 | -| \\/ M anipulation | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | +| \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile { diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/system/controlDict b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/system/controlDict index f37de14b1..d0a171bbe 100644 --- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/system/controlDict +++ b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/system/controlDict @@ -58,10 +58,10 @@ maxDeltaT 0.25; functions ( - RBFMotion - { - type RBFMotion; - functionObjectLibs ("libRBFMotionFunction.so"); + RBFMotion + { + type RBFMotion; + functionObjectLibs ("libRBFMotionFunction.so"); rotationAmplitude 0.9; rotationFrequency 0.25; translationAmplitude (0.0 3.0 0.0); diff --git a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/system/fvSolution b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/system/fvSolution index 2966c2c86..a101d4f5e 100644 --- a/tutorials/incompressible/icoDyMFoam/movingBlockRBF/system/fvSolution +++ b/tutorials/incompressible/icoDyMFoam/movingBlockRBF/system/fvSolution @@ -18,32 +18,29 @@ FoamFile solvers { - p CG + p { - preconditioner - { - type DIC; - } + solver CG; + preconditioner DIC; + tolerance 1e-06; relTol 0; }; - pFinal CG + pFinal { - preconditioner - { - type DIC; - } + solver CG; + preconditioner DIC; + tolerance 1e-06; relTol 0; }; - U BiCGStab + U { - preconditioner - { - type DILU; - } + solver BiCGStab; + preconditioner DILU; + tolerance 1e-7; relTol 0; }; diff --git a/tutorials/incompressible/icoDyMFoam/movingCone/constant/polyMesh/boundary b/tutorials/incompressible/icoDyMFoam/movingCone/constant/polyMesh/boundary index f27224369..2d0390ca2 100644 --- a/tutorials/incompressible/icoDyMFoam/movingCone/constant/polyMesh/boundary +++ b/tutorials/incompressible/icoDyMFoam/movingCone/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format binary; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/icoDyMFoam/movingCone/system/fvSolution b/tutorials/incompressible/icoDyMFoam/movingCone/system/fvSolution index a348c8239..c6a864c8b 100644 --- a/tutorials/incompressible/icoDyMFoam/movingCone/system/fvSolution +++ b/tutorials/incompressible/icoDyMFoam/movingCone/system/fvSolution @@ -16,29 +16,33 @@ FoamFile solvers { - pcorr PCG + pcorr { + solver PCG; preconditioner DIC; tolerance 1e-02; relTol 0; }; - p PCG + p { + solver PCG; preconditioner DIC; tolerance 1e-06; relTol 0.05; }; - pFinal PCG + pFinal { + solver PCG; preconditioner DIC; tolerance 1e-06; relTol 0; }; - U PBiCG + U { + solver PBiCG; preconditioner DILU; tolerance 1e-05; relTol 0; diff --git a/tutorials/incompressible/icoDyMFoam/movingCone/system/tetFemSolution b/tutorials/incompressible/icoDyMFoam/movingCone/system/tetFemSolution deleted file mode 100644 index 7d2e64868..000000000 --- a/tutorials/incompressible/icoDyMFoam/movingCone/system/tetFemSolution +++ /dev/null @@ -1,22 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class dictionary; - object tetFemSolution; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -solvers -{ - motionU ICCG 1e-06 0; -} - -// ************************************************************************* // diff --git a/tutorials/incompressible/icoDyMFoam/movingConeMotion/Allclean b/tutorials/incompressible/icoDyMFoam/movingConeMotion/Allclean new file mode 100755 index 000000000..e81dc6208 --- /dev/null +++ b/tutorials/incompressible/icoDyMFoam/movingConeMotion/Allclean @@ -0,0 +1,8 @@ +#!/bin/sh + +# Source tutorial clean functions +. $WM_PROJECT_DIR/bin/tools/CleanFunctions + +cleanCase +rm -f 0/motionGamma +( cd setMotionMovingCone ; wclean ) \ No newline at end of file diff --git a/tutorials/incompressible/icoDyMFoam/movingConeMotion/Allrun b/tutorials/incompressible/icoDyMFoam/movingConeMotion/Allrun new file mode 100755 index 000000000..f1ff0ee65 --- /dev/null +++ b/tutorials/incompressible/icoDyMFoam/movingConeMotion/Allrun @@ -0,0 +1,11 @@ +#!/bin/sh +# Source tutorial run functions +. $WM_PROJECT_DIR/bin/tools/RunFunctions + +# Get application name from directory +application="icoDyMFoam" + +compileApplication setMotionMovingCone +runApplication setMotionMovingCone +runApplication blockMesh +runApplication $application diff --git a/tutorials/incompressible/icoDyMFoam/movingConeMotion/constant/polyMesh/boundary b/tutorials/incompressible/icoDyMFoam/movingConeMotion/constant/polyMesh/boundary index 7f6658410..635f47626 100644 --- a/tutorials/incompressible/icoDyMFoam/movingConeMotion/constant/polyMesh/boundary +++ b/tutorials/incompressible/icoDyMFoam/movingConeMotion/constant/polyMesh/boundary @@ -1,84 +1,70 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.4.1 | -| \\ / A nd | Web: http://www.openfoam.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ - FoamFile { - version 2.0; - format ascii; - - root "/home/hjasak/OpenFOAM/OpenFOAM-1.4.1/tutorials/icoDyMFoam"; - case "movingConeMotion"; - instance "constant"; - local "polyMesh"; - - class polyBoundaryMesh; - object boundary; + version 2.0; + format ascii; + class polyBoundaryMesh; + location "constant/polyMesh"; + object boundary; } - // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // 8 ( -movingWall -{ - type wall; - nFaces 85; - startFace 3665; -} - -farFieldMoving -{ - type patch; - nFaces 50; - startFace 3750; -} - -fixedWall -{ - type wall; - nFaces 35; - startFace 3800; -} - -axis -{ - type empty; - nFaces 0; - startFace 3835; -} - -left -{ - type patch; - nFaces 30; - startFace 3835; -} - -farField -{ - type patch; - nFaces 35; - startFace 3865; -} - -back -{ - type wedge; - nFaces 1900; - startFace 3900; -} - -front -{ - type wedge; - nFaces 1900; - startFace 5800; -} + movingWall + { + type wall; + nFaces 85; + startFace 3665; + } + farFieldMoving + { + type patch; + nFaces 50; + startFace 3750; + } + fixedWall + { + type wall; + nFaces 35; + startFace 3800; + } + axis + { + type empty; + nFaces 0; + startFace 3835; + } + left + { + type patch; + nFaces 30; + startFace 3835; + } + farField + { + type patch; + nFaces 35; + startFace 3865; + } + back + { + type wedge; + nFaces 1900; + startFace 3900; + } + front + { + type wedge; + nFaces 1900; + startFace 5800; + } ) // ************************************************************************* // diff --git a/tutorials/incompressible/icoDyMFoam/movingConeMotion/system/fvSolution b/tutorials/incompressible/icoDyMFoam/movingConeMotion/system/fvSolution index 9ebe48d0d..88351fb1b 100644 --- a/tutorials/incompressible/icoDyMFoam/movingConeMotion/system/fvSolution +++ b/tutorials/incompressible/icoDyMFoam/movingConeMotion/system/fvSolution @@ -1,4 +1,4 @@ -/*---------------------------------------------------------------------------*\ +/*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | | \\ / O peration | Version: 1.4 | @@ -10,12 +10,6 @@ FoamFile { version 2.0; format ascii; - - root ""; - case ""; - instance ""; - local ""; - class dictionary; object fvSolution; } @@ -24,12 +18,10 @@ FoamFile solvers { - pcorr PCG + pcorr { - preconditioner - { - type DIC; - } + solver PCG; + preconditioner DIC; minIter 0; maxIter 1000; @@ -37,12 +29,10 @@ solvers relTol 0; }; - p PCG + p { - preconditioner - { - type DIC; - } + solver PCG; + preconditioner DIC; minIter 0; maxIter 1000; @@ -50,12 +40,10 @@ solvers relTol 0.05; }; - pFinal PCG + pFinal { - preconditioner - { - type DIC; - } + solver PCG; + preconditioner DIC; minIter 0; maxIter 1000; @@ -63,33 +51,19 @@ solvers relTol 0; }; - U PBiCG + U { - preconditioner - { - type DILU; - } + solver PBiCG; + preconditioner DILU; minIter 0; maxIter 1000; tolerance 1e-05; relTol 0; }; - - cellMotionUx PCG - { - preconditioner - { - type DIC; - } - - minIter 0; - maxIter 1000; - tolerance 1e-08; - relTol 0; - }; } + PISO { nCorrectors 2; diff --git a/tutorials/incompressible/icoDyMFoam/movingConeMotion/system/tetFemSolution b/tutorials/incompressible/icoDyMFoam/movingConeMotion/system/tetFemSolution index e3826c1ef..0c354c04e 100644 --- a/tutorials/incompressible/icoDyMFoam/movingConeMotion/system/tetFemSolution +++ b/tutorials/incompressible/icoDyMFoam/movingConeMotion/system/tetFemSolution @@ -18,8 +18,9 @@ FoamFile solvers { - motionU amgSolver + motionU { + solver amgSolver; cycle W-cycle; policy AAMG; nPreSweeps 0; diff --git a/tutorials/incompressible/icoDyMFoam/movingConeTopo/constant/polyMesh/boundary b/tutorials/incompressible/icoDyMFoam/movingConeTopo/constant/polyMesh/boundary index 43b7d9ef5..0afd3439c 100644 --- a/tutorials/incompressible/icoDyMFoam/movingConeTopo/constant/polyMesh/boundary +++ b/tutorials/incompressible/icoDyMFoam/movingConeTopo/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5-dev | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile diff --git a/tutorials/incompressible/icoDyMFoam/movingConeTopo/system/fvSolution b/tutorials/incompressible/icoDyMFoam/movingConeTopo/system/fvSolution index 07a7b90fc..1c5f4e3aa 100644 --- a/tutorials/incompressible/icoDyMFoam/movingConeTopo/system/fvSolution +++ b/tutorials/incompressible/icoDyMFoam/movingConeTopo/system/fvSolution @@ -18,12 +18,10 @@ FoamFile solvers { - pcorr PCG + pcorr { - preconditioner - { - type DIC; - } + solver PCG; + preconditioner DIC; minIter 0; maxIter 1000; @@ -31,12 +29,10 @@ solvers relTol 0; }; - p PCG + p { - preconditioner - { - type DIC; - } + solver PCG; + preconditioner DIC; minIter 0; maxIter 1000; @@ -44,12 +40,10 @@ solvers relTol 0.0; }; - pFinal PCG + pFinal { - preconditioner - { - type DIC; - } + solver PCG; + preconditioner DIC; minIter 0; maxIter 1000; @@ -57,12 +51,10 @@ solvers relTol 0; }; - U PBiCG + U { - preconditioner - { - type DILU; - } + solver PBiCG; + preconditioner DILU; minIter 0; maxIter 1000; diff --git a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary index cc15fe93f..e5f158a50 100644 --- a/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary +++ b/tutorials/incompressible/icoFoam/cavity/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary index 63b839343..160211c9a 100644 --- a/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary +++ b/tutorials/incompressible/icoFoam/cavityClipped/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary index cc15fe93f..e5f158a50 100644 --- a/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary +++ b/tutorials/incompressible/icoFoam/cavityGrade/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary b/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary index 0b3c20490..2f02a227f 100644 --- a/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary +++ b/tutorials/incompressible/icoFoam/elbow/constant/polyMesh/boundary @@ -1,8 +1,8 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | -| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 1.5 | -| \\ / A nd | Web: http://www.OpenFOAM.org | +| \\ / F ield | OpenFOAM Extend Project: Open source CFD | +| \\ / O peration | Version: 1.6-ext | +| \\ / A nd | Web: www.extend-project.de | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ FoamFile @@ -10,6 +10,7 @@ FoamFile version 2.0; format ascii; class polyBoundaryMesh; + location "constant/polyMesh"; object boundary; } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/Allclean b/tutorials/viscoelastic/viscoelasticFluidFoam/Allclean deleted file mode 100755 index 66fe1458f..000000000 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/Allclean +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -cd PTT-Exponential - ./Allclean - -cd .. -cd DCPP - ./Allclean - -cd .. -cd Giesekus - ./Allclean - - -cd .. -cd FENE-CR - ./Allclean - -cd .. -cd FENE-P - ./Allclean - -cd .. -cd Feta-PTT - ./Allclean - -cd .. -cd Leonov - ./Allclean - -cd .. -cd Oldroyd-B - ./Allclean - -cd .. -cd S-MDCPP - ./Allclean - -cd .. -cd PTT-Linear - ./Allclean - -cd .. -cd WhiteMetzner/CarreauYasuda - ./Allclean - -cd ../.. -cd XPP_DE - ./Allclean - -cd .. -cd XPP_SE - ./Allclean - -cd .. - diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/Allrun b/tutorials/viscoelastic/viscoelasticFluidFoam/Allrun deleted file mode 100755 index ac2754b9b..000000000 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/Allrun +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh - -cd PTT-Exponential - ./Allrun - -cd .. -cd DCPP - ./Allrun - -cd .. -cd Giesekus - ./Allrun - - -cd .. -cd FENE-CR - ./Allrun - -cd .. -cd FENE-P - ./Allrun - -cd .. -cd Feta-PTT - ./Allrun - -cd .. -cd Leonov - ./Allrun - -cd .. -cd Oldroyd-B - ./Allrun - -cd .. -cd S-MDCPP - ./Allrun - -cd .. -cd PTT-Linear - ./Allrun - -cd .. -cd White-Metzner/Carreau-Yasuda - ./Allrun - -cd ../.. -cd XPP_DE - ./Allrun - -cd .. -cd XPP_SE - ./Allrun - -cd .. diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/DCPP/Allclean b/tutorials/viscoelastic/viscoelasticFluidFoam/DCPP/Allclean index 20a51e184..917056ad6 100755 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/DCPP/Allclean +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/DCPP/Allclean @@ -3,7 +3,5 @@ # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions - cleanCase - rm -R -f sets - echo "done!" - +cleanCase +rm -rf sets diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-CR/Allclean b/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-CR/Allclean index 0d957e05d..e80d74cac 100755 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-CR/Allclean +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-CR/Allclean @@ -3,6 +3,5 @@ # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions - cleanCase - echo "done!" +cleanCase diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/Allclean b/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/Allclean index 20a51e184..83a0d7beb 100755 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/Allclean +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/FENE-P/Allclean @@ -3,7 +3,6 @@ # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions - cleanCase - rm -R -f sets - echo "done!" +cleanCase +rm -rf sets diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/Feta-PTT/Allclean b/tutorials/viscoelastic/viscoelasticFluidFoam/Feta-PTT/Allclean index 0d957e05d..e80d74cac 100755 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/Feta-PTT/Allclean +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/Feta-PTT/Allclean @@ -3,6 +3,5 @@ # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions - cleanCase - echo "done!" +cleanCase diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/Giesekus/Allclean b/tutorials/viscoelastic/viscoelasticFluidFoam/Giesekus/Allclean index 20a51e184..83a0d7beb 100755 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/Giesekus/Allclean +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/Giesekus/Allclean @@ -3,7 +3,6 @@ # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions - cleanCase - rm -R -f sets - echo "done!" +cleanCase +rm -rf sets diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/Allclean b/tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/Allclean index 0d957e05d..7d7f43b1c 100755 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/Allclean +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/Leonov/Allclean @@ -3,6 +3,6 @@ # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions - cleanCase - echo "done!" +cleanCase +echo "done!" diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/Allclean b/tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/Allclean index 20a51e184..304161076 100755 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/Allclean +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/Oldroyd-B/Allclean @@ -3,7 +3,6 @@ # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions - cleanCase - rm -R -f sets - echo "done!" +cleanCase +rm -R -f sets diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Exponential/Allclean b/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Exponential/Allclean index 0d957e05d..e80d74cac 100755 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Exponential/Allclean +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Exponential/Allclean @@ -3,6 +3,5 @@ # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions - cleanCase - echo "done!" +cleanCase diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Linear/Allclean b/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Linear/Allclean index 20a51e184..46ce878eb 100755 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Linear/Allclean +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/PTT-Linear/Allclean @@ -3,7 +3,6 @@ # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions - cleanCase - rm -R -f sets - echo "done!" +cleanCase +rm -Rf sets diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/S-MDCPP/Allclean b/tutorials/viscoelastic/viscoelasticFluidFoam/S-MDCPP/Allclean index 0d957e05d..e80d74cac 100755 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/S-MDCPP/Allclean +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/S-MDCPP/Allclean @@ -3,6 +3,5 @@ # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions - cleanCase - echo "done!" +cleanCase diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/Allclean b/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/Allclean index 0d957e05d..e80d74cac 100755 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/Allclean +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_DE/Allclean @@ -3,6 +3,5 @@ # Source tutorial clean functions . $WM_PROJECT_DIR/bin/tools/CleanFunctions - cleanCase - echo "done!" +cleanCase diff --git a/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_SE/Allclean b/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_SE/Allclean index 0d957e05d..a690e883f 100755 --- a/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_SE/Allclean +++ b/tutorials/viscoelastic/viscoelasticFluidFoam/XPP_SE/Allclean @@ -4,5 +4,4 @@ . $WM_PROJECT_DIR/bin/tools/CleanFunctions cleanCase - echo "done!"