diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C index f74e8689f..b737cd032 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.C @@ -37,7 +37,6 @@ Foam::AnisothermalPhaseModel::AnisothermalPhaseModel ) : BasePhaseModel(fluid, phaseName, index), - divU_(NULL), K_ ( IOobject @@ -133,25 +132,6 @@ bool Foam::AnisothermalPhaseModel::compressible() const } -template -const Foam::tmp& -Foam::AnisothermalPhaseModel::divU() const -{ - return divU_; -} - - -template -void -Foam::AnisothermalPhaseModel::divU -( - const tmp& divU -) -{ - divU_ = divU; -} - - template const Foam::volScalarField& Foam::AnisothermalPhaseModel::K() const diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H index a8c4be694..1b7ec2f61 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/AnisothermalPhaseModel/AnisothermalPhaseModel.H @@ -54,9 +54,6 @@ class AnisothermalPhaseModel { // Private data - //- Dilatation rate - tmp divU_; - //- Kinetic energy volScalarField K_; @@ -94,12 +91,6 @@ public: //- Return true if the phase is compressible otherwise false virtual bool compressible() const; - //- Return the phase dilatation rate (d(alpha)/dt + div(alpha*phi)) - virtual const tmp& divU() const; - - //- Set the phase dilatation rate (d(alpha)/dt + div(alpha*phi)) - virtual void divU(const tmp& divU); - //- Return the phase kinetic energy virtual const volScalarField& K() const; }; diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C index 85f31441e..74c6b7b46 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.C @@ -174,6 +174,7 @@ Foam::MovingPhaseModel::MovingPhaseModel fluid.mesh(), dimensionedVector("0", dimAcceleration, vector::zero) ), + divU_(NULL), turbulence_ ( phaseCompressibleTurbulenceModel::New @@ -317,6 +318,25 @@ Foam::MovingPhaseModel::DUDt() const } +template +const Foam::tmp& +Foam::MovingPhaseModel::divU() const +{ + return divU_; +} + + +template +void +Foam::MovingPhaseModel::divU +( + const tmp& divU +) +{ + divU_ = divU; +} + + template Foam::tmp Foam::MovingPhaseModel::continuityError() const diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H index 5b3b320b1..6c5da0bde 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H +++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phaseModel/MovingPhaseModel/MovingPhaseModel.H @@ -80,6 +80,9 @@ class MovingPhaseModel //- Lagrangian acceleration field (needed for virtual-mass) volVectorField DUDt_; + //- Dilatation rate + tmp divU_; + //- Turbulence model autoPtr turbulence_; @@ -151,6 +154,12 @@ public: //- Return the substantive acceleration virtual tmp DUDt() const; + //- Return the phase dilatation rate (d(alpha)/dt + div(alpha*phi)) + virtual const tmp& divU() const; + + //- Set the phase dilatation rate (d(alpha)/dt + div(alpha*phi)) + virtual void divU(const tmp& divU); + //- Constant access the continuity error virtual tmp continuityError() const;