From a729ebe8df1848ef5b64abc032ec91b649f4ed69 Mon Sep 17 00:00:00 2001 From: Henry Date: Wed, 26 Feb 2014 13:02:59 +0000 Subject: [PATCH] cavitatingFoam: rationalised phi -> rhoPhi, phiv -> phi for consistency with the other multiphase solvers. Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1192 --- .../multiphase/cavitatingFoam/CourantNo.H | 6 +++--- .../solvers/multiphase/cavitatingFoam/UEqn.H | 2 +- .../cavitatingDyMFoam/cavitatingDyMFoam.C | 8 +++---- .../cavitatingDyMFoam/correctPhi.H | 8 +++---- .../cavitatingFoam/cavitatingDyMFoam/pEqn.H | 12 +++++------ .../cavitatingFoam/cavitatingFoam.C | 4 ++-- .../multiphase/cavitatingFoam/createFields.H | 21 +++++++++++++++---- .../solvers/multiphase/cavitatingFoam/pEqn.H | 10 ++++----- .../multiphase/cavitatingFoam/rhoEqn.H | 4 ++-- .../cavitatingFoam/les/throttle/0/U | 2 +- .../les/throttle/0/alpha.vapour | 2 +- .../cavitatingFoam/les/throttle/0/k | 2 +- .../cavitatingFoam/les/throttle/0/nuSgs | 2 +- .../cavitatingFoam/les/throttle/0/p | 3 +-- .../cavitatingFoam/les/throttle/0/rho | 2 +- .../les/throttle/constant/LESProperties | 2 +- .../throttle/constant/polyMesh/blockMeshDict | 2 +- .../throttle/constant/thermodynamicProperties | 2 +- .../les/throttle/constant/transportProperties | 2 +- .../throttle/constant/turbulenceProperties | 2 +- .../les/throttle/system/controlDict | 2 +- .../les/throttle/system/fvSchemes | 8 +++---- .../les/throttle/system/fvSolution | 10 ++++++++- .../les/throttle/system/refineMeshDict | 2 +- .../les/throttle/system/topoSetDict.1 | 2 +- .../les/throttle/system/topoSetDict.2 | 2 +- .../les/throttle/system/topoSetDict.3 | 2 +- .../cavitatingFoam/les/throttle3D/0.org/U | 2 +- .../les/throttle3D/0.org/alpha.vapour | 2 +- .../cavitatingFoam/les/throttle3D/0.org/k | 2 +- .../cavitatingFoam/les/throttle3D/0.org/nuSgs | 2 +- .../cavitatingFoam/les/throttle3D/0.org/p | 3 +-- .../cavitatingFoam/les/throttle3D/0.org/rho | 2 +- .../les/throttle3D/constant/LESProperties | 2 +- .../constant/polyMesh/blockMeshDict | 2 +- .../constant/thermodynamicProperties | 2 +- .../throttle3D/constant/transportProperties | 2 +- .../throttle3D/constant/turbulenceProperties | 2 +- .../les/throttle3D/system/controlDict | 2 +- .../les/throttle3D/system/decomposeParDict | 2 +- .../les/throttle3D/system/fvSchemes | 8 +++---- .../les/throttle3D/system/fvSolution | 10 ++++++++- .../les/throttle3D/system/mapFieldsDict | 2 +- .../les/throttle3D/system/refineMeshDict | 2 +- .../les/throttle3D/system/topoSetDict.1 | 2 +- .../les/throttle3D/system/topoSetDict.2 | 2 +- .../les/throttle3D/system/topoSetDict.3 | 2 +- .../cavitatingFoam/ras/throttle/0/U | 2 +- .../ras/throttle/0/alpha.vapour | 2 +- .../cavitatingFoam/ras/throttle/0/k | 2 +- .../cavitatingFoam/ras/throttle/0/nut | 2 +- .../cavitatingFoam/ras/throttle/0/omega | 2 +- .../cavitatingFoam/ras/throttle/0/p | 3 +-- .../cavitatingFoam/ras/throttle/0/rho | 2 +- .../ras/throttle/constant/RASProperties | 2 +- .../throttle/constant/polyMesh/blockMeshDict | 2 +- .../throttle/constant/thermodynamicProperties | 2 +- .../ras/throttle/constant/transportProperties | 2 +- .../throttle/constant/turbulenceProperties | 2 +- .../ras/throttle/system/controlDict | 2 +- .../ras/throttle/system/fvSchemes | 10 ++++----- .../ras/throttle/system/fvSolution | 11 ++++++++-- .../ras/throttle/system/refineMeshDict | 2 +- .../ras/throttle/system/topoSetDict.1 | 2 +- .../ras/throttle/system/topoSetDict.2 | 2 +- .../ras/throttle/system/topoSetDict.3 | 2 +- 66 files changed, 135 insertions(+), 102 deletions(-) diff --git a/applications/solvers/multiphase/cavitatingFoam/CourantNo.H b/applications/solvers/multiphase/cavitatingFoam/CourantNo.H index 02a6c86db7..a5bae74528 100644 --- a/applications/solvers/multiphase/cavitatingFoam/CourantNo.H +++ b/applications/solvers/multiphase/cavitatingFoam/CourantNo.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -37,7 +37,7 @@ if (mesh.nInternalFaces()) { scalarField sumPhi ( - fvc::surfaceSum(mag(phiv))().internalField() + fvc::surfaceSum(mag(phi))().internalField() ); CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); @@ -54,7 +54,7 @@ if (mesh.nInternalFaces()) )*runTime.deltaTValue(); } -Info<< "phiv Courant Number mean: " << meanCoNum +Info<< "phi Courant Number mean: " << meanCoNum << " max: " << CoNum << " acoustic max: " << acousticCoNum << endl; diff --git a/applications/solvers/multiphase/cavitatingFoam/UEqn.H b/applications/solvers/multiphase/cavitatingFoam/UEqn.H index 1ca0b9f0a5..8edf0d3934 100644 --- a/applications/solvers/multiphase/cavitatingFoam/UEqn.H +++ b/applications/solvers/multiphase/cavitatingFoam/UEqn.H @@ -1,7 +1,7 @@ fvVectorMatrix UEqn ( fvm::ddt(rho, U) - + fvm::div(phi, U) + + fvm::div(rhoPhi, U) + turbulence->divDevRhoReff(rho, U) ); diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C index c3fde6b3a1..284ca97bd4 100644 --- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C +++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2012-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2012-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -56,7 +56,7 @@ int main(int argc, char *argv[]) #include "createFields.H" #include "createUf.H" #include "createPcorrTypes.H" - #include "compressibleCourantNo.H" + #include "CourantNo.H" #include "setInitialDeltaT.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -86,12 +86,12 @@ int main(int argc, char *argv[]) if (correctPhi) { // Calculate absolute flux from the mapped surface velocity - phiv = mesh.Sf() & Uf; + phi = mesh.Sf() & Uf; #include "correctPhi.H" // Make the flux relative to the mesh motion - fvc::makeRelative(phiv, U); + fvc::makeRelative(phi, U); } } diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/correctPhi.H b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/correctPhi.H index c05d664838..4bb1ce9d0d 100644 --- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/correctPhi.H +++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/correctPhi.H @@ -14,7 +14,7 @@ if (mesh.changing()) { U.boundaryField()[patchI].evaluate(); - phiv.boundaryField()[patchI] = + phi.boundaryField()[patchI] = U.boundaryField()[patchI] & mesh.Sf().boundaryField()[patchI]; } @@ -37,21 +37,21 @@ if (mesh.changing()) pcorrTypes ); - surfaceScalarField rhof(fvc::interpolate(rho, "div(phiv,rho)")); + surfaceScalarField rhof(fvc::interpolate(rho, "div(phi,rho)")); dimensionedScalar rAUf("rAUf", dimTime, 1.0); while (pimple.correctNonOrthogonal()) { fvScalarMatrix pcorrEqn ( - fvm::laplacian(rAUf, pcorr) == fvc::ddt(rho) + fvc::div(phiv*rhof) + fvm::laplacian(rAUf, pcorr) == fvc::ddt(rho) + fvc::div(phi*rhof) ); pcorrEqn.solve(); if (pimple.finalNonOrthogonalIter()) { - phiv -= pcorrEqn.flux()/rhof; + phi -= pcorrEqn.flux()/rhof; } } } diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H index a0e0e6c74d..b07846b6de 100644 --- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H +++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/pEqn.H @@ -17,13 +17,13 @@ volVectorField HbyA("HbyA", U); HbyA = rAU*UEqn.H(); - phiv = (fvc::interpolate(HbyA) & mesh.Sf()) + phi = (fvc::interpolate(HbyA) & mesh.Sf()) + rhorAUf*fvc::ddtCorr(U, Uf); - fvc::makeRelative(phiv, U); + fvc::makeRelative(phi, U); surfaceScalarField phiGradp(rhorAUf*mesh.magSf()*fvc::snGrad(p)); - phiv -= phiGradp/rhof; + phi -= phiGradp/rhof; volScalarField rho0(rho - psi*p); @@ -33,7 +33,7 @@ ( fvc::ddt(rho) + psi*correction(fvm::ddt(p)) - + fvc::div(phiv, rho) + + fvc::div(phi, rho) + fvc::div(phiGradp) - fvm::laplacian(rhorAUf, p) ); @@ -42,7 +42,7 @@ if (pimple.finalNonOrthogonalIter()) { - phiv += (phiGradp + pEqn.flux())/rhof; + phi += (phiGradp + pEqn.flux())/rhof; } } @@ -85,6 +85,6 @@ { Uf = fvc::interpolate(U); surfaceVectorField n(mesh.Sf()/mesh.magSf()); - Uf += n*(phiv/mesh.magSf() - (n & Uf)); + Uf += n*(phi/mesh.magSf() - (n & Uf)); } } diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C index c4453df391..2b04d58fb5 100644 --- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C +++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) #include "readControls.H" #include "createFields.H" #include "initContinuityErrs.H" - #include "compressibleCourantNo.H" + #include "CourantNo.H" #include "setInitialDeltaT.H" pimpleControl pimple(mesh); diff --git a/applications/solvers/multiphase/cavitatingFoam/createFields.H b/applications/solvers/multiphase/cavitatingFoam/createFields.H index 605c0deece..2c834dc511 100644 --- a/applications/solvers/multiphase/cavitatingFoam/createFields.H +++ b/applications/solvers/multiphase/cavitatingFoam/createFields.H @@ -39,12 +39,25 @@ mesh ); - #include "createPhiv.H" - #include "compressibleCreatePhi.H" + #include "createPhi.H" + + // Mass flux (corrected by rhoEqn.H) + surfaceScalarField rhoPhi + ( + IOobject + ( + "rhoPhi", + runTime.timeName(), + mesh, + IOobject::NO_READ, + IOobject::NO_WRITE + ), + fvc::interpolate(rho)*phi + ); Info<< "Reading transportProperties\n" << endl; - incompressibleTwoPhaseMixture twoPhaseProperties(U, phiv); + incompressibleTwoPhaseMixture twoPhaseProperties(U, phi); volScalarField& alphav(twoPhaseProperties.alpha1()); alphav.oldTime(); @@ -72,5 +85,5 @@ // Create incompressible turbulence model autoPtr turbulence ( - incompressible::turbulenceModel::New(U, phiv, twoPhaseProperties) + incompressible::turbulenceModel::New(U, phi, twoPhaseProperties) ); diff --git a/applications/solvers/multiphase/cavitatingFoam/pEqn.H b/applications/solvers/multiphase/cavitatingFoam/pEqn.H index 210a30fd14..da8047914c 100644 --- a/applications/solvers/multiphase/cavitatingFoam/pEqn.H +++ b/applications/solvers/multiphase/cavitatingFoam/pEqn.H @@ -17,12 +17,12 @@ volVectorField HbyA("HbyA", U); HbyA = rAU*UEqn.H(); - phiv = (fvc::interpolate(HbyA) & mesh.Sf()) - + rhorAUf*fvc::ddtCorr(U, phiv); + phi = (fvc::interpolate(HbyA) & mesh.Sf()) + + rhorAUf*fvc::ddtCorr(U, phi); surfaceScalarField phiGradp(rhorAUf*mesh.magSf()*fvc::snGrad(p)); - phiv -= phiGradp/rhof; + phi -= phiGradp/rhof; while (pimple.correctNonOrthogonal()) { @@ -30,7 +30,7 @@ ( fvm::ddt(psi, p) - (rhol0 + (psil - psiv)*pSat)*fvc::ddt(alphav) - pSat*fvc::ddt(psi) - + fvc::div(phiv, rho) + + fvc::div(phi, rho) + fvc::div(phiGradp) - fvm::laplacian(rhorAUf, p) ); @@ -39,7 +39,7 @@ if (pimple.finalNonOrthogonalIter()) { - phiv += (phiGradp + pEqn.flux())/rhof; + phi += (phiGradp + pEqn.flux())/rhof; } } diff --git a/applications/solvers/multiphase/cavitatingFoam/rhoEqn.H b/applications/solvers/multiphase/cavitatingFoam/rhoEqn.H index d0bd6e1dad..a01823ad49 100644 --- a/applications/solvers/multiphase/cavitatingFoam/rhoEqn.H +++ b/applications/solvers/multiphase/cavitatingFoam/rhoEqn.H @@ -2,12 +2,12 @@ fvScalarMatrix rhoEqn ( fvm::ddt(rho) - + fvm::div(phiv, rho) + + fvm::div(phi, rho) ); rhoEqn.solve(); - phi = rhoEqn.flux(); + rhoPhi = rhoEqn.flux(); Info<< "max-min rho: " << max(rho).value() << " " << min(rho).value() << endl; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/U b/tutorials/multiphase/cavitatingFoam/les/throttle/0/U index b668f3ee65..5a3e81c4e9 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/U +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour b/tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour index 8fdc384974..c0f1b3dc58 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/alpha.vapour @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/k b/tutorials/multiphase/cavitatingFoam/les/throttle/0/k index 7482950a6f..184e851160 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/k +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/k @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs b/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs index 6c958c6717..71b6fec5bb 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/nuSgs @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/p b/tutorials/multiphase/cavitatingFoam/les/throttle/0/p index 7cfeca1d9a..3f596fbb3c 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/p +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -24,7 +24,6 @@ boundaryField { type totalPressure; U U; - phi phiv; rho rho; psi none; gamma 1; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho b/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho index d6f5118fa2..4f07d57e08 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/0/rho @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties index 2f9a977a4c..b9e351e403 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/LESProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict index a2435dfd7a..53b23eea44 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties index 43505ed12f..3a264a146c 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/thermodynamicProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties index 639ad9202c..e5a1acf2e6 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/transportProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties index 9fc2dcb54d..9e29fab3fa 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/constant/turbulenceProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict index 914c209f12..4e7c701967 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes index 5a5f05f9ae..4181605883 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSchemes @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -28,9 +28,9 @@ interpolationSchemes divSchemes { default none; - div(phiv,rho) Gauss vanLeer; - div(phi,U) Gauss LUST grad(U); - div(phiv,k) Gauss LUST grad(k); + div(phi,rho) Gauss vanLeer; + div(rhoPhi,U) Gauss LUST grad(U); + div(phi,k) Gauss LUST grad(k); div((muEff*dev(T(grad(U))))) Gauss linear; } diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution index bc73a51b73..cca8c86ede 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -78,5 +78,13 @@ PIMPLE nNonOrthogonalCorrectors 0; } +relaxationFactors +{ + equations + { + ".*" 1; + } +} + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict index 6091b8359b..25d8a50bf3 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/refineMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1 index a07e3b0ecd..06bc39819d 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.1 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2 index 70230a425d..2c8235f46b 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.2 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3 index 5cfe701cfb..438b238fe0 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle/system/topoSetDict.3 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U index 6cd1f107d2..8c39bdda3e 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour index ee246adc54..240a586899 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/alpha.vapour @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k index 6c3f8a91fe..18f9de12b4 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/k @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs index 1104884211..9ed8c9bc03 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/nuSgs @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p index 5831778634..075a6f441b 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -24,7 +24,6 @@ boundaryField { type totalPressure; U U; - phi phiv; rho rho; psi none; gamma 1; diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho index 3382008a41..02a94b71c3 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/0.org/rho @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties index 2f9a977a4c..b9e351e403 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/LESProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict index cb1c584a07..fbe2a45735 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties index 43505ed12f..3a264a146c 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/thermodynamicProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties index 639ad9202c..e5a1acf2e6 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/transportProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties index 9fc2dcb54d..9e29fab3fa 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/constant/turbulenceProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict index abe02152ae..3154dff3ee 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict index 21583efc9a..9c4739d94f 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/decomposeParDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes index e53b27b188..a603aeb97b 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSchemes @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -29,9 +29,9 @@ divSchemes { default none; - div(phiv,rho) Gauss vanLeer; - div(phi,U) Gauss LUST grad(U); - div(phiv,k) Gauss LUST grad(k); + div(phi,rho) Gauss vanLeer; + div(rhoPhi,U) Gauss LUST grad(U); + div(phi,k) Gauss LUST grad(k); div((muEff*dev(T(grad(U))))) Gauss linear; } diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution index 92636c9842..9244793083 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -75,5 +75,13 @@ PIMPLE nNonOrthogonalCorrectors 0; } +relaxationFactors +{ + equations + { + ".*" 1; + } +} + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict index 2f6d850d9f..ca76f667da 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/mapFieldsDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict index c6d4f07589..f832f09fcb 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/refineMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1 index a07e3b0ecd..06bc39819d 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.1 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2 index 70230a425d..2c8235f46b 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.2 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3 index 5cfe701cfb..438b238fe0 100644 --- a/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3 +++ b/tutorials/multiphase/cavitatingFoam/les/throttle3D/system/topoSetDict.3 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U index b668f3ee65..5a3e81c4e9 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/U @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour index 8fdc384974..c0f1b3dc58 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/alpha.vapour @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k index 7482950a6f..184e851160 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/k @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut index e977119a51..64cdf41139 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/nut @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega index feff1b56a1..089a50ec1a 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/omega @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p index 7cfeca1d9a..3f596fbb3c 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/p @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -24,7 +24,6 @@ boundaryField { type totalPressure; U U; - phi phiv; rho rho; psi none; gamma 1; diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho index d6f5118fa2..4f07d57e08 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/0/rho @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties index 67cc1be542..a9bf04940b 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/RASProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict index a2435dfd7a..53b23eea44 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/polyMesh/blockMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties index 43505ed12f..3a264a146c 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/thermodynamicProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties index 639ad9202c..e5a1acf2e6 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/transportProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties index 17a36ec343..fa68b2620e 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/constant/turbulenceProperties @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict index b05030257c..f5742f3527 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/controlDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes index 60e373b3b8..f49209f6f7 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSchemes @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -28,10 +28,10 @@ interpolationSchemes divSchemes { default none; - div(phiv,rho) Gauss limitedLinear 1; - div(phi,U) Gauss limitedLinearV 1; - div(phiv,omega) Gauss limitedLinear 1; - div(phiv,k) Gauss limitedLinear 1; + div(phi,rho) Gauss limitedLinear 1; + div(rhoPhi,U) Gauss limitedLinearV 1; + div(phi,omega) Gauss limitedLinear 1; + div(phi,k) Gauss limitedLinear 1; div((muEff*dev(T(grad(U))))) Gauss linear; } diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution index bc73a51b73..2da9db65d6 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/fvSolution @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ @@ -33,7 +33,6 @@ solvers relTol 0; } - p { solver GAMG; @@ -78,5 +77,13 @@ PIMPLE nNonOrthogonalCorrectors 0; } +relaxationFactors +{ + equations + { + ".*" 1; + } +} + // ************************************************************************* // diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict index 6091b8359b..25d8a50bf3 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/refineMeshDict @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1 index a07e3b0ecd..06bc39819d 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1 +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.1 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2 index 70230a425d..2c8235f46b 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2 +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.2 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/ diff --git a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3 b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3 index 5cfe701cfb..438b238fe0 100644 --- a/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3 +++ b/tutorials/multiphase/cavitatingFoam/ras/throttle/system/topoSetDict.3 @@ -1,7 +1,7 @@ /*--------------------------------*- C++ -*----------------------------------*\ | ========= | | | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | -| \\ / O peration | Version: 2.3.0 | +| \\ / O peration | Version: 2.3.x | | \\ / A nd | Web: www.OpenFOAM.org | | \\/ M anipulation | | \*---------------------------------------------------------------------------*/