From 80393339a9a7453006554230f7c669a2d017cf67 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 17 Mar 2011 15:03:15 +0000 Subject: [PATCH 1/4] Upgrade of compressible solvers merging in developments from OpenFOAM-1.7.x --- .../compressible/rhoCentralFoam/Make/options | 13 ++- .../rhoCentralFoam/createFields.H | 15 +++ .../rhoCentralDyMFoam/Make/options | 7 +- .../rhoCentralDyMFoam/rhoCentralDyMFoam.C | 22 +++-- .../rhoCentralFoam/rhoCentralFoam.C | 40 +++++--- .../compressible/rhoPimpleFoam/Allwmake | 8 ++ .../compressible/rhoPimpleFoam/createFields.H | 10 ++ .../solvers/compressible/rhoPimpleFoam/pEqn.H | 6 ++ .../rhoPimpleFoam/rhoPimpleFoam.C | 3 +- .../rhoPorousMRFPimpleFoam/Make/files | 0 .../rhoPorousMRFPimpleFoam/Make/options | 2 +- .../rhoPorousMRFPimpleFoam/UEqn.H | 0 .../rhoPorousMRFPimpleFoam/createZones.H | 5 + .../rhoPorousMRFPimpleFoam/pEqn.H | 32 +++--- .../rhoPorousMRFPimpleFoam.C | 1 + .../rhoPorousMRFPimpleFoam/createFields.H | 77 --------------- .../rhoPorousSimpleFoam/createFields.H | 98 ------------------- .../compressible/rhoSimpleFoam/Allwmake | 8 ++ .../rhoPorousSimpleFoam/Make/files | 0 .../rhoPorousSimpleFoam/Make/options | 1 + .../rhoPorousSimpleFoam/UEqn.H | 0 .../rhoPorousSimpleFoam/createPorousZones.H | 27 +++++ .../rhoPorousSimpleFoam/hEqn.H | 4 +- .../rhoPorousSimpleFoam/pEqn.H | 0 .../rhoPorousSimpleFoam/rhoPorousSimpleFoam.C | 1 + .../rhoSimplecFoam/rhoSimplecFoam.C | 2 +- .../sonicDyMFoam/compressibleContinuityErrs.H | 20 ---- .../compressible/sonicDyMFoam/createFields.H | 57 ----------- .../readThermodynamicProperties.H | 23 ----- .../solvers/compressible/sonicFoam/Allwmake | 9 ++ .../solvers/compressible/sonicFoam/UEqn.H | 4 +- .../{ => sonicFoam}/sonicDyMFoam/Make/files | 0 .../{ => sonicFoam}/sonicDyMFoam/Make/options | 2 +- .../sonicFoam/sonicDyMFoam/pEqn.H | 33 +++++++ .../sonicDyMFoam/sonicDyMFoam.C | 53 +--------- .../compressible/sonicFoam/sonicFoam.C | 2 +- .../sonicLiquidFoam/Make/files | 0 .../sonicLiquidFoam/Make/options | 0 .../compressibleContinuityErrs.H | 0 .../sonicLiquidFoam/createFields.H | 0 .../readThermodynamicProperties.H | 0 .../readTransportProperties.H | 0 .../sonicLiquidFoam/sonicLiquidFoam.C | 2 +- .../sonicLiquidFoam/readTransportProperties.H | 18 ---- .../fireFoam/les/smallPoolFire2D/0/p_rgh | 11 ++- .../fireFoam/les/smallPoolFire3D/0/p_rgh | 9 +- .../les/smallPoolFire3D/system/fvSolution | 10 +- .../constant/turbulenceProperties | 21 ++++ .../constant/turbulenceProperties | 21 ++++ .../forwardStep/constant/turbulenceProperties | 21 ++++ .../constant/turbulenceProperties | 21 ++++ .../shockTube/constant/turbulenceProperties | 21 ++++ .../wedge15Ma5/constant/turbulenceProperties | 21 ++++ .../les/pitzDaily/system/fvSolution | 2 + .../ras/angledDuct/system/fvSolution | 2 + .../ras/cavity/system/fvSolution | 2 + .../angledDuctExplicit/system/fvSchemes | 4 +- .../angledDuctExplicit/system/fvSolution | 2 +- .../constant/polyMesh/boundary | 2 +- .../angledDuctImplicit/system/fvSchemes | 4 +- .../laminar/shockTube/system/sampleDict | 11 ++- 61 files changed, 359 insertions(+), 431 deletions(-) create mode 100755 applications/solvers/compressible/rhoPimpleFoam/Allwmake rename applications/solvers/compressible/{ => rhoPimpleFoam}/rhoPorousMRFPimpleFoam/Make/files (100%) rename applications/solvers/compressible/{ => rhoPimpleFoam}/rhoPorousMRFPimpleFoam/Make/options (94%) rename applications/solvers/compressible/{ => rhoPimpleFoam}/rhoPorousMRFPimpleFoam/UEqn.H (100%) create mode 100644 applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/createZones.H rename applications/solvers/compressible/{ => rhoPimpleFoam}/rhoPorousMRFPimpleFoam/pEqn.H (80%) rename applications/solvers/compressible/{ => rhoPimpleFoam}/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C (99%) delete mode 100644 applications/solvers/compressible/rhoPorousMRFPimpleFoam/createFields.H delete mode 100644 applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H create mode 100755 applications/solvers/compressible/rhoSimpleFoam/Allwmake rename applications/solvers/compressible/{ => rhoSimpleFoam}/rhoPorousSimpleFoam/Make/files (100%) rename applications/solvers/compressible/{ => rhoSimpleFoam}/rhoPorousSimpleFoam/Make/options (98%) rename applications/solvers/compressible/{ => rhoSimpleFoam}/rhoPorousSimpleFoam/UEqn.H (100%) create mode 100644 applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createPorousZones.H rename applications/solvers/compressible/{ => rhoSimpleFoam}/rhoPorousSimpleFoam/hEqn.H (68%) rename applications/solvers/compressible/{ => rhoSimpleFoam}/rhoPorousSimpleFoam/pEqn.H (100%) rename applications/solvers/compressible/{ => rhoSimpleFoam}/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C (98%) delete mode 100644 applications/solvers/compressible/sonicDyMFoam/compressibleContinuityErrs.H delete mode 100644 applications/solvers/compressible/sonicDyMFoam/createFields.H delete mode 100644 applications/solvers/compressible/sonicDyMFoam/readThermodynamicProperties.H create mode 100755 applications/solvers/compressible/sonicFoam/Allwmake rename applications/solvers/compressible/{ => sonicFoam}/sonicDyMFoam/Make/files (100%) rename applications/solvers/compressible/{ => sonicFoam}/sonicDyMFoam/Make/options (95%) create mode 100644 applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H rename applications/solvers/compressible/{ => sonicFoam}/sonicDyMFoam/sonicDyMFoam.C (66%) rename applications/solvers/compressible/{ => sonicFoam}/sonicLiquidFoam/Make/files (100%) rename applications/solvers/compressible/{ => sonicFoam}/sonicLiquidFoam/Make/options (100%) rename applications/solvers/compressible/{ => sonicFoam}/sonicLiquidFoam/compressibleContinuityErrs.H (100%) rename applications/solvers/compressible/{ => sonicFoam}/sonicLiquidFoam/createFields.H (100%) rename applications/solvers/compressible/{ => sonicFoam}/sonicLiquidFoam/readThermodynamicProperties.H (100%) rename applications/solvers/compressible/{sonicDyMFoam => sonicFoam/sonicLiquidFoam}/readTransportProperties.H (100%) rename applications/solvers/compressible/{ => sonicFoam}/sonicLiquidFoam/sonicLiquidFoam.C (98%) delete mode 100644 applications/solvers/compressible/sonicLiquidFoam/readTransportProperties.H create mode 100644 tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties create mode 100644 tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties create mode 100644 tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties create mode 100644 tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties create mode 100644 tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties create mode 100644 tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties diff --git a/applications/solvers/compressible/rhoCentralFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/Make/options index 4714ca611c..b3be16a505 100644 --- a/applications/solvers/compressible/rhoCentralFoam/Make/options +++ b/applications/solvers/compressible/rhoCentralFoam/Make/options @@ -1,11 +1,18 @@ EXE_INC = \ + -IBCs/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -IBCs/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude + -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ + -I$(LIB_SRC)/dynamicMesh/lnInclude \ + -I$(LIB_SRC)/meshTools/lnInclude + EXE_LIBS = \ -lfiniteVolume \ -lbasicThermophysicalModels \ -lspecie \ - -lrhoCentralFoam + -lrhoCentralFoam \ + -lcompressibleTurbulenceModel \ + -lcompressibleRASModels \ + -lcompressibleLESModels \ + -lmeshTools diff --git a/applications/solvers/compressible/rhoCentralFoam/createFields.H b/applications/solvers/compressible/rhoCentralFoam/createFields.H index fc65b3e5b4..60b40db1d1 100644 --- a/applications/solvers/compressible/rhoCentralFoam/createFields.H +++ b/applications/solvers/compressible/rhoCentralFoam/createFields.H @@ -96,3 +96,18 @@ surfaceScalarField neg mesh, dimensionedScalar("neg", dimless, -1.0) ); + + +surfaceScalarField phi("phi", mesh.Sf() & fvc::interpolate(rhoU)); + +Info<< "Creating turbulence model\n" << endl; +autoPtr turbulence +( + compressible::turbulenceModel::New + ( + rho, + U, + phi, + thermo + ) +); diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options index 403ffc1eef..250effbee2 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/Make/options @@ -1,10 +1,10 @@ EXE_INC = \ -I.. \ + -I../BCs/lnInclude \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \ - -I../BCs/lnInclude \ - -I$(LIB_SRC)/sampling/lnInclude \ + -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/dynamicMesh/lnInclude \ -I$(LIB_SRC)/meshTools/lnInclude @@ -13,5 +13,8 @@ EXE_LIBS = \ -lbasicThermophysicalModels \ -lspecie \ -lrhoCentralFoam \ + -lcompressibleTurbulenceModel \ + -lcompressibleRASModels \ + -lcompressibleLESModels \ -ldynamicMesh \ -lmeshTools diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C index 64b5fb5d87..8005a77aa7 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -22,7 +22,7 @@ License along with OpenFOAM. If not, see . Application - rhoCentralFoam + rhoCentralDyMFoam Description Density-based compressible flow solver based on central-upwind schemes of @@ -32,6 +32,7 @@ Description #include "fvCFD.H" #include "basicPsiThermo.H" +#include "turbulenceModel.H" #include "zeroGradientFvPatchFields.H" #include "fixedRhoFvPatchScalarField.H" #include "motionSolver.H" @@ -185,12 +186,11 @@ int main(int argc, char *argv[]) + aSf*p_pos - aSf*p_neg ); - volTensorField tauMC("tauMC", mu*dev2(Foam::T(fvc::grad(U)))); + volScalarField muEff(turbulence->muEff()); + volTensorField tauMC("tauMC", muEff*dev2(Foam::T(fvc::grad(U)))); // --- Solve density - Info<< max(rho) << " " << min(rho) << endl; solve(fvm::ddt(rho) + fvc::div(phi)); - Info<< max(rho) << " " << min(rho) << endl; // --- Solve momentum solve(fvm::ddt(rhoU) + fvc::div(phiUp)); @@ -206,7 +206,7 @@ int main(int argc, char *argv[]) solve ( fvm::ddt(rho, U) - fvc::ddt(rho, U) - - fvm::laplacian(mu, U) + - fvm::laplacian(muEff, U) - fvc::div(tauMC) ); rhoU = rho*U; @@ -216,7 +216,7 @@ int main(int argc, char *argv[]) surfaceScalarField sigmaDotU ( ( - fvc::interpolate(mu)*mesh.magSf()*fvc::snGrad(U) + fvc::interpolate(muEff)*mesh.magSf()*fvc::snGrad(U) + (mesh.Sf() & fvc::interpolate(tauMC)) ) & (a_pos*U_pos + a_neg*U_neg) @@ -240,12 +240,12 @@ int main(int argc, char *argv[]) if (!inviscid) { - volScalarField k("k", thermo.Cp()*mu/Pr); + volScalarField k("k", thermo.Cp()*muEff/Pr); solve ( fvm::ddt(rho, e) - fvc::ddt(rho, e) - - fvm::laplacian(thermo.alpha(), e) - + fvc::laplacian(thermo.alpha(), e) + - fvm::laplacian(turbulence->alphaEff(), e) + + fvc::laplacian(turbulence->alpha(), e) - fvc::laplacian(k, T) ); thermo.correct(); @@ -258,6 +258,8 @@ int main(int argc, char *argv[]) p.correctBoundaryConditions(); rho.boundaryField() = psi.boundaryField()*p.boundaryField(); + turbulence->correct(); + runTime.write(); Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C index 71ce4c2187..dd0f4ee4a5 100644 --- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C +++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -32,6 +32,7 @@ Description #include "fvCFD.H" #include "basicPsiThermo.H" +#include "turbulenceModel.H" #include "zeroGradientFvPatchFields.H" #include "fixedRhoFvPatchScalarField.H" @@ -51,7 +52,7 @@ int main(int argc, char *argv[]) #include "readFluxScheme.H" - dimensionedScalar v_zero("v_zero",dimVolume/dimTime, 0.0); + dimensionedScalar v_zero("v_zero", dimVolume/dimTime, 0.0); Info<< "\nStarting time loop\n" << endl; @@ -128,14 +129,6 @@ int main(int argc, char *argv[]) surfaceScalarField amaxSf("amaxSf", max(mag(am), mag(ap))); - #include "compressibleCourantNo.H" - #include "readTimeControls.H" - #include "setDeltaT.H" - - runTime++; - - Info<< "Time = " << runTime.timeName() << nl << endl; - surfaceScalarField aSf(am*a_pos); if (fluxScheme == "Tadmor") @@ -152,6 +145,18 @@ int main(int argc, char *argv[]) surfaceScalarField aphiv_pos(phiv_pos - aSf); surfaceScalarField aphiv_neg(phiv_neg + aSf); + // Reuse amaxSf for the maximum positive and negative fluxes + // estimated by the central scheme + amaxSf = max(mag(aphiv_pos), mag(aphiv_neg)); + + #include "compressibleCourantNo.H" + #include "readTimeControls.H" + #include "setDeltaT.H" + + runTime++; + + Info<< "Time = " << runTime.timeName() << nl << endl; + surfaceScalarField phi("phi", aphiv_pos*rho_pos + aphiv_neg*rho_neg); surfaceVectorField phiUp @@ -167,7 +172,8 @@ int main(int argc, char *argv[]) + aSf*p_pos - aSf*p_neg ); - volTensorField tauMC("tauMC", mu*dev2(Foam::T(fvc::grad(U)))); + volScalarField muEff(turbulence->muEff()); + volTensorField tauMC("tauMC", muEff*dev2(Foam::T(fvc::grad(U)))); // --- Solve density solve(fvm::ddt(rho) + fvc::div(phi)); @@ -188,7 +194,7 @@ int main(int argc, char *argv[]) solve ( fvm::ddt(rho, U) - fvc::ddt(rho, U) - - fvm::laplacian(mu, U) + - fvm::laplacian(muEff, U) - fvc::div(tauMC) ); rhoU = rho*U; @@ -198,7 +204,7 @@ int main(int argc, char *argv[]) surfaceScalarField sigmaDotU ( ( - fvc::interpolate(mu)*mesh.magSf()*fvc::snGrad(U) + fvc::interpolate(muEff)*mesh.magSf()*fvc::snGrad(U) + (mesh.Sf() & fvc::interpolate(tauMC)) ) & (a_pos*U_pos + a_neg*U_neg) @@ -222,12 +228,12 @@ int main(int argc, char *argv[]) if (!inviscid) { - volScalarField k("k", thermo.Cp()*mu/Pr); + volScalarField k("k", thermo.Cp()*muEff/Pr); solve ( fvm::ddt(rho, e) - fvc::ddt(rho, e) - - fvm::laplacian(thermo.alpha(), e) - + fvc::laplacian(thermo.alpha(), e) + - fvm::laplacian(turbulence->alphaEff(), e) + + fvc::laplacian(turbulence->alpha(), e) - fvc::laplacian(k, T) ); thermo.correct(); @@ -240,6 +246,8 @@ int main(int argc, char *argv[]) p.correctBoundaryConditions(); rho.boundaryField() = psi.boundaryField()*p.boundaryField(); + turbulence->correct(); + runTime.write(); Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s" diff --git a/applications/solvers/compressible/rhoPimpleFoam/Allwmake b/applications/solvers/compressible/rhoPimpleFoam/Allwmake new file mode 100755 index 0000000000..29bc918085 --- /dev/null +++ b/applications/solvers/compressible/rhoPimpleFoam/Allwmake @@ -0,0 +1,8 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # run from this directory +set -x + +wmake +wmake rhoPorousMRFPimpleFoam + +# ----------------------------------------------------------------- end-of-file diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H index 3c29a987d3..d1ade4b457 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H @@ -39,6 +39,16 @@ #include "compressibleCreatePhi.H" + dimensionedScalar rhoMax + ( + mesh.solutionDict().subDict("PIMPLE").lookup("rhoMax") + ); + + dimensionedScalar rhoMin + ( + mesh.solutionDict().subDict("PIMPLE").lookup("rhoMin") + ); + Info<< "Creating turbulence model\n" << endl; autoPtr turbulence ( diff --git a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H index 84e6451890..29ceb721c7 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/pEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/pEqn.H @@ -1,4 +1,7 @@ rho = thermo.rho(); +rho = max(rho, rhoMin); +rho = min(rho, rhoMax); +rho.relax(); U = rAU*UEqn().H(); @@ -98,6 +101,9 @@ p.relax(); // Recalculate density from the relaxed pressure rho = thermo.rho(); +rho = max(rho, rhoMin); +rho = min(rho, rhoMax); +rho.relax(); Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl; diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C index be0e09ee28..b91675f761 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -75,6 +75,7 @@ int main(int argc, char *argv[]) if (nOuterCorr != 1) { p.storePrevIter(); + rho.storePrevIter(); } #include "UEqn.H" diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/Make/files b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/files similarity index 100% rename from applications/solvers/compressible/rhoPorousMRFPimpleFoam/Make/files rename to applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/files diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/Make/options b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/options similarity index 94% rename from applications/solvers/compressible/rhoPorousMRFPimpleFoam/Make/options rename to applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/options index 809b4a63a1..4067875fbc 100644 --- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/Make/options @@ -1,5 +1,5 @@ EXE_INC = \ - -I../rhoPimpleFoam \ + -I.. \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/finiteVolume/cfdTools \ diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H similarity index 100% rename from applications/solvers/compressible/rhoPorousMRFPimpleFoam/UEqn.H rename to applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/UEqn.H diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/createZones.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/createZones.H new file mode 100644 index 0000000000..487a55d8ed --- /dev/null +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/createZones.H @@ -0,0 +1,5 @@ + MRFZones mrfZones(mesh); + mrfZones.correctBoundaryVelocity(U); + + porousZones pZones(mesh); + Switch pressureImplicitPorosity(false); diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H similarity index 80% rename from applications/solvers/compressible/rhoPorousMRFPimpleFoam/pEqn.H rename to applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H index 3802c9298a..87794f8a47 100644 --- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/pEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H @@ -1,4 +1,7 @@ rho = thermo.rho(); +rho = max(rho, rhoMin); +rho = min(rho, rhoMax); +rho.relax(); volScalarField rAU(1.0/UEqn().A()); U = rAU*UEqn().H(); @@ -96,30 +99,17 @@ else #include "rhoEqn.H" #include "compressibleContinuityErrs.H" -//if (oCorr != nOuterCorr-1) -{ - // Explicitly relax pressure for momentum corrector - p.relax(); +// Explicitly relax pressure for momentum corrector +p.relax(); - rho = thermo.rho(); - rho = max(rho, rhoMin); - rho = min(rho, rhoMax); - rho.relax(); - Info<< "rho max/min : " << max(rho).value() - << " " << min(rho).value() << endl; -} +rho = thermo.rho(); +rho = max(rho, rhoMin); +rho = min(rho, rhoMax); +rho.relax(); +Info<< "rho max/min : " << max(rho).value() + << " " << min(rho).value() << endl; U -= rAU*fvc::grad(p); U.correctBoundaryConditions(); DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p); - -// For closed-volume cases adjust the pressure and density levels -// to obey overall mass continuity -/* -if (closedVolume) -{ - p += (initialMass - fvc::domainIntegrate(psi*p)) - /fvc::domainIntegrate(psi); -} -*/ diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C similarity index 99% rename from applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C rename to applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C index 0a3a899821..d72ff3af5a 100644 --- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C @@ -48,6 +48,7 @@ int main(int argc, char *argv[]) #include "createTime.H" #include "createMesh.H" #include "createFields.H" + #include "createZones.H" #include "initContinuityErrs.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPorousMRFPimpleFoam/createFields.H deleted file mode 100644 index 9dd30f53cf..0000000000 --- a/applications/solvers/compressible/rhoPorousMRFPimpleFoam/createFields.H +++ /dev/null @@ -1,77 +0,0 @@ - Info<< "Reading thermophysical properties\n" << endl; - - autoPtr pThermo - ( - basicPsiThermo::New(mesh) - ); - basicPsiThermo& thermo = pThermo(); - - volScalarField& p = thermo.p(); - volScalarField& h = thermo.h(); - const volScalarField& psi = thermo.psi(); - - volScalarField rho - ( - IOobject - ( - "rho", - runTime.timeName(), - mesh, - IOobject::READ_IF_PRESENT, - IOobject::AUTO_WRITE - ), - thermo.rho() - ); - - Info<< "Reading field U\n" << endl; - volVectorField U - ( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - - #include "compressibleCreatePhi.H" - - dimensionedScalar rhoMax - ( - mesh.solutionDict().subDict("PIMPLE").lookup("rhoMax") - ); - - dimensionedScalar rhoMin - ( - mesh.solutionDict().subDict("PIMPLE").lookup("rhoMin") - ); - - Info<< "Creating turbulence model\n" << endl; - autoPtr turbulence - ( - compressible::turbulenceModel::New - ( - rho, - U, - phi, - thermo - ) - ); - - //dimensionedScalar initialMass = fvc::domainIntegrate(rho); - - - Info<< "Creating field DpDt\n" << endl; - volScalarField DpDt - ( - fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p) - ); - - MRFZones mrfZones(mesh); - mrfZones.correctBoundaryVelocity(U); - - porousZones pZones(mesh); - Switch pressureImplicitPorosity(false); diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H deleted file mode 100644 index 1a242bdfff..0000000000 --- a/applications/solvers/compressible/rhoPorousSimpleFoam/createFields.H +++ /dev/null @@ -1,98 +0,0 @@ - Info<< "Reading thermophysical properties\n" << endl; - - autoPtr pThermo - ( - basicPsiThermo::New(mesh) - ); - basicPsiThermo& thermo = pThermo(); - - volScalarField rho - ( - IOobject - ( - "rho", - runTime.timeName(), - mesh, - IOobject::READ_IF_PRESENT, - IOobject::AUTO_WRITE - ), - thermo.rho() - ); - - volScalarField& p = thermo.p(); - volScalarField& h = thermo.h(); - const volScalarField& psi = thermo.psi(); - - - Info<< "Reading field U\n" << endl; - volVectorField U - ( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - - #include "compressibleCreatePhi.H" - - - label pRefCell = 0; - scalar pRefValue = 0.0; - setRefCell(p, mesh.solutionDict().subDict("SIMPLE"), pRefCell, pRefValue); - - dimensionedScalar rhoMax - ( - mesh.solutionDict().subDict("SIMPLE").lookup("rhoMax") - ); - - dimensionedScalar rhoMin - ( - mesh.solutionDict().subDict("SIMPLE").lookup("rhoMin") - ); - - Info<< "Creating turbulence model\n" << endl; - autoPtr turbulence - ( - compressible::RASModel::New - ( - rho, - U, - phi, - thermo - ) - ); - - dimensionedScalar initialMass = fvc::domainIntegrate(rho); - - thermalPorousZones pZones(mesh); - Switch pressureImplicitPorosity(false); - - // nUCorrectors used for pressureImplicitPorosity - int nUCorr = 0; - if (pZones.size()) - { - // nUCorrectors for pressureImplicitPorosity - if (mesh.solutionDict().subDict("SIMPLE").found("nUCorrectors")) - { - nUCorr = readInt - ( - mesh.solutionDict().subDict("SIMPLE").lookup("nUCorrectors") - ); - } - - if (nUCorr > 0) - { - pressureImplicitPorosity = true; - Info<< "Using pressure implicit porosity" << endl; - } - else - { - Info<< "Using pressure explicit porosity" << endl; - } - } - diff --git a/applications/solvers/compressible/rhoSimpleFoam/Allwmake b/applications/solvers/compressible/rhoSimpleFoam/Allwmake new file mode 100755 index 0000000000..d4c5bc2828 --- /dev/null +++ b/applications/solvers/compressible/rhoSimpleFoam/Allwmake @@ -0,0 +1,8 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # run from this directory +set -x + +wmake +wmake rhoPorousSimpleFoam + +# ----------------------------------------------------------------- end-of-file diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/Make/files b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/files similarity index 100% rename from applications/solvers/compressible/rhoPorousSimpleFoam/Make/files rename to applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/files diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options similarity index 98% rename from applications/solvers/compressible/rhoPorousSimpleFoam/Make/options rename to applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options index a4cdecf368..14e73bf2a5 100644 --- a/applications/solvers/compressible/rhoPorousSimpleFoam/Make/options +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I.. \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/thermalPorousZone/lnInclude \ -I$(LIB_SRC)/turbulenceModels \ diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H similarity index 100% rename from applications/solvers/compressible/rhoPorousSimpleFoam/UEqn.H rename to applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createPorousZones.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createPorousZones.H new file mode 100644 index 0000000000..8640b360e0 --- /dev/null +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createPorousZones.H @@ -0,0 +1,27 @@ + thermalPorousZones pZones(mesh); + Switch pressureImplicitPorosity(false); + + // nUCorrectors used for pressureImplicitPorosity + int nUCorr = 0; + if (pZones.size()) + { + // nUCorrectors for pressureImplicitPorosity + if (mesh.solutionDict().subDict("SIMPLE").found("nUCorrectors")) + { + nUCorr = readInt + ( + mesh.solutionDict().subDict("SIMPLE").lookup("nUCorrectors") + ); + } + + if (nUCorr > 0) + { + pressureImplicitPorosity = true; + Info<< "Using pressure implicit porosity" << endl; + } + else + { + Info<< "Using pressure explicit porosity" << endl; + } + } + diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/hEqn.H similarity index 68% rename from applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H rename to applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/hEqn.H index 9e5138de8a..ff0b91bcb7 100644 --- a/applications/solvers/compressible/rhoPorousSimpleFoam/hEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/hEqn.H @@ -5,8 +5,8 @@ - fvm::Sp(fvc::div(phi), h) - fvm::laplacian(turbulence->alphaEff(), h) == - fvc::div(phi/fvc::interpolate(rho)*fvc::interpolate(p, "div(U,p)")) - - p*fvc::div(phi/fvc::interpolate(rho)) + fvc::div(phi/fvc::interpolate(rho), rho/psi, "div(U,p)") + - (rho/psi)*fvc::div(phi/fvc::interpolate(rho)) ); pZones.addEnthalpySource(thermo, rho, hEqn); diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H similarity index 100% rename from applications/solvers/compressible/rhoPorousSimpleFoam/pEqn.H rename to applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H diff --git a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C similarity index 98% rename from applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C rename to applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C index 2b77cf6265..005e27b4a5 100644 --- a/applications/solvers/compressible/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C @@ -43,6 +43,7 @@ int main(int argc, char *argv[]) #include "createTime.H" #include "createMesh.H" #include "createFields.H" + #include "createPorousZones.H" #include "initContinuityErrs.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C b/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C index fa6c9f3594..c804e4e45d 100644 --- a/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C +++ b/applications/solvers/compressible/rhoSimplecFoam/rhoSimplecFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2010-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/compressible/sonicDyMFoam/compressibleContinuityErrs.H b/applications/solvers/compressible/sonicDyMFoam/compressibleContinuityErrs.H deleted file mode 100644 index 1d869cc58d..0000000000 --- a/applications/solvers/compressible/sonicDyMFoam/compressibleContinuityErrs.H +++ /dev/null @@ -1,20 +0,0 @@ -{ - #include "rhoEqn.H" -} -{ - scalar sumLocalContErr = - sum - ( - mag(rho.internalField() - (psi*p)().internalField()) - )/sum(rho.internalField()); - - scalar globalContErr = - sum(rho.internalField() - (psi*p)().internalField()) - /sum(rho.internalField()); - - cumulativeContErr += globalContErr; - - Info<< "time step continuity errors : sum local = " << sumLocalContErr - << ", global = " << globalContErr - << ", cumulative = " << cumulativeContErr << endl; -} diff --git a/applications/solvers/compressible/sonicDyMFoam/createFields.H b/applications/solvers/compressible/sonicDyMFoam/createFields.H deleted file mode 100644 index 8367d7e331..0000000000 --- a/applications/solvers/compressible/sonicDyMFoam/createFields.H +++ /dev/null @@ -1,57 +0,0 @@ - Info<< "Reading thermophysical properties\n" << endl; - - autoPtr pThermo - ( - basicPsiThermo::New(mesh) - ); - basicPsiThermo& thermo = pThermo(); - - volScalarField& p = thermo.p(); - volScalarField& e = thermo.e(); - const volScalarField& psi = thermo.psi(); - - volScalarField rho - ( - IOobject - ( - "rho", - runTime.timeName(), - mesh - ), - thermo.rho() - ); - - Info<< "Reading field U\n" << endl; - volVectorField U - ( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - -# include "compressibleCreatePhi.H" - - - Info<< "Creating turbulence model\n" << endl; - autoPtr turbulence - ( - compressible::turbulenceModel::New - ( - rho, - U, - phi, - thermo - ) - ); - - Info<< "Creating field DpDt\n" << endl; - volScalarField DpDt - ( - fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p) - ); diff --git a/applications/solvers/compressible/sonicDyMFoam/readThermodynamicProperties.H b/applications/solvers/compressible/sonicDyMFoam/readThermodynamicProperties.H deleted file mode 100644 index 4e19adaae4..0000000000 --- a/applications/solvers/compressible/sonicDyMFoam/readThermodynamicProperties.H +++ /dev/null @@ -1,23 +0,0 @@ - Info<< "Reading thermodynamicProperties\n" << endl; - - IOdictionary thermodynamicProperties - ( - IOobject - ( - "thermodynamicProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE - ) - ); - - dimensionedScalar R - ( - thermodynamicProperties.lookup("R") - ); - - dimensionedScalar Cv - ( - thermodynamicProperties.lookup("Cv") - ); diff --git a/applications/solvers/compressible/sonicFoam/Allwmake b/applications/solvers/compressible/sonicFoam/Allwmake new file mode 100755 index 0000000000..27c1194eaf --- /dev/null +++ b/applications/solvers/compressible/sonicFoam/Allwmake @@ -0,0 +1,9 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # run from this directory +set -x + +wmake +wmake sonicDyMFoam +wmake sonicLiquidFoam + +# ----------------------------------------------------------------- end-of-file diff --git a/applications/solvers/compressible/sonicFoam/UEqn.H b/applications/solvers/compressible/sonicFoam/UEqn.H index 25506783ae..27edbece47 100644 --- a/applications/solvers/compressible/sonicFoam/UEqn.H +++ b/applications/solvers/compressible/sonicFoam/UEqn.H @@ -1,8 +1,8 @@ fvVectorMatrix UEqn ( fvm::ddt(rho, U) - + fvm::div(phi, U) - + turbulence->divDevRhoReff(U) + + fvm::div(phi, U) + + turbulence->divDevRhoReff(U) ); solve(UEqn == -fvc::grad(p)); diff --git a/applications/solvers/compressible/sonicDyMFoam/Make/files b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/files similarity index 100% rename from applications/solvers/compressible/sonicDyMFoam/Make/files rename to applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/files diff --git a/applications/solvers/compressible/sonicDyMFoam/Make/options b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options similarity index 95% rename from applications/solvers/compressible/sonicDyMFoam/Make/options rename to applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options index 81495fb1f6..73e3e02dc4 100644 --- a/applications/solvers/compressible/sonicDyMFoam/Make/options +++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/Make/options @@ -1,5 +1,5 @@ EXE_INC = \ - -I../sonicFoam \ + -I.. \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/finiteVolume/lnInclude \ diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H new file mode 100644 index 0000000000..98cc22d15a --- /dev/null +++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/pEqn.H @@ -0,0 +1,33 @@ +rho = thermo.rho(); + +volScalarField rAU(1.0/UEqn.A()); +U = UEqn.H()/UEqn.A(); + +surfaceScalarField phid +( + "phid", + fvc::interpolate(psi) + *( + (fvc::interpolate(U) & mesh.Sf()) + - fvc::meshPhi(rho, U) + ) +); + +for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) +{ + fvScalarMatrix pEqn + ( + fvm::ddt(psi, p) + + fvm::div(phid, p) + - fvm::laplacian(rho*rAU, p) + ); + + pEqn.solve(); + + phi = pEqn.flux(); +} + +#include "compressibleContinuityErrs.H" + +U -= rAU*fvc::grad(p); +U.correctBoundaryConditions(); diff --git a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C similarity index 66% rename from applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C rename to applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C index 453a84b9a3..dd870e9a31 100644 --- a/applications/solvers/compressible/sonicDyMFoam/sonicDyMFoam.C +++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -62,14 +62,7 @@ int main(int argc, char *argv[]) #include "rhoEqn.H" - fvVectorMatrix UEqn - ( - fvm::ddt(rho, U) - + fvm::div(phi, U) - + turbulence->divDevRhoReff(U) - ); - - solve(UEqn == -fvc::grad(p)); + #include "UEqn.H" #include "eEqn.H" @@ -78,50 +71,12 @@ int main(int argc, char *argv[]) for (int corr=0; corrcorrect(); - rho = psi*p; + rho = thermo.rho(); runTime.write(); diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C index 820945edea..2923446e2f 100644 --- a/applications/solvers/compressible/sonicFoam/sonicFoam.C +++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/compressible/sonicLiquidFoam/Make/files b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/Make/files similarity index 100% rename from applications/solvers/compressible/sonicLiquidFoam/Make/files rename to applications/solvers/compressible/sonicFoam/sonicLiquidFoam/Make/files diff --git a/applications/solvers/compressible/sonicLiquidFoam/Make/options b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/Make/options similarity index 100% rename from applications/solvers/compressible/sonicLiquidFoam/Make/options rename to applications/solvers/compressible/sonicFoam/sonicLiquidFoam/Make/options diff --git a/applications/solvers/compressible/sonicLiquidFoam/compressibleContinuityErrs.H b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/compressibleContinuityErrs.H similarity index 100% rename from applications/solvers/compressible/sonicLiquidFoam/compressibleContinuityErrs.H rename to applications/solvers/compressible/sonicFoam/sonicLiquidFoam/compressibleContinuityErrs.H diff --git a/applications/solvers/compressible/sonicLiquidFoam/createFields.H b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/createFields.H similarity index 100% rename from applications/solvers/compressible/sonicLiquidFoam/createFields.H rename to applications/solvers/compressible/sonicFoam/sonicLiquidFoam/createFields.H diff --git a/applications/solvers/compressible/sonicLiquidFoam/readThermodynamicProperties.H b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readThermodynamicProperties.H similarity index 100% rename from applications/solvers/compressible/sonicLiquidFoam/readThermodynamicProperties.H rename to applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readThermodynamicProperties.H diff --git a/applications/solvers/compressible/sonicDyMFoam/readTransportProperties.H b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readTransportProperties.H similarity index 100% rename from applications/solvers/compressible/sonicDyMFoam/readTransportProperties.H rename to applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readTransportProperties.H diff --git a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C similarity index 98% rename from applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C rename to applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C index 86987d92c9..c948d4737c 100644 --- a/applications/solvers/compressible/sonicLiquidFoam/sonicLiquidFoam.C +++ b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/compressible/sonicLiquidFoam/readTransportProperties.H b/applications/solvers/compressible/sonicLiquidFoam/readTransportProperties.H deleted file mode 100644 index c30f65b445..0000000000 --- a/applications/solvers/compressible/sonicLiquidFoam/readTransportProperties.H +++ /dev/null @@ -1,18 +0,0 @@ - Info<< "Reading transportProperties\n" << endl; - - IOdictionary transportProperties - ( - IOobject - ( - "transportProperties", - runTime.constant(), - mesh, - IOobject::MUST_READ_IF_MODIFIED, - IOobject::NO_WRITE - ) - ); - - dimensionedScalar mu - ( - transportProperties.lookup("mu") - ); diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh index 1e165b9bbf..356077d324 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh +++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/0/p_rgh @@ -24,12 +24,17 @@ boundaryField outlet { type buoyantPressure; - value uniform 101325; + value $internalField; } - sides { - type fixedValue; + type totalPressure; + p0 $internalField; + U U; + phi phi; + rho none; + psi none; + gamma 1; value $internalField; } base diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh index 47b78e4c87..38b3c31d20 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh @@ -26,10 +26,15 @@ boundaryField type buoyantPressure; value $internalField; } - sides { - type fixedValue; + type totalPressure; + p0 $internalField; + U U; + phi phi; + rho none; + psi none; + gamma 1; value $internalField; } base diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution index 8c855503fc..72c26cef38 100644 --- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution +++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution @@ -18,18 +18,11 @@ FoamFile solvers { - rho + "(rho|rhoFinal)" { solver PCG; preconditioner DIC; tolerance 1e-7; - relTol 0.1; - }; - - rhoFinal - { - $rho; - tolerance 1e-7; relTol 0; }; @@ -69,7 +62,6 @@ solvers relTol 0; }; - Ii { solver GAMG; diff --git a/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties new file mode 100644 index 0000000000..d0a0998654 --- /dev/null +++ b/tutorials/compressible/rhoCentralFoam/LadenburgJet60psi/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties new file mode 100644 index 0000000000..d0a0998654 --- /dev/null +++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties new file mode 100644 index 0000000000..d0a0998654 --- /dev/null +++ b/tutorials/compressible/rhoCentralFoam/forwardStep/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties new file mode 100644 index 0000000000..d0a0998654 --- /dev/null +++ b/tutorials/compressible/rhoCentralFoam/obliqueShock/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties new file mode 100644 index 0000000000..d0a0998654 --- /dev/null +++ b/tutorials/compressible/rhoCentralFoam/shockTube/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties new file mode 100644 index 0000000000..d0a0998654 --- /dev/null +++ b/tutorials/compressible/rhoCentralFoam/wedge15Ma5/constant/turbulenceProperties @@ -0,0 +1,21 @@ +/*--------------------------------*- C++ -*----------------------------------*\ +| ========= | | +| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox | +| \\ / O peration | Version: dev | +| \\ / A nd | Web: www.OpenFOAM.com | +| \\/ M anipulation | | +\*---------------------------------------------------------------------------*/ +FoamFile +{ + version 2.0; + format ascii; + class dictionary; + location "constant"; + object turbulenceProperties; +} +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +simulationType laminar; + + +// ************************************************************************* // diff --git a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution index 0cfde23d31..739c8a48a6 100644 --- a/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution +++ b/tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSolution @@ -52,6 +52,8 @@ PIMPLE nOuterCorrectors 2; nCorrectors 1; nNonOrthogonalCorrectors 0; + rhoMin rhoMin [ 1 -3 0 0 0 ] 0.5; + rhoMax rhoMax [ 1 -3 0 0 0 ] 2.0; } relaxationFactors diff --git a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution index 58e0443d46..8c260da89e 100644 --- a/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution +++ b/tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSolution @@ -55,6 +55,8 @@ PIMPLE nOuterCorrectors 50; nCorrectors 1; nNonOrthogonalCorrectors 0; + rhoMin rhoMin [ 1 -3 0 0 0 ] 0.5; + rhoMax rhoMax [ 1 -3 0 0 0 ] 2.0; } relaxationFactors diff --git a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution index 80bab234da..197228f4bc 100644 --- a/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution +++ b/tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSolution @@ -59,6 +59,8 @@ PIMPLE nOuterCorrectors 1; nCorrectors 2; nNonOrthogonalCorrectors 0; + rhoMin rhoMin [ 1 -3 0 0 0 ] 0.5; + rhoMax rhoMax [ 1 -3 0 0 0 ] 2.0; } diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes index 184f6b4d1b..8792a00a15 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes @@ -23,8 +23,6 @@ ddtSchemes gradSchemes { default Gauss linear; - grad(U) Gauss linear; - grad(p) Gauss linear; } divSchemes @@ -34,6 +32,7 @@ divSchemes div(phi,h) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,k) Gauss upwind; + div(U,p) Gauss upwind; } laplacianSchemes @@ -50,7 +49,6 @@ laplacianSchemes interpolationSchemes { default linear; - div(U,p) upwind phi; } snGradSchemes diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution index f9e889652c..e6b7b5ec15 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution @@ -57,7 +57,7 @@ solvers SIMPLE { nNonOrthogonalCorrectors 0; - rhoMin rhoMin [ 1 -3 0 0 0 ] 1.0; + rhoMin rhoMin [ 1 -3 0 0 0 ] 0.5; rhoMax rhoMax [ 1 -3 0 0 0 ] 1.5; } diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary index dc9ecffb7b..117139f505 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary @@ -8,7 +8,7 @@ FoamFile { version 2.0; - format ascii; + format binary; class polyBoundaryMesh; location "constant/polyMesh"; object boundary; diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes index 92ad9e0855..a5f9ea99dd 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes +++ b/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes @@ -23,8 +23,6 @@ ddtSchemes gradSchemes { default Gauss linear; - grad(U) Gauss linear; - grad(p) Gauss linear; } divSchemes @@ -34,6 +32,7 @@ divSchemes div(phi,h) Gauss upwind; div(phi,epsilon) Gauss upwind; div(phi,k) Gauss upwind; + div(U,p) Gauss upwind; } laplacianSchemes @@ -49,7 +48,6 @@ laplacianSchemes interpolationSchemes { default linear; - div(U,p) upwind phi; } snGradSchemes diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict index 5c511b54cb..2e59f91be1 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict @@ -19,21 +19,22 @@ interpolationScheme cellPoint; setFormat raw; +surfaceFormat dx; +surfaces (); + sets ( data { type uniform; axis x; - start ( -4.995 0 0 ); - end ( 4.995 0 0 ); + start (-4.995 0 0); + end (4.995 0 0); nPoints 1000; } ); -surfaces (); - -fields ( T magU p ); +fields (T magU p); // ************************************************************************* // From 230f903f06bb243468d0ef0af06527c5555cb49e Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 17 Mar 2011 15:09:23 +0000 Subject: [PATCH 2/4] Corrected change date --- .../rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C | 2 +- .../rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C index d72ff3af5a..a410cf5248 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/rhoPorousMRFPimpleFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C index 005e27b4a5..b0a99e3306 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. + \\ / A nd | Copyright (C) 2004-2011 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- License From a302f0637f24e665dcae72b494590b5310c3eab8 Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 17 Mar 2011 15:15:05 +0000 Subject: [PATCH 3/4] shockTube tutorial: removed spurious surface specification in sampleDict --- .../compressible/sonicFoam/laminar/shockTube/system/sampleDict | 3 --- 1 file changed, 3 deletions(-) diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict index 561612437a..34176d6c3f 100644 --- a/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict +++ b/tutorials/compressible/sonicFoam/laminar/shockTube/system/sampleDict @@ -19,9 +19,6 @@ interpolationScheme cellPoint; setFormat raw; -surfaceFormat dx; -surfaces (); - sets ( data From 76981e8770f87812fd67fc5957f6fb068201e41c Mon Sep 17 00:00:00 2001 From: Henry Date: Thu, 17 Mar 2011 16:03:06 +0000 Subject: [PATCH 4/4] rhoPorousMRFSimpleFoam: Added MRF support to rhoPorousSimpleFoam --- .../rhoPorousMRFPimpleFoam/pEqn.H | 2 +- .../compressible/rhoSimpleFoam/Allwmake | 2 +- .../rhoPorousMRFSimpleFoam/Make/files | 3 + .../Make/options | 0 .../UEqn.H | 2 + .../createZones.H} | 4 +- .../hEqn.H | 0 .../rhoPorousMRFSimpleFoam/pEqn.H | 105 ++++++++++++++++++ .../rhoPorousMRFSimpleFoam.C} | 6 +- .../rhoPorousSimpleFoam/Make/files | 3 - .../rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H | 73 ------------ .../angledDuctExplicit/0 | 0 .../angledDuctExplicit/Allrun | 0 .../angledDuctExplicit/constant | 0 .../angledDuctExplicit/system/controlDict | 2 +- .../angledDuctExplicit/system/fvSchemes | 0 .../angledDuctExplicit/system/fvSolution | 0 .../angledDuctImplicit/0/T | 0 .../angledDuctImplicit/0/U | 0 .../angledDuctImplicit/0/alphat | 0 .../angledDuctImplicit/0/epsilon | 0 .../angledDuctImplicit/0/k | 0 .../angledDuctImplicit/0/mut | 0 .../angledDuctImplicit/0/p | 0 .../angledDuctImplicit/Allrun | 0 .../angledDuctImplicit/constant/RASProperties | 0 .../constant/polyMesh/blockMeshDict.m4 | 0 .../constant/polyMesh/boundary | 0 .../angledDuctImplicit/constant/porousZones | 0 .../constant/thermophysicalProperties | 0 .../angledDuctImplicit/system/controlDict | 2 +- .../angledDuctImplicit/system/fvSchemes | 0 .../angledDuctImplicit/system/fvSolution | 0 33 files changed, 121 insertions(+), 83 deletions(-) create mode 100644 applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/Make/files rename applications/solvers/compressible/rhoSimpleFoam/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/Make/options (100%) rename applications/solvers/compressible/rhoSimpleFoam/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/UEqn.H (96%) rename applications/solvers/compressible/rhoSimpleFoam/{rhoPorousSimpleFoam/createPorousZones.H => rhoPorousMRFSimpleFoam/createZones.H} (91%) rename applications/solvers/compressible/rhoSimpleFoam/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/hEqn.H (100%) create mode 100644 applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H rename applications/solvers/compressible/rhoSimpleFoam/{rhoPorousSimpleFoam/rhoPorousSimpleFoam.C => rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C} (93%) delete mode 100644 applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/files delete mode 100644 applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctExplicit/0 (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctExplicit/Allrun (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctExplicit/constant (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctExplicit/system/controlDict (97%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctExplicit/system/fvSchemes (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctExplicit/system/fvSolution (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctImplicit/0/T (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctImplicit/0/U (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctImplicit/0/alphat (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctImplicit/0/epsilon (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctImplicit/0/k (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctImplicit/0/mut (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctImplicit/0/p (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctImplicit/Allrun (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctImplicit/constant/RASProperties (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctImplicit/constant/polyMesh/boundary (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctImplicit/constant/porousZones (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctImplicit/constant/thermophysicalProperties (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctImplicit/system/controlDict (97%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctImplicit/system/fvSchemes (100%) rename tutorials/compressible/{rhoPorousSimpleFoam => rhoPorousMRFSimpleFoam}/angledDuctImplicit/system/fvSolution (100%) diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H index 87794f8a47..b24e0a8d5d 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H +++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H @@ -19,7 +19,7 @@ if (transonic) fvc::interpolate(psi) *( (fvc::interpolate(U) & mesh.Sf()) - + fvc::ddtPhiCorr(rAU, rho, U, phi) + //+ fvc::ddtPhiCorr(rAU, rho, U, phi) ) ); mrfZones.relativeFlux(fvc::interpolate(psi), phid); diff --git a/applications/solvers/compressible/rhoSimpleFoam/Allwmake b/applications/solvers/compressible/rhoSimpleFoam/Allwmake index d4c5bc2828..33916c7b39 100755 --- a/applications/solvers/compressible/rhoSimpleFoam/Allwmake +++ b/applications/solvers/compressible/rhoSimpleFoam/Allwmake @@ -3,6 +3,6 @@ cd ${0%/*} || exit 1 # run from this directory set -x wmake -wmake rhoPorousSimpleFoam +wmake rhoPorousMRFSimpleFoam # ----------------------------------------------------------------- end-of-file diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/Make/files b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/Make/files new file mode 100644 index 0000000000..d4792428af --- /dev/null +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/Make/files @@ -0,0 +1,3 @@ +rhoPorousMRFSimpleFoam.C + +EXE = $(FOAM_APPBIN)/rhoPorousMRFSimpleFoam diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/Make/options similarity index 100% rename from applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options rename to applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/Make/options diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/UEqn.H similarity index 96% rename from applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H rename to applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/UEqn.H index c600b1ca0b..c0e087b536 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/UEqn.H +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/UEqn.H @@ -8,6 +8,8 @@ UEqn().relax(); + mrfZones.addCoriolis(rho, UEqn()); + // Include the porous media resistance and solve the momentum equation // either implicit in the tensorial resistance or transport using by // including the spherical part of the resistance in the momentum diagonal diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createPorousZones.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/createZones.H similarity index 91% rename from applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createPorousZones.H rename to applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/createZones.H index 8640b360e0..78a96429f6 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createPorousZones.H +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/createZones.H @@ -1,3 +1,6 @@ + MRFZones mrfZones(mesh); + mrfZones.correctBoundaryVelocity(U); + thermalPorousZones pZones(mesh); Switch pressureImplicitPorosity(false); @@ -24,4 +27,3 @@ Info<< "Using pressure explicit porosity" << endl; } } - diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/hEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/hEqn.H similarity index 100% rename from applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/hEqn.H rename to applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/hEqn.H diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H new file mode 100644 index 0000000000..44b391a7b5 --- /dev/null +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H @@ -0,0 +1,105 @@ +if (pressureImplicitPorosity) +{ + U = trTU()&UEqn().H(); +} +else +{ + U = trAU()*UEqn().H(); +} + +UEqn.clear(); + +bool closedVolume = false; + +if (transonic) +{ + surfaceScalarField phid + ( + "phid", + fvc::interpolate(psi)*(fvc::interpolate(U) & mesh.Sf()) + ); + mrfZones.relativeFlux(fvc::interpolate(psi), phid); + + for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) + { + tmp tpEqn; + + if (pressureImplicitPorosity) + { + tpEqn = (fvc::div(phid, p) - fvm::laplacian(rho*trTU(), p)); + } + else + { + tpEqn = (fvc::div(phid, p) - fvm::laplacian(rho*trAU(), p)); + } + + tpEqn().setReference(pRefCell, pRefValue); + + tpEqn().solve(); + + if (nonOrth == nNonOrthCorr) + { + phi == tpEqn().flux(); + } + } +} +else +{ + phi = fvc::interpolate(rho*U) & mesh.Sf(); + mrfZones.relativeFlux(fvc::interpolate(rho), phi); + + closedVolume = adjustPhi(phi, U, p); + + for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) + { + tmp tpEqn; + + if (pressureImplicitPorosity) + { + tpEqn = (fvm::laplacian(rho*trTU(), p) == fvc::div(phi)); + } + else + { + tpEqn = (fvm::laplacian(rho*trAU(), p) == fvc::div(phi)); + } + + tpEqn().setReference(pRefCell, pRefValue); + + tpEqn().solve(); + + if (nonOrth == nNonOrthCorr) + { + phi -= tpEqn().flux(); + } + } +} + +#include "incompressible/continuityErrs.H" + +// Explicitly relax pressure for momentum corrector +p.relax(); + +if (pressureImplicitPorosity) +{ + U -= trTU()&fvc::grad(p); +} +else +{ + U -= trAU()*fvc::grad(p); +} + +U.correctBoundaryConditions(); + +// For closed-volume cases adjust the pressure and density levels +// to obey overall mass continuity +if (closedVolume) +{ + p += (initialMass - fvc::domainIntegrate(psi*p)) + /fvc::domainIntegrate(psi); +} + +rho = thermo.rho(); +rho = max(rho, rhoMin); +rho = min(rho, rhoMax); +rho.relax(); +Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl; diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C similarity index 93% rename from applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C rename to applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C index b0a99e3306..83898240ff 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C +++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C @@ -26,13 +26,15 @@ Application Description Steady-state solver for turbulent flow of compressible fluids with - RANS turbulence modelling, and implicit or explicit porosity treatment + RANS turbulence modelling, implicit or explicit porosity treatment + and MRF for HVAC and similar applications. \*---------------------------------------------------------------------------*/ #include "fvCFD.H" #include "basicPsiThermo.H" #include "RASModel.H" +#include "MRFZones.H" #include "thermalPorousZones.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -43,7 +45,7 @@ int main(int argc, char *argv[]) #include "createTime.H" #include "createMesh.H" #include "createFields.H" - #include "createPorousZones.H" + #include "createZones.H" #include "initContinuityErrs.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/files b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/files deleted file mode 100644 index d108d0246e..0000000000 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/files +++ /dev/null @@ -1,3 +0,0 @@ -rhoPorousSimpleFoam.C - -EXE = $(FOAM_APPBIN)/rhoPorousSimpleFoam diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H deleted file mode 100644 index fe69384c8b..0000000000 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/pEqn.H +++ /dev/null @@ -1,73 +0,0 @@ -if (pressureImplicitPorosity) -{ - U = trTU()&UEqn().H(); -} -else -{ - U = trAU()*UEqn().H(); -} - -UEqn.clear(); - -phi = fvc::interpolate(rho*U) & mesh.Sf(); -bool closedVolume = adjustPhi(phi, U, p); - -for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++) -{ - tmp tpEqn; - - if (pressureImplicitPorosity) - { - tpEqn = (fvm::laplacian(rho*trTU(), p) == fvc::div(phi)); - } - else - { - tpEqn = (fvm::laplacian(rho*trAU(), p) == fvc::div(phi)); - } - - tpEqn().setReference(pRefCell, pRefValue); - // retain the residual from the first iteration - if (nonOrth == 0) - { - tpEqn().solve(); - } - else - { - tpEqn().solve(); - } - - if (nonOrth == nNonOrthCorr) - { - phi -= tpEqn().flux(); - } -} - -#include "incompressible/continuityErrs.H" - -// Explicitly relax pressure for momentum corrector -p.relax(); - -if (pressureImplicitPorosity) -{ - U -= trTU()&fvc::grad(p); -} -else -{ - U -= trAU()*fvc::grad(p); -} - -U.correctBoundaryConditions(); - -// For closed-volume cases adjust the pressure and density levels -// to obey overall mass continuity -if (closedVolume) -{ - p += (initialMass - fvc::domainIntegrate(psi*p)) - /fvc::domainIntegrate(psi); -} - -rho = thermo.rho(); -rho = max(rho, rhoMin); -rho = min(rho, rhoMax); -rho.relax(); -Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl; diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0 b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/0 similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/0 rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/0 diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/Allrun b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/Allrun similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/Allrun rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/Allrun diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/constant b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/constant similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/constant rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/constant diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/controlDict similarity index 97% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/controlDict index 4b8c2697ad..0a0fcad114 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/controlDict +++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application rhoPorousSimpleFoam; +application rhoPorousMRFSimpleFoam; startFrom startTime; diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSchemes rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctExplicit/system/fvSolution rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/T similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/T rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/T diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/U similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/U rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/U diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/alphat similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/alphat rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/alphat diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/epsilon similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/epsilon rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/epsilon diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/k similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/k rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/k diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/mut similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/mut rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/mut diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/p similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/0/p rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/0/p diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/Allrun similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/Allrun rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/Allrun diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/RASProperties similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/RASProperties rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/RASProperties diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/blockMeshDict.m4 diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/porousZones similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/porousZones rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/porousZones diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/controlDict similarity index 97% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/controlDict index fd58f436b9..04c44d0f90 100644 --- a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/controlDict +++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/controlDict @@ -15,7 +15,7 @@ FoamFile } // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -application rhoPorousSimpleFoam; +application rhoPorousMRFSimpleFoam; startFrom startTime; diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSchemes rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes diff --git a/tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution similarity index 100% rename from tutorials/compressible/rhoPorousSimpleFoam/angledDuctImplicit/system/fvSolution rename to tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution