From 74d00e99e41d5099f31a8c7834637ada8665d801 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Mon, 23 Nov 2015 14:59:46 +0000 Subject: [PATCH] alphatFixedDmdtWallBoilingWallFunction: Obtain the turbulence model directly from the phase --- ...WallBoilingWallFunctionFvPatchScalarField.C | 18 ++++++------------ ...fixedMultiPhaseHeatFluxFvPatchScalarField.C | 4 ++-- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C index e19f05b7a..58293c7ba 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/alphatFixedDmdtWallBoilingWallFunction/alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.C @@ -24,14 +24,16 @@ License \*---------------------------------------------------------------------------*/ #include "alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField.H" -#include "compressibleTurbulenceModel.H" #include "fvPatchFieldMapper.H" -#include "volFields.H" +#include "addToRunTimeSelectionTable.H" + #include "twoPhaseSystem.H" #include "ThermalPhaseChangePhaseSystem.H" #include "MomentumTransferPhaseSystem.H" +#include "compressibleTurbulenceModel.H" +#include "ThermalDiffusivity.H" +#include "PhaseCompressibleTurbulenceModel.H" #include "wallFvPatch.H" -#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -242,15 +244,7 @@ void alphatFixedDmdtWallBoilingWallFunctionFvPatchScalarField::updateCoeffs() const label patchi = patch().index(); // Retrieve turbulence properties from model - const compressibleTurbulenceModel& turbModel = - db().lookupObject - ( - IOobject::groupName - ( - compressibleTurbulenceModel::propertiesName, - dimensionedInternalField().group() - ) - ); + const phaseCompressibleTurbulenceModel& turbModel = liquid.turbulence(); const scalar Cmu25 = pow025(Cmu_); diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C index ec4e1a248..ee5fa39f9 100644 --- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C +++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/twoPhaseCompressibleTurbulenceModels/derivedFvPatchFields/fixedMultiPhaseHeatFlux/fixedMultiPhaseHeatFluxFvPatchScalarField.C @@ -25,14 +25,14 @@ License #include "fixedMultiPhaseHeatFluxFvPatchScalarField.H" #include "fvPatchFieldMapper.H" -#include "volFields.H" +#include "addToRunTimeSelectionTable.H" + #include "twoPhaseSystem.H" #include "ThermalPhaseChangePhaseSystem.H" #include "MomentumTransferPhaseSystem.H" #include "compressibleTurbulenceModel.H" #include "ThermalDiffusivity.H" #include "PhaseCompressibleTurbulenceModel.H" -#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //