diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H b/applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H index 87794f8a47661622e2e03b4e0deaf0edd2d068cd..b24e0a8d5ddc00eea526690389b33fb62163c35c 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 d4c5bc282827d9be51b47f46630cac5edc022b9e..33916c7b39c519b09755699c6d36314c30a5859d 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 0000000000000000000000000000000000000000..d4792428af5f610d9cdfb8ef3ecc1c34c89abc50 --- /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 c600b1ca0bf90734ddf3a48ad097238cec6c6f42..c0e087b536c3ffdffb01214e7204b13abfba8a46 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 8640b360e086df19dc8c7408872772ce5adfd2d8..78a96429f6da7e213139d7c33c387ae137bd6642 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 0000000000000000000000000000000000000000..44b391a7b5585edafef64da626d5ce1126c8d436 --- /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<fvScalarMatrix> 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<fvScalarMatrix> 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 b0a99e330645375ae55c96f4ca7c65fcdf8db12b..83898240ffc4017e79fb7822e073c6a9e9467777 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 d108d0246ea8291699b0accf03dc7c4f1ffabb44..0000000000000000000000000000000000000000 --- 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 fe69384c8b3c1af3a0519382be101f27e13eaa44..0000000000000000000000000000000000000000 --- 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<fvScalarMatrix> 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/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C index 20d8997b22774b985d08b3f96235667778aa2156..457517b0cdab042f17e81e983d3f3565c97e0af0 100644 --- a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C +++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C @@ -130,7 +130,7 @@ Foam::LocalInteraction<CloudType>::LocalInteraction ) : PatchInteractionModel<CloudType>(dict, cloud, typeName), - patchData_(cloud.mesh(), this->coeffDict().lookup("patches")), + patchData_(cloud.mesh(), this->coeffDict()), patchIDs_(patchData_.size()), nEscape0_(patchData_.size(), 0), massEscape0_(patchData_.size(), 0.0), diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H new file mode 100644 index 0000000000000000000000000000000000000000..c31e750de224bb4ecd866bbb8eabb41c8b07d774 --- /dev/null +++ b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRate.H @@ -0,0 +1,110 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Class + Foam::infiniteReactionRate + +Description + infinite reaction rate. + +SourceFiles + infiniteReactionRateI.H + +\*---------------------------------------------------------------------------*/ + +#ifndef infiniteReactionRate_H +#define infiniteReactionRate_H + +#include "scalarField.H" +#include "typeInfo.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +namespace Foam +{ + +/*---------------------------------------------------------------------------*\ + Class infiniteReactionRate Declaration +\*---------------------------------------------------------------------------*/ + +class infiniteReactionRate +{ +public: + + // Constructors + + //- Null constructor + inline infiniteReactionRate + (); + + //- Construct from Istream + inline infiniteReactionRate + ( + const speciesTable& species, + const dictionary& dict + ); + + + // Member Functions + + //- Return the type name + static word type() + { + return "infinite"; + } + + inline scalar operator() + ( + const scalar T, + const scalar p, + const scalarField& c + ) const; + + //- Write to stream + inline void write(Ostream& os) const; + + + // Ostream Operator + + inline friend Ostream& operator<< + ( + Ostream&, + const infiniteReactionRate& + ); +}; + + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +} // End namespace Foam + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#include "infiniteReactionRateI.H" + +// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // + +#endif + +// ************************************************************************* // diff --git a/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H new file mode 100644 index 0000000000000000000000000000000000000000..bfb09b32bf4d3f32aa0f663f0b5d7f3eed8dd62c --- /dev/null +++ b/src/thermophysicalModels/specie/reaction/reactionRate/infiniteReactionRate/infiniteReactionRateI.H @@ -0,0 +1,70 @@ +/*---------------------------------------------------------------------------*\ + ========= | + \\ / F ield | OpenFOAM: The Open Source CFD Toolbox + \\ / O peration | + \\ / A nd | Copyright (C) 2009-2011 OpenCFD Ltd. + \\/ M anipulation | +------------------------------------------------------------------------------- +License + This file is part of OpenFOAM. + + OpenFOAM is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2 of the License, or (at your + option) any later version. + + OpenFOAM is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + for more details. + + You should have received a copy of the GNU General Public License + along with OpenFOAM; if not, write to the Free Software Foundation, + Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +\*---------------------------------------------------------------------------*/ + +// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // + +inline Foam::infiniteReactionRate::infiniteReactionRate() +{} + + +inline Foam::infiniteReactionRate::infiniteReactionRate +( + const speciesTable&, + const dictionary& +) +{} + + +inline void Foam::infiniteReactionRate::write(Ostream& os) const +{} + + +// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // + +inline Foam::scalar Foam::infiniteReactionRate::operator() +( + const scalar, + const scalar, + const scalarField& +) const +{ + return (1); +} + + +inline Foam::Ostream& Foam::operator<< +( + Ostream& os, + const infiniteReactionRate& rr +) +{ + os << token::BEGIN_LIST + << token::END_LIST; + return os; +} + + +// ************************************************************************* // diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C index f8cac0a27190838ec589957ded03c715bfa8d497..450eaf2371013e5e0d56b14d160cb919adf212db 100644 --- a/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.C +++ b/src/thermophysicalModels/specie/reaction/reactions/makeChemkinReactions.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 @@ -27,16 +27,19 @@ License #include "makeReactionThermo.H" #include "ArrheniusReactionRate.H" +#include "infiniteReactionRate.H" +#include "LandauTellerReactionRate.H" #include "thirdBodyArrheniusReactionRate.H" -#include "FallOffReactionRate.H" + #include "ChemicallyActivatedReactionRate.H" -#include "LindemannFallOffFunction.H" -#include "TroeFallOffFunction.H" -#include "SRIFallOffFunction.H" -#include "LandauTellerReactionRate.H" #include "JanevReactionRate.H" #include "powerSeriesReactionRate.H" +#include "FallOffReactionRate.H" +#include "LindemannFallOffFunction.H" +#include "SRIFallOffFunction.H" +#include "TroeFallOffFunction.H" + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,8 +56,10 @@ defineTemplateRunTimeSelectionTable(gasReaction, dictionary); // * * * * * * * * * * * * * Make CHEMKIN reactions * * * * * * * * * * * * // makeIRNReactions(gasThermoPhysics, ArrheniusReactionRate) +makeIRNReactions(gasThermoPhysics, infiniteReactionRate) makeIRNReactions(gasThermoPhysics, LandauTellerReactionRate) makeIRNReactions(gasThermoPhysics, thirdBodyArrheniusReactionRate) + makeIRReactions(gasThermoPhysics, JanevReactionRate) makeIRReactions(gasThermoPhysics, powerSeriesReactionRate) diff --git a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C index d6f0e84dcdb581687e39c89e69e97a8f1c43d715..9006dc2b15ed2199418b9fee920fe1f51b7e4e77 100644 --- a/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.C +++ b/src/thermophysicalModels/specie/reaction/reactions/makeReactionThermoReactions.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 @@ -27,16 +27,19 @@ License #include "makeReactionThermo.H" #include "ArrheniusReactionRate.H" +#include "infiniteReactionRate.H" +#include "LandauTellerReactionRate.H" #include "thirdBodyArrheniusReactionRate.H" -#include "FallOffReactionRate.H" + #include "ChemicallyActivatedReactionRate.H" -#include "LindemannFallOffFunction.H" -#include "TroeFallOffFunction.H" -#include "SRIFallOffFunction.H" -#include "LandauTellerReactionRate.H" #include "JanevReactionRate.H" #include "powerSeriesReactionRate.H" +#include "FallOffReactionRate.H" +#include "LindemannFallOffFunction.H" +#include "SRIFallOffFunction.H" +#include "TroeFallOffFunction.H" + // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -53,8 +56,10 @@ defineTemplateRunTimeSelectionTable(icoPoly8Reaction, dictionary); // * * * * * * * * * * * * * Make CHEMKIN reactions * * * * * * * * * * * * // makeIRNReactions(icoPoly8ThermoPhysics, ArrheniusReactionRate) +makeIRNReactions(icoPoly8ThermoPhysics, infiniteReactionRate) makeIRNReactions(icoPoly8ThermoPhysics, LandauTellerReactionRate) makeIRNReactions(icoPoly8ThermoPhysics, thirdBodyArrheniusReactionRate) + makeIRReactions(icoPoly8ThermoPhysics, JanevReactionRate) makeIRReactions(icoPoly8ThermoPhysics, powerSeriesReactionRate) 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 4b8c2697ad041de74c52a155ead5e551ccf8a5fd..0a0fcad1147a3f78e23964075133ebfeb0442ac6 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 fd58f436b9f050f323032d5f5d906304ef504440..04c44d0f9065f0f651d1623b81b1a6054c91b3a9 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 diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties index 8b4ca414ad9d1e1af27ab0c99832907a5217c7ab..ff84a8b26cb94b6bdcc5d2b67cbe908d646a766c 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/coalCloud1Properties @@ -26,10 +26,10 @@ solution { schemes { - rho explicit; - U explicit; - Yi explicit; - hs explicit; + rho explicit 1; + U explicit 1; + Yi explicit 1; + hs explicit 1; } } diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties index 7676293a7538f163a797f4354a7207fccaa913a7..a70e2ed0b92777e4640c50616a0152b83b2bec39 100644 --- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties +++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/constant/limestoneCloud1Properties @@ -26,8 +26,8 @@ solution { schemes { - U explicit; - hs explicit; + U explicit 1; + hs explicit 1; } } diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties index c1025505b5359614840f228155d46fcb22f61181..60ed5924dff9fe89667c41a8b39cce7f496402f6 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/constant/reactingCloud1Properties @@ -26,10 +26,10 @@ solution { schemes { - rho explicit; - U explicit; - Yi explicit; - hs explicit; + rho explicit 1; + U explicit 1; + Yi explicit 1; + hs explicit 1; } } @@ -125,15 +125,7 @@ subModels { patches ( - walls - { - type rebound; - } - cycLeft_half0 - { - type rebound; - } - cycLeft_half1 + "(walls|cyc.*)" { type rebound; } diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties index db94abd0f832b7dc907dc9e2d8158f893c0fd397..2e886ead21a43f556d796c2bd6b39596ce2bfda2 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/constant/reactingCloud1Properties @@ -26,10 +26,10 @@ solution { schemes { - rho explicit; - U explicit; - Yi explicit; - hs explicit; + rho explicit 1; + U explicit 1; + Yi explicit 1; + hs explicit 1; } } diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution index 4d968d60c59bf6ef8579fe910b489e2a45a497e5..5151a8d8f9bbb47eb59907b58ff65167f85f2e6f 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSolution @@ -34,7 +34,7 @@ solvers agglomerator faceAreaPair; mergeLevels 1; - maxIter 100; + maxIter 20; }; pFinal { diff --git a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties index 4d8a02f0bb2b882dd5e86a710c219508f2b5d9b8..31418b6c0d172f07bbe8ddb497020825c485d06a 100644 --- a/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/constant/reactingCloud1Properties @@ -26,10 +26,10 @@ solution { schemes { - rho explicit; - U explicit; - Yi explicit; - hs explicit; + rho explicit 1; + U explicit 1; + Yi explicit 1; + hs explicit 1; } } diff --git a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties index f49cbb914f303ecb5999cab12517e567ef307bdd..a249360ee3a3b108d855337c30c5873f313fd6d8 100644 --- a/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties +++ b/tutorials/lagrangian/reactingParcelFoam/evaporationTest/constant/reactingCloud1Properties @@ -26,10 +26,10 @@ solution { schemes { - rho explicit; - U explicit; - Yi explicit; - hs explicit; + rho explicit 1; + U explicit 1; + Yi explicit 1; + hs explicit 1; } } diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options index bb5791463cbc9145de63da409ea861038e242ff8..e9e6907d810b423505d5164acee0b1caeea8d408 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/rhoPisoTwinParcelFoam/Make/options @@ -14,7 +14,8 @@ EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude \ -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \ -I$(LIB_SRC)/meshTools/lnInclude \ - -I$(LIB_SRC)/surfaceFilmModels/lnInclude + -I$(LIB_SRC)/regionModels/regionModel/lnInclude \ + -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude EXE_LIBS = \ -llagrangian \ @@ -29,4 +30,5 @@ EXE_LIBS = \ -lradiationModels \ -lcompressibleRASModels \ -lcompressibleLESModels \ + -lregionModels \ -lsurfaceFilmModels diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties index f5de50c4ca95ed079e322cfff590d0c2e0104dfe..85d0ee01d2117aeea0b0fdbf29763329ea188ddb 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/kinematicCloud1Properties @@ -26,7 +26,7 @@ solution { schemes { - U explicit; + U explicit 1; } } diff --git a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties index 01cc6bd7b0b4be50f868601b8d6e9f9e669f8c78..d7d6897c269c73faa1c3199652d70009e04807b4 100644 --- a/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties +++ b/tutorials/lagrangian/rhoPisoTwinParcelFoam/simplifiedSiwek/constant/thermoCloud1Properties @@ -26,8 +26,8 @@ solution { schemes { - U explicit; - hs explicit; + U explicit 1; + hs explicit 1; } }