From a6456cdd7394ced5a76b4bdfc8331e4527989974 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Wed, 7 Dec 2022 14:45:49 +0000 Subject: [PATCH] solvers/modules: turbulence -> momentumTransport Momentum transport in the modular solvers is generalised and run-time selectable, supporting laminar, generalised laminar or non-Newtonian as well LES or RAS turbulence modelling so it is clearer to name the momentum transport model instance 'momentumTransport' rather than 'turbulence'. --- ...leInterPhaseThermophysicalTransportModel.C | 24 +++++++++---------- .../compressibleInterPhaseTransportModel.C | 20 ++++++++-------- .../compressibleInterPhaseTransportModel.H | 6 ++--- .../VoFTurbulenceDamping.C | 22 ++++++++++------- .../VoFTurbulenceDamping.H | 16 ++++++------- applications/solvers/modules/fluid/fluid.C | 6 ++++- .../incompressibleFluid/incompressibleFluid.C | 6 ++--- .../incompressibleFluid/incompressibleFluid.H | 2 +- .../incompressibleFluid/momentumPredictor.C | 2 +- .../modules/isothermalFluid/isothermalFluid.C | 6 ++--- .../modules/isothermalFluid/isothermalFluid.H | 2 +- .../isothermalFluid/momentumPredictor.C | 2 +- .../multicomponentFluid/multicomponentFluid.C | 4 ++-- .../MovingPhaseModel/MovingPhaseModel.C | 14 +++++------ .../MovingPhaseModel/MovingPhaseModel.H | 14 ++++++----- .../ReactingPhaseModel/ReactingPhaseModel.C | 2 +- .../phaseModel/phaseModel/phaseModel.H | 2 +- .../phaseSystems/phaseSystem/phaseSystem.H | 2 +- .../populationBalanceModel.H | 2 +- 19 files changed, 82 insertions(+), 72 deletions(-) diff --git a/applications/solvers/modules/compressibleVoF/compressibleInterPhaseThermophysicalTransportModel/compressibleInterPhaseThermophysicalTransportModel.C b/applications/solvers/modules/compressibleVoF/compressibleInterPhaseThermophysicalTransportModel/compressibleInterPhaseThermophysicalTransportModel.C index 5cc6633faf..d26daf7630 100644 --- a/applications/solvers/modules/compressibleVoF/compressibleInterPhaseThermophysicalTransportModel/compressibleInterPhaseThermophysicalTransportModel.C +++ b/applications/solvers/modules/compressibleVoF/compressibleInterPhaseThermophysicalTransportModel/compressibleInterPhaseThermophysicalTransportModel.C @@ -66,13 +66,13 @@ Foam::compressibleInterPhaseThermophysicalTransportModel::kappaEff() const *( mixture_.thermo1().kappa() + mixture_.thermo1().rho()*mixture_.thermo1().Cp() - *momentumTransport_.turbulence1_->nut() + *momentumTransport_.momentumTransport1_->nut() ) + mixture_.alpha2() *( mixture_.thermo2().kappa() + mixture_.thermo2().rho()*mixture_.thermo2().Cp() - *momentumTransport_.turbulence2_->nut() + *momentumTransport_.momentumTransport2_->nut() ); } else @@ -82,13 +82,13 @@ Foam::compressibleInterPhaseThermophysicalTransportModel::kappaEff() const *( mixture_.thermo1().kappa() + mixture_.thermo1().rho()*mixture_.thermo1().Cp() - *momentumTransport_.turbulence_->nut() + *momentumTransport_.mixtureMomentumTransport_->nut() ) + mixture_.alpha2() *( mixture_.thermo2().kappa() + mixture_.thermo2().rho()*mixture_.thermo2().Cp() - *momentumTransport_.turbulence_->nut() + *momentumTransport_.mixtureMomentumTransport_->nut() ); } } @@ -110,13 +110,13 @@ Foam::compressibleInterPhaseThermophysicalTransportModel::kappaEff mixture_.thermo1().kappa().boundaryField()[patchi] + mixture_.thermo1().rho(patchi) *mixture_.thermo1().Cp().boundaryField()[patchi] - *momentumTransport_.turbulence1_->nut(patchi) + *momentumTransport_.momentumTransport1_->nut(patchi) ) + mixture_.alpha2().boundaryField()[patchi] *( mixture_.thermo2().kappa().boundaryField()[patchi] + mixture_.thermo2().rho(patchi)*mixture_.thermo2().Cp() - *momentumTransport_.turbulence2_->nut(patchi) + *momentumTransport_.momentumTransport2_->nut(patchi) ); } else @@ -126,14 +126,14 @@ Foam::compressibleInterPhaseThermophysicalTransportModel::kappaEff *( mixture_.thermo1().kappa().boundaryField()[patchi] + mixture_.thermo1().rho(patchi)*mixture_.thermo1().Cp() - *momentumTransport_.turbulence_->nut(patchi) + *momentumTransport_.mixtureMomentumTransport_->nut(patchi) ) + mixture_.alpha2() *( mixture_.thermo2().kappa().boundaryField()[patchi] + mixture_.thermo2().rho(patchi) *mixture_.thermo2().Cp().boundaryField()[patchi] - *momentumTransport_.turbulence_->nut(patchi) + *momentumTransport_.mixtureMomentumTransport_->nut(patchi) ); } } @@ -151,13 +151,13 @@ Foam::compressibleInterPhaseThermophysicalTransportModel::alphaEff() const *( mixture_.thermo1().kappa() + mixture_.thermo1().rho()*mixture_.thermo1().Cp() - *momentumTransport_.turbulence1_->nut() + *momentumTransport_.momentumTransport1_->nut() )/mixture_.thermo1().Cv() + mixture_.alpha2() *( mixture_.thermo2().kappa() + mixture_.thermo2().rho()*mixture_.thermo2().Cp() - *momentumTransport_.turbulence2_->nut() + *momentumTransport_.momentumTransport2_->nut() )/mixture_.thermo2().Cv(); } else @@ -167,13 +167,13 @@ Foam::compressibleInterPhaseThermophysicalTransportModel::alphaEff() const *( mixture_.thermo1().kappa() + mixture_.thermo1().rho()*mixture_.thermo1().Cp() - *momentumTransport_.turbulence_->nut() + *momentumTransport_.mixtureMomentumTransport_->nut() )/mixture_.thermo1().Cv() + mixture_.alpha2() *( mixture_.thermo2().kappa() + mixture_.thermo2().rho()*mixture_.thermo2().Cp() - *momentumTransport_.turbulence_->nut() + *momentumTransport_.mixtureMomentumTransport_->nut() )/mixture_.thermo2().Cv(); } } diff --git a/applications/solvers/modules/compressibleVoF/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.C b/applications/solvers/modules/compressibleVoF/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.C index 13ccfa8b54..4b653a5060 100644 --- a/applications/solvers/modules/compressibleVoF/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.C +++ b/applications/solvers/modules/compressibleVoF/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.C @@ -92,7 +92,7 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel ) ); - turbulence1_ = + momentumTransport1_ = ( phaseCompressible::momentumTransportModel::New ( @@ -105,7 +105,7 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel ) ); - turbulence2_ = + momentumTransport2_ = ( phaseCompressible::momentumTransportModel::New ( @@ -120,7 +120,7 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel } else { - turbulence_ = compressible::momentumTransportModel::New + mixtureMomentumTransport_ = compressible::momentumTransportModel::New ( rho, U, @@ -128,7 +128,7 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel mixture ); - turbulence_->validate(); + mixtureMomentumTransport_->validate(); } } @@ -144,12 +144,12 @@ Foam::compressibleInterPhaseTransportModel::divDevTau if (twoPhaseTransport_) { return - turbulence1_->divDevTau(U) - + turbulence2_->divDevTau(U); + momentumTransport1_->divDevTau(U) + + momentumTransport2_->divDevTau(U); } else { - return turbulence_->divDevTau(U); + return mixtureMomentumTransport_->divDevTau(U); } } @@ -171,12 +171,12 @@ void Foam::compressibleInterPhaseTransportModel::correct() { if (twoPhaseTransport_) { - turbulence1_->correct(); - turbulence2_->correct(); + momentumTransport1_->correct(); + momentumTransport2_->correct(); } else { - turbulence_->correct(); + mixtureMomentumTransport_->correct(); } } diff --git a/applications/solvers/modules/compressibleVoF/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.H b/applications/solvers/modules/compressibleVoF/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.H index b03d7359d4..6494447666 100644 --- a/applications/solvers/modules/compressibleVoF/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.H +++ b/applications/solvers/modules/compressibleVoF/compressibleInterPhaseTransportModel/compressibleInterPhaseTransportModel.H @@ -83,13 +83,13 @@ class compressibleInterPhaseTransportModel tmp alphaRhoPhi2_; //- Mixture transport model (constructed for mixture transport) - autoPtr turbulence_; + autoPtr mixtureMomentumTransport_; //- Phase-1 transport model (constructed for two-phase transport) - autoPtr turbulence1_; + autoPtr momentumTransport1_; //- Phase-2 transport model (constructed for two-phase transport) - autoPtr turbulence2_; + autoPtr momentumTransport2_; friend class compressibleInterPhaseThermophysicalTransportModel; diff --git a/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.C b/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.C index 93e10ae00d..dc0c3250d8 100644 --- a/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.C +++ b/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.C @@ -72,7 +72,7 @@ Foam::fv::compressible::VoFTurbulenceDamping::VoFTurbulenceDamping ) ), interface_(mixture_), - turbulence_ + momentumTransport_ ( mesh.lookupType(phaseName_) ), @@ -86,22 +86,26 @@ Foam::fv::compressible::VoFTurbulenceDamping::VoFTurbulenceDamping if (mesh.foundObject(epsilonName)) { fieldName_ = epsilonName; - C2_.read(turbulence_.coeffDict()); + C2_.read(momentumTransport_.coeffDict()); } else if (mesh.foundObject(omegaName)) { fieldName_ = omegaName; - betaStar_.read(turbulence_.coeffDict()); + betaStar_.read(momentumTransport_.coeffDict()); // Read beta for k-omega models or beta1 for k-omega SST - if (turbulence_.coeffDict().found("beta")) + if (momentumTransport_.coeffDict().found("beta")) { - beta_.read(turbulence_.coeffDict()); + beta_.read(momentumTransport_.coeffDict()); } else { - beta_ = - dimensionedScalar("beta1", dimless, turbulence_.coeffDict()); + beta_ = dimensionedScalar + ( + "beta1", + dimless, + momentumTransport_.coeffDict() + ); } } else @@ -142,7 +146,7 @@ void Foam::fv::compressible::VoFTurbulenceDamping::addSup if (fieldName == "epsilon") { - eqn += interface_.fraction()*C2_*aRhoSqrnu*turbulence_.k()() + eqn += interface_.fraction()*C2_*aRhoSqrnu*momentumTransport_.k()() /pow4(delta_); } else if (fieldName == "omega") @@ -193,7 +197,7 @@ void Foam::fv::compressible::VoFTurbulenceDamping::addSup if (fieldName == IOobject::groupName("epsilon", phaseName_)) { - eqn += interface_.fraction()*C2_*taRhoSqrnu*turbulence_.k()() + eqn += interface_.fraction()*C2_*taRhoSqrnu*momentumTransport_.k()() /pow4(delta_); } else if (fieldName == IOobject::groupName("omega", phaseName_)) diff --git a/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H b/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H index 00af4dc97d..15652caa9d 100644 --- a/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H +++ b/applications/solvers/modules/compressibleVoF/fvModels/VoFTurbulenceDamping/VoFTurbulenceDamping.H @@ -25,17 +25,17 @@ Class Foam::fv::compressible::VoFTurbulenceDamping Description - Free-surface turbulence damping function + Free-surface momentumTransport damping function Adds an extra source term to the mixture or phase epsilon or omega - equation to reduce turbulence generated near a free-surface. The + equation to reduce momentumTransport generated near a free-surface. The implementation is based on Reference: \verbatim Frederix, E. M. A., Mathur, A., Dovizio, D., Geurts, B. J., & Komen, E. M. J. (2018). - Reynolds-averaged modeling of turbulence damping + Reynolds-averaged modeling of momentumTransport damping near a large-scale interface in two-phase flow. Nuclear engineering and design, 333, 122-130. \endverbatim @@ -46,7 +46,7 @@ Description be set appropriately for the case by performing test runs and comparing with known results. Clearly this model is far from general and more research is needed in order that \c delta can be obtained directly from the interface - flow and turbulence conditions. + flow and momentumTransport conditions. Usage Example usage: @@ -57,7 +57,7 @@ Usage libs ("libcompressibleVoFTurbulenceDamping.so"); - // Interface turbulence damping length scale + // Interface momentumTransport damping length scale // This is a required input as described in section 3.3 of the paper delta 1e-4; @@ -106,7 +106,7 @@ class VoFTurbulenceDamping //- Field name word fieldName_; - //- Interface turbulence damping length scale + //- Interface momentumTransport damping length scale // This is a required input as described in section 3.3 of the paper dimensionedScalar delta_; @@ -116,8 +116,8 @@ class VoFTurbulenceDamping //- Reference to the interface properties const interfaceProperties& interface_; - //- Reference to the mixture turbulence model - const compressibleMomentumTransportModel& turbulence_; + //- Reference to the mixture momentumTransport model + const compressibleMomentumTransportModel& momentumTransport_; // Turbulence model coefficients diff --git a/applications/solvers/modules/fluid/fluid.C b/applications/solvers/modules/fluid/fluid.C index 9305283bf1..32a85a8018 100644 --- a/applications/solvers/modules/fluid/fluid.C +++ b/applications/solvers/modules/fluid/fluid.C @@ -46,7 +46,11 @@ Foam::solvers::fluid::fluid(fvMesh& mesh) thermophysicalTransport ( - fluidThermoThermophysicalTransportModel::New(turbulence(), thermo) + fluidThermoThermophysicalTransportModel::New + ( + momentumTransport(), + thermo + ) ) {} diff --git a/applications/solvers/modules/incompressibleFluid/incompressibleFluid.C b/applications/solvers/modules/incompressibleFluid/incompressibleFluid.C index 6296fd8fde..39cad573d4 100644 --- a/applications/solvers/modules/incompressibleFluid/incompressibleFluid.C +++ b/applications/solvers/modules/incompressibleFluid/incompressibleFluid.C @@ -102,7 +102,7 @@ Foam::solvers::incompressibleFluid::incompressibleFluid(fvMesh& mesh) viscosity(viscosityModel::New(mesh)), - turbulence + momentumTransport ( incompressible::momentumTransportModel::New ( @@ -116,7 +116,7 @@ Foam::solvers::incompressibleFluid::incompressibleFluid(fvMesh& mesh) { mesh.schemes().setFluxRequired(p.name()); - turbulence->validate(); + momentumTransport->validate(); if (mesh.dynamic()) { @@ -220,7 +220,7 @@ void Foam::solvers::incompressibleFluid::momentumTransportCorrector() if (pimple.transportCorr()) { viscosity->correct(); - turbulence->correct(); + momentumTransport->correct(); } } diff --git a/applications/solvers/modules/incompressibleFluid/incompressibleFluid.H b/applications/solvers/modules/incompressibleFluid/incompressibleFluid.H index 8ea6142af3..0281e5e66d 100644 --- a/applications/solvers/modules/incompressibleFluid/incompressibleFluid.H +++ b/applications/solvers/modules/incompressibleFluid/incompressibleFluid.H @@ -101,7 +101,7 @@ protected: autoPtr viscosity; //- Pointer to the momentum transport model - autoPtr turbulence; + autoPtr momentumTransport; // Continuity properties diff --git a/applications/solvers/modules/incompressibleFluid/momentumPredictor.C b/applications/solvers/modules/incompressibleFluid/momentumPredictor.C index 48796235e3..a003c422fb 100644 --- a/applications/solvers/modules/incompressibleFluid/momentumPredictor.C +++ b/applications/solvers/modules/incompressibleFluid/momentumPredictor.C @@ -33,7 +33,7 @@ void Foam::solvers::incompressibleFluid::momentumPredictor() ( fvm::ddt(U) + fvm::div(phi, U) + MRF.DDt(U) - + turbulence->divDevSigma(U) + + momentumTransport->divDevSigma(U) == fvModels().source(U) ); diff --git a/applications/solvers/modules/isothermalFluid/isothermalFluid.C b/applications/solvers/modules/isothermalFluid/isothermalFluid.C index 948b23ff49..90fd6f37b1 100644 --- a/applications/solvers/modules/isothermalFluid/isothermalFluid.C +++ b/applications/solvers/modules/isothermalFluid/isothermalFluid.C @@ -160,7 +160,7 @@ Foam::solvers::isothermalFluid::isothermalFluid K("K", 0.5*magSqr(U)), - turbulence + momentumTransport ( compressible::momentumTransportModel::New ( @@ -180,7 +180,7 @@ Foam::solvers::isothermalFluid::isothermalFluid thermo.validate("isothermalFluid", "h", "e"); mesh.schemes().setFluxRequired(p.name()); - turbulence->validate(); + momentumTransport->validate(); if (buoyancy.valid()) { @@ -354,7 +354,7 @@ void Foam::solvers::isothermalFluid::momentumTransportCorrector() { if (pimple.transportCorr()) { - turbulence->correct(); + momentumTransport->correct(); } } diff --git a/applications/solvers/modules/isothermalFluid/isothermalFluid.H b/applications/solvers/modules/isothermalFluid/isothermalFluid.H index 1b1f4fd3fb..3cc89f95e7 100644 --- a/applications/solvers/modules/isothermalFluid/isothermalFluid.H +++ b/applications/solvers/modules/isothermalFluid/isothermalFluid.H @@ -130,7 +130,7 @@ protected: // Momentum transport //- Pointer to the momentum transport model - autoPtr turbulence; + autoPtr momentumTransport; // Continuity properties diff --git a/applications/solvers/modules/isothermalFluid/momentumPredictor.C b/applications/solvers/modules/isothermalFluid/momentumPredictor.C index 75452a97b0..b55d9dcaee 100644 --- a/applications/solvers/modules/isothermalFluid/momentumPredictor.C +++ b/applications/solvers/modules/isothermalFluid/momentumPredictor.C @@ -33,7 +33,7 @@ void Foam::solvers::isothermalFluid::momentumPredictor() ( fvm::ddt(rho, U) + fvm::div(phi, U) + MRF.DDt(rho, U) - + turbulence->divDevTau(U) + + momentumTransport->divDevTau(U) == fvModels().source(rho, U) ); diff --git a/applications/solvers/modules/multicomponentFluid/multicomponentFluid.C b/applications/solvers/modules/multicomponentFluid/multicomponentFluid.C index 5af25e7721..10b1ee676a 100644 --- a/applications/solvers/modules/multicomponentFluid/multicomponentFluid.C +++ b/applications/solvers/modules/multicomponentFluid/multicomponentFluid.C @@ -55,13 +55,13 @@ Foam::solvers::multicomponentFluid::multicomponentFluid(fvMesh& mesh) Y(composition.Y()), - reaction(combustionModel::New(thermo, turbulence())), + reaction(combustionModel::New(thermo, momentumTransport())), thermophysicalTransport ( fluidMulticomponentThermophysicalTransportModel::New ( - turbulence(), + momentumTransport(), thermo ) ) diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C index 21bcf86e41..ba1d2623ff 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C @@ -161,7 +161,7 @@ Foam::MovingPhaseModel::MovingPhaseModel DUDt_(nullptr), DUDtf_(nullptr), divU_(nullptr), - turbulence_ + momentumTransport_ ( phaseCompressible::momentumTransportModel::New ( @@ -179,7 +179,7 @@ Foam::MovingPhaseModel::MovingPhaseModel < phaseCompressible::momentumTransportModel, transportThermoModel - >::New(turbulence_, this->thermo_) + >::New(momentumTransport_, this->thermo_) ), continuityError_ ( @@ -273,7 +273,7 @@ void Foam::MovingPhaseModel::correctTurbulence() { BasePhaseModel::correctTurbulence(); - turbulence_->correct(); + momentumTransport_->correct(); } @@ -324,7 +324,7 @@ Foam::MovingPhaseModel::UEqn() + fvm::div(alphaRhoPhi_, U_) + fvm::SuSp(-this->continuityError(), U_) + this->fluid().MRF().DDt(alpha*rho, U_) - + turbulence_->divDevTau(U_) + + momentumTransport_->divDevTau(U_) ); } @@ -343,7 +343,7 @@ Foam::MovingPhaseModel::UfEqn() fvm::div(alphaRhoPhi_, U_) + fvm::SuSp(fvc::ddt(*this, rho) - this->continuityError(), U_) + this->fluid().MRF().DDt(alpha*rho, U_) - + turbulence_->divDevTau(U_) + + momentumTransport_->divDevTau(U_) ); } @@ -534,7 +534,7 @@ template Foam::tmp Foam::MovingPhaseModel::k() const { - return turbulence_->k(); + return momentumTransport_->k(); } @@ -542,7 +542,7 @@ template Foam::tmp Foam::MovingPhaseModel::pPrime() const { - return turbulence_->pPrime(); + return momentumTransport_->pPrime(); } diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H index 9551abfa08..241827d322 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H @@ -26,9 +26,10 @@ Class Description Class which represents a moving fluid phase. Holds the velocity, fluxes and - turbulence model and can generate the momentum equation. The interface is - quite restrictive as it also has to support an equivalent stationary model, - which does not store motion fields or a turbulence model. + momentumTransport model and can generate the momentum equation. The + interface is quite restrictive as it also has to support an equivalent + stationary model, which does not store motion fields or a momentumTransport + model. Possible future extensions include separating the turbulent functionality into another layer. @@ -121,7 +122,7 @@ protected: tmp divU_; //- Turbulence model - autoPtr turbulence_; + autoPtr momentumTransport_; //- Thermophysical transport model autoPtr @@ -167,7 +168,8 @@ public: // Member Functions - //- Correct the phase properties other than the thermo and turbulence + //- Correct the phase properties other than the thermo + // and momentumTransport virtual void correct(); //- Correct the continuity error @@ -176,7 +178,7 @@ public: //- Correct the kinematics virtual void correctKinematics(); - //- Correct the turbulence + //- Correct the momentumTransport virtual void correctTurbulence(); //- Correct the energy transport e.g. alphat diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C index 311df03ef2..dea5aaf0d7 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/ReactingPhaseModel/ReactingPhaseModel.C @@ -40,7 +40,7 @@ Foam::ReactingPhaseModel::ReactingPhaseModel ) : BasePhaseModel(fluid, phaseName, referencePhase, index), - reaction_(combustionModel::New(this->thermo_(), this->turbulence_())) + reaction_(combustionModel::New(this->thermo_(), this->momentumTransport_())) {} diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.H index 6c631750c0..54d420a3b7 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseModel/phaseModel/phaseModel.H @@ -215,7 +215,7 @@ public: //- Correct the species concentrations virtual void correctSpecies(); - //- Correct the turbulence + //- Correct the momentumTransport virtual void correctTurbulence(); //- Correct the energy transport diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.H index bcfdea6623..84cd2c2d43 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/phaseSystem/phaseSystem.H @@ -635,7 +635,7 @@ public: //- Correct the species mass fractions virtual void correctSpecies(); - //- Correct the turbulence + //- Correct the momentumTransport virtual void correctTurbulence(); //- Correct the energy transport e.g. alphat diff --git a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H index d0a0d481bb..f551cc5c37 100644 --- a/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H +++ b/applications/solvers/modules/multiphaseEuler/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.H @@ -488,7 +488,7 @@ public: const phaseModel& dispersedPhase ) const; - //- Return reference to turbulence model of the continuous phase + //- Return reference to momentumTransport model of the continuous phase const phaseCompressible::momentumTransportModel& continuousTurbulence() const;