zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests 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
2020-11-27 11:54:03 +00:00
parent 5369ae2fad f779ddae15
commit 156734571f
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/Make/files
View File

@ -11,6 +11,7 @@ interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModel.C
interfaceCompositionModels/interfaceCompositionModel/interfaceCompositionModelNew.C
interfaceCompositionModels/Henry/Henry.C
interfaceCompositionModels/nonRandomTwoLiquid/nonRandomTwoLiquid.C
interfaceCompositionModels/Raoult/Raoult.C
interfaceCompositionModels/saturated/saturated.C
saturationModels/saturationModel/saturationModel.C

12
applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C
View File

@ -127,11 +127,11 @@ Foam::tmp<Foam::volScalarField> Foam::interfaceCompositionModels::Raoult::Yf
const volScalarField& Tf
) const
{
if (species().contains(speciesName))
if (species().found(speciesName))
{
return
otherComposition().Y(speciesName)
*speciesModels_[speciesName]->Yf(speciesName, Tf);
otherComposition().Y(speciesName)
*speciesModels_[speciesName]->Yf(speciesName, Tf);
}
else
{
@ -147,11 +147,11 @@ Foam::interfaceCompositionModels::Raoult::YfPrime
const volScalarField& Tf
) const
{
if (species().contains(speciesName))
if (species().found(speciesName))
{
return
otherComposition().Y(speciesName)
*speciesModels_[speciesName]->YfPrime(speciesName, Tf);
otherComposition().Y(speciesName)
*speciesModels_[speciesName]->YfPrime(speciesName, Tf);
}
else
{