From 802b13cacfc158ce43da259a9bf6d430f864997f Mon Sep 17 00:00:00 2001 From: Vanja Skuric Date: Sat, 7 May 2016 08:04:39 +0200 Subject: [PATCH] Fixed tutorials for pimpleDyMFoam solver (backports) --- .../axialTurbine/system/fvSchemes | 9 +-- .../movingCone/constant/polyMesh/boundary | 6 +- .../pimpleDyMFoam/movingCone/system/fvSchemes | 9 +-- .../movingCone/system/fvSolution | 6 ++ .../movingCylinders/system/fvSchemes | 9 +-- .../movingCylinders/system/fvSolution | 4 +- .../pimpleDyMFoam/wingMotion/Allclean | 6 +- .../constant/polyMesh/boundary | 58 ------------------- .../system/fvSchemes | 8 +-- .../system/fvSolution | 1 + .../constant/polyMesh/boundary | 58 ------------------- .../wingMotion2D_simpleFoam/system/fvSchemes | 8 +-- .../constant/polyMesh/boundary | 52 ----------------- .../wingMotion_snappyHexMesh/system/fvSchemes | 8 +-- .../pimpleFoam/t-junction/system/fvSchemes | 8 +-- .../pimpleFoam/t-junction/system/fvSolution | 1 + 16 files changed, 24 insertions(+), 227 deletions(-) delete mode 100644 tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary delete mode 100644 tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary delete mode 100644 tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/boundary diff --git a/tutorials/incompressible/pimpleDyMFoam/axialTurbine/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/axialTurbine/system/fvSchemes index 22e3666b1..6867412e0 100644 --- a/tutorials/incompressible/pimpleDyMFoam/axialTurbine/system/fvSchemes +++ b/tutorials/incompressible/pimpleDyMFoam/axialTurbine/system/fvSchemes @@ -35,7 +35,7 @@ divSchemes div(phi,U) Gauss linearUpwind Gauss linear; div(phi,k) Gauss linearUpwind Gauss linear; div(phi,epsilon) Gauss linearUpwind Gauss linear; - div((nuEff*dev(grad(U).T()))) Gauss linear; + div((nuEff*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes @@ -67,11 +67,4 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - //pcorr ; - p ; -} - // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary index 205f33ee8..cb68f1b1d 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary +++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/constant/polyMesh/boundary @@ -1,9 +1,9 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.2 | +| \\ / O peration | Version: 4.0 | | \\ / A nd | Web: http://www.foam-extend.org | -| \\/ M anipulation | | +| \\/ M anipulation | For copyright notice see file Copyright | \*---------------------------------------------------------------------------*/ FoamFile { @@ -37,7 +37,7 @@ FoamFile } axis { - type symmetryPlane; + type empty; nFaces 0; startFace 3835; } diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes index b55d4e0a1..c592cf6dd 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes +++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes @@ -30,7 +30,7 @@ divSchemes { default none; div(phi,U) Gauss linear; - div((nuEff*dev(grad(U).T()))) Gauss linear; + div((nuEff*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes @@ -54,11 +54,4 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - pcorr ; - p ; -} - // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution index e610ff1b1..69fbb6265 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution +++ b/tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSolution @@ -65,4 +65,10 @@ PIMPLE nNonOrthogonalCorrectors 0; } +relaxationFactors +{ + U 1; + UFinal 1; +} + // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSchemes index 0ac0eb72a..885d0128b 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSchemes +++ b/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSchemes @@ -29,7 +29,7 @@ divSchemes { default none; div(phi,U) Gauss upwind; - div((nuEff*dev(grad(U).T()))) Gauss linear; + div((nuEff*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes @@ -56,11 +56,4 @@ snGradSchemes default limited 0.5; } -fluxRequired -{ - default no; - pcorr; - p; -} - // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSolution index f83fbea76..ec303e4fc 100644 --- a/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSolution +++ b/tutorials/incompressible/pimpleDyMFoam/movingCylinders/system/fvSolution @@ -79,8 +79,8 @@ SIMPLE relaxationFactors { - U 0.7; -// p 0.3; + U 0.7; + UFinal 1; } // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean index 72d1f489f..a15943cd4 100755 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/Allclean @@ -6,14 +6,16 @@ cd ${0%/*} || exit 1 # run from this directory cd wingMotion_snappyHexMesh cleanCase -\rm -f front.sMesh +\rm -f front.sMesh symFront.sMesh \rm -f constant/cellLevel constant/pointLevel constant/polyMesh/refinementHistory - +rm -f constant/polyMesh/boundary cd ../wingMotion2D_simpleFoam +rm -f constant/polyMesh/boundary cleanCase cd ../wingMotion2D_pimpleDyMFoam cleanCase +rm -f constant/polyMesh/boundary rm -rf 0 diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary deleted file mode 100644 index 62020026c..000000000 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/constant/polyMesh/boundary +++ /dev/null @@ -1,58 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.2 | -| \\ / A nd | Web: http://www.foam-extend.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class polyBoundaryMesh; - location "constant/polyMesh"; - object boundary; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -6 -( - topAndBottom - { - type patch; - nFaces 150; - startFace 76473; - } - inlet - { - type patch; - nFaces 48; - startFace 76623; - } - outlet - { - type patch; - nFaces 48; - startFace 76671; - } - wing - { - type wall; - nFaces 778; - startFace 76719; - } - back - { - type empty; - nFaces 38129; - startFace 77497; - } - front - { - type empty; - nFaces 38129; - startFace 115626; - } -) - -// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes index c5b8887e0..40ff0d6c9 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes @@ -32,7 +32,7 @@ divSchemes div(phi,U) Gauss linearUpwind Gauss linear; div(phi,k) Gauss limitedLinear 1; div(phi,omega) Gauss limitedLinear 1; - div((nuEff*dev(grad(U).T()))) Gauss linear; + div((nuEff*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes @@ -50,10 +50,4 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - p; -} - // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution index 43cb7e71f..850c180fb 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSolution @@ -76,6 +76,7 @@ relaxationFactors { p 0.3; U 0.7; + UFinal 1.0; k 0.7; omega 0.7; } diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary deleted file mode 100644 index 62020026c..000000000 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/constant/polyMesh/boundary +++ /dev/null @@ -1,58 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.2 | -| \\ / A nd | Web: http://www.foam-extend.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class polyBoundaryMesh; - location "constant/polyMesh"; - object boundary; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -6 -( - topAndBottom - { - type patch; - nFaces 150; - startFace 76473; - } - inlet - { - type patch; - nFaces 48; - startFace 76623; - } - outlet - { - type patch; - nFaces 48; - startFace 76671; - } - wing - { - type wall; - nFaces 778; - startFace 76719; - } - back - { - type empty; - nFaces 38129; - startFace 77497; - } - front - { - type empty; - nFaces 38129; - startFace 115626; - } -) - -// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes index b0123246f..49fcfeab6 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes @@ -32,7 +32,7 @@ divSchemes div(phi,U) Gauss linearUpwind Gauss linear; div(phi,k) Gauss upwind; div(phi,omega) Gauss upwind; - div((nuEff*dev(grad(U).T()))) Gauss linear; + div((nuEff*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes @@ -50,10 +50,4 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - p; -} - // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/boundary b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/boundary deleted file mode 100644 index c8f40206f..000000000 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/constant/polyMesh/boundary +++ /dev/null @@ -1,52 +0,0 @@ -/*--------------------------------*- C++ -*----------------------------------*\ -| ========= | | -| \\ / F ield | foam-extend: Open Source CFD | -| \\ / O peration | Version: 3.2 | -| \\ / A nd | Web: http://www.foam-extend.org | -| \\/ M anipulation | | -\*---------------------------------------------------------------------------*/ -FoamFile -{ - version 2.0; - format ascii; - class polyBoundaryMesh; - location "constant/polyMesh"; - object boundary; -} -// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // - -5 -( - topAndBottom - { - type patch; - nFaces 150; - startFace 7077; - } - inlet - { - type patch; - nFaces 48; - startFace 7227; - } - outlet - { - type patch; - nFaces 48; - startFace 7275; - } - symFront - { - type symmetryPlane; - nFaces 3600; - startFace 7323; - } - symBack - { - type symmetryPlane; - nFaces 3600; - startFace 10923; - } -) - -// ************************************************************************* // diff --git a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes index 229cc2cc2..7a4ca464f 100644 --- a/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes +++ b/tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes @@ -36,7 +36,7 @@ divSchemes div(phid,p) Gauss limitedLinear 1; div(phiU,p) Gauss limitedLinear 1; div(phi,e) Gauss limitedLinear 1; - div((muEff*dev2(grad(U).T()))) Gauss linear; + div((nuEff*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes @@ -60,10 +60,4 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - p; -} - // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes index ca497019e..c989e5b8f 100644 --- a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes +++ b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSchemes @@ -36,7 +36,7 @@ divSchemes div(phi,R) Gauss limitedLinear 1; div(R) Gauss linear; div(phi,nuTilda) Gauss limitedLinear 1; - div((nuEff*dev(grad(U).T()))) Gauss linear; + div((nuEff*dev2(T(grad(U))))) Gauss linear; } laplacianSchemes @@ -61,10 +61,4 @@ snGradSchemes default corrected; } -fluxRequired -{ - default no; - p ; -} - // ************************************************************************* // diff --git a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution index d717f42a0..099beaa03 100644 --- a/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution +++ b/tutorials/incompressible/pimpleFoam/t-junction/system/fvSolution @@ -86,6 +86,7 @@ PIMPLE relaxationFactors { U 1; + UFinal 1; k 1; epsilon 1; }