From f779ddae156d0f7be0c93bde5b2d1da01ef0853d Mon Sep 17 00:00:00 2001 From: Will Bainbridge Date: Thu, 26 Nov 2020 08:48:36 +0000 Subject: [PATCH] interfaceCompositionModels/Raoult: Included in build --- .../interfacialCompositionModels/Make/files | 1 + .../interfaceCompositionModels/Raoult/Raoult.C | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/Make/files b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/Make/files index 24000605a1..bb180716a1 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/Make/files +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/Make/files @@ -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 diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C index f5eb54ec48..15792ee0d8 100644 --- a/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C +++ b/applications/solvers/multiphase/multiphaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/Raoult/Raoult.C @@ -127,11 +127,11 @@ Foam::tmp 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 {