From ce73ec45f9f222a76a14e79180ea4c192787a822 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Sun, 10 Jul 2022 19:39:57 +0100 Subject: [PATCH] Updates for single-precision compilation --- .../MichaelsBolger/MichaelsBolger.C | 6 ++++-- src/twoPhaseModels/twoPhaseMixture/MPLIC/MPLICcell.C | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/MichaelsBolger/MichaelsBolger.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/MichaelsBolger/MichaelsBolger.C index 6cc4a62b62..2277bce35c 100644 --- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/MichaelsBolger/MichaelsBolger.C +++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/MichaelsBolger/MichaelsBolger.C @@ -71,8 +71,10 @@ void Foam::relativeVelocityModels::MichaelsBolger::correct() { Udm_ = (mixture_.rhoc()/mixture_.rho())*Vc_ - *(a0_ + pow(max(1 - mixture_.alphad()/mixture().alphaMax(), 0.0), a1_)) - *acceleration(); + *( + a0_ + + pow(max(1 - mixture_.alphad()/mixture().alphaMax(), scalar(0)), a1_) + )*acceleration(); } diff --git a/src/twoPhaseModels/twoPhaseMixture/MPLIC/MPLICcell.C b/src/twoPhaseModels/twoPhaseMixture/MPLIC/MPLICcell.C index 964439a2d3..c7c5387450 100644 --- a/src/twoPhaseModels/twoPhaseMixture/MPLIC/MPLICcell.C +++ b/src/twoPhaseModels/twoPhaseMixture/MPLIC/MPLICcell.C @@ -260,10 +260,10 @@ Foam::FixedList Foam::MPLICcell::solveVanderMatrix() const return FixedList { - - 4.5*b[0] + 13.5*b[1] - 13.5*b[2] + 4.5*b[3], - 9.0*b[0] - 22.5*b[1] + 18.0*b[2] - 4.5*b[3], - - 5.5*b[0] + 9.0*b[1] - 4.5*b[2] + 1.0*b[3], - 1.0*b[0] + scalar(- 4.5*b[0] + 13.5*b[1] - 13.5*b[2] + 4.5*b[3]), + scalar(9.0*b[0] - 22.5*b[1] + 18.0*b[2] - 4.5*b[3]), + scalar(- 5.5*b[0] + 9.0*b[1] - 4.5*b[2] + 1.0*b[3]), + scalar(1.0*b[0]) }; }