zhyang-dev/OpenFOAM-6
1
0
Fork 0
mirror of https://github.com/OpenFOAM/OpenFOAM-6.git synced 2025-12-08 06:57:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com-OpenFOAM:OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
Henry Weller
2018-06-18 10:25:26 +01:00
parent eca187e025 4d7f98cd53
commit b15724888c
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/phasePair/phasePair/phasePair.C
View File

@ -25,6 +25,7 @@ License
#include "phasePair.H" #include "phasePair.H"
#include "phaseSystem.H" #include "phaseSystem.H"
#include "surfaceTensionModel.H"
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
@ -165,7 +166,11 @@ Foam::tmp<Foam::volScalarField> Foam::phasePair::EoH2() const
Foam::tmp<Foam::volScalarField> Foam::phasePair::sigma() const Foam::tmp<Foam::volScalarField> Foam::phasePair::sigma() const
{ {
return phase1().fluid().sigma(phasePair(phase1(), phase2())); return
phase1().fluid().lookupSubModel<surfaceTensionModel>
(
phasePair(phase1(), phase2())
).sigma();
} }

13
applications/solvers/multiphase/reactingEulerFoam/phaseSystems/populationBalanceModel/populationBalanceModel/populationBalanceModel.C
View File

@ -30,6 +30,7 @@ License
#include "driftModel.H" #include "driftModel.H"
#include "nucleationModel.H" #include "nucleationModel.H"
#include "phaseSystem.H" #include "phaseSystem.H"
#include "surfaceTensionModel.H"
#include "fvmDdt.H" #include "fvmDdt.H"
#include "fvcDdt.H" #include "fvcDdt.H"
#include "fvmSup.H" #include "fvmSup.H"
@ -1152,13 +1153,11 @@ Foam::diameterModels::populationBalanceModel::sigmaWithContinuousPhase
const phaseModel& dispersedPhase const phaseModel& dispersedPhase
) const ) const
{ {
const phasePairKey key return
( fluid_.lookupSubModel<surfaceTensionModel>
dispersedPhase.name(), (
continuousPhase_.name() phasePair(dispersedPhase, continuousPhase_)
); ).sigma();
return fluid_.sigma(key);
} }