diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.C b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.C index 52089420b884ce1f297bb2de3201b9e0b34c580f..424c7dc8b98b73f810dbba80c971a8265641adb5 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.C +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -94,7 +94,8 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel turbulence1_ = ( - PhaseCompressibleTurbulenceModel<fluidThermo>::New + ThermalDiffusivity<PhaseCompressibleTurbulenceModel<fluidThermo>> + ::New ( alpha1, rho1, @@ -107,7 +108,8 @@ Foam::compressibleInterPhaseTransportModel::compressibleInterPhaseTransportModel turbulence2_ = ( - PhaseCompressibleTurbulenceModel<fluidThermo>::New + ThermalDiffusivity<PhaseCompressibleTurbulenceModel<fluidThermo>> + ::New ( alpha2, rho2, @@ -141,12 +143,18 @@ Foam::compressibleInterPhaseTransportModel::alphaEff() const if (twoPhaseTransport_) { return - mixture_.alpha1()*mixture_.thermo1().alphaEff(turbulence1_->mut()) - + mixture_.alpha2()*mixture_.thermo2().alphaEff(turbulence2_->mut()); + mixture_.alpha1()*mixture_.thermo1().alphaEff + ( + turbulence1_->alphat() + ) + + mixture_.alpha2()*mixture_.thermo2().alphaEff + ( + turbulence2_->alphat() + ); } else { - return turbulence_->mut(); + return mixture_.alphaEff(turbulence_->alphat()); } } diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H index 72eabf12d1e9542e336ade32fa905c3d801910a3..70a3b1338d2c9635557392367963fa4bd3848d74 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/compressibleInterPhaseTransportModel.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2017 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2017-2018 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -84,10 +84,16 @@ class compressibleInterPhaseTransportModel autoPtr<compressible::turbulenceModel> turbulence_; //- Phase-1 transport model (constructed for two-phase transport) - autoPtr<PhaseCompressibleTurbulenceModel<fluidThermo>> turbulence1_; + autoPtr + < + ThermalDiffusivity<PhaseCompressibleTurbulenceModel<fluidThermo>> + > turbulence1_; //- Phase-2 transport model (constructed for two-phase transport) - autoPtr<PhaseCompressibleTurbulenceModel<fluidThermo>> turbulence2_; + autoPtr + < + ThermalDiffusivity<PhaseCompressibleTurbulenceModel<fluidThermo>> + > turbulence2_; // Private Member Functions diff --git a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C index 69daa03abb63aeb45a9a625c74096610d26d369d..f4a90a275bd769935a00932bac691d2d290e55fb 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C +++ b/applications/solvers/multiphase/compressibleInterFoam/twoPhaseMixtureThermo/twoPhaseMixtureThermo.C @@ -343,8 +343,7 @@ Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureThermo::kappaEff { return alpha1().boundaryField()[patchi]*thermo1_->kappaEff(alphat, patchi) - + alpha2().boundaryField()[patchi]*thermo2_->kappaEff(alphat, patchi) - ; + + alpha2().boundaryField()[patchi]*thermo2_->kappaEff(alphat, patchi); } @@ -367,8 +366,7 @@ Foam::tmp<Foam::scalarField> Foam::twoPhaseMixtureThermo::alphaEff { return alpha1().boundaryField()[patchi]*thermo1_->alphaEff(alphat, patchi) - + alpha2().boundaryField()[patchi]*thermo2_->alphaEff(alphat, patchi) - ; + + alpha2().boundaryField()[patchi]*thermo2_->alphaEff(alphat, patchi); }