From 4bdfeea66d36df6f950b2a3465e03a16328daa51 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Sun, 6 Nov 2022 22:00:45 +0000 Subject: [PATCH] solvers::multiphaseEuler: Updated for clang --- .../multiphaseEuler/cellPressureCorrector.C | 15 ++++++++++----- .../multiphaseEuler/facePressureCorrector.C | 6 +++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/cellPressureCorrector.C b/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/cellPressureCorrector.C index f16ad7b837..13be34880a 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/cellPressureCorrector.C +++ b/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/cellPressureCorrector.C @@ -27,9 +27,6 @@ License #include "constrainHbyA.H" #include "constrainPressure.H" #include "findRefCell.H" -#include "fvcFlux.H" -#include "fvcMeshPhi.H" -#include "fvcReconstruct.H" #include "fvcDdt.H" #include "fvcDiv.H" #include "fvcSup.H" @@ -38,6 +35,9 @@ License #include "fvmDiv.H" #include "fvmLaplacian.H" #include "fvmSup.H" +#include "fvcFlux.H" +#include "fvcMeshPhi.H" +#include "fvcReconstruct.H" // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * // @@ -72,7 +72,11 @@ void Foam::solvers::multiphaseEuler::cellPressureCorrector() 1.0 /( UEqns[phase.index()].A() - + byDt(max(phase.residualAlpha() - alpha, scalar(0))*phase.rho()) + + byDt + ( + max(phase.residualAlpha() - alpha, scalar(0)) + *phase.rho() + ) ) ) ); @@ -264,7 +268,8 @@ void Foam::solvers::multiphaseEuler::cellPressureCorrector() { phaseModel& phase = phases[phasei]; phib += - alphafs[phasei].boundaryField()*phase.phi()().boundaryField(); + alphafs[phasei].boundaryField() + *phase.phi()().boundaryField(); } setSnGrad diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/facePressureCorrector.C b/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/facePressureCorrector.C index 6c03a026e3..61c0a9acfe 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/facePressureCorrector.C +++ b/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/facePressureCorrector.C @@ -27,9 +27,6 @@ License #include "constrainHbyA.H" #include "constrainPressure.H" #include "findRefCell.H" -#include "fvcFlux.H" -#include "fvcMeshPhi.H" -#include "fvcReconstruct.H" #include "fvcDdt.H" #include "fvcDiv.H" #include "fvcSup.H" @@ -38,6 +35,9 @@ License #include "fvmDiv.H" #include "fvmLaplacian.H" #include "fvmSup.H" +#include "fvcFlux.H" +#include "fvcMeshPhi.H" +#include "fvcReconstruct.H" // * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * * //