From e1c0207695f93a9a2feadb720c10ffff1cb6c9ce Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Thu, 10 Nov 2022 14:30:21 +0000 Subject: [PATCH] solvers::compressibleVoF,compressibleVoF::correctCoNum(): Removed unnecessary nInternalFaces() test Resolves bug-report https://bugs.openfoam.org/view.php?id=3929 --- .../fluid/compressibleVoF/compressibleVoF.C | 20 ++++-------- .../multiphaseEuler/multiphaseEuler.C | 32 ++++++++----------- 2 files changed, 20 insertions(+), 32 deletions(-) diff --git a/applications/solvers/modules/fluid/compressibleVoF/compressibleVoF.C b/applications/solvers/modules/fluid/compressibleVoF/compressibleVoF.C index 2cb08c3afd..bd2371b9f7 100644 --- a/applications/solvers/modules/fluid/compressibleVoF/compressibleVoF.C +++ b/applications/solvers/modules/fluid/compressibleVoF/compressibleVoF.C @@ -45,22 +45,16 @@ void Foam::solvers::compressibleVoF::correctCoNum() { fluidSolver::correctCoNum(phi); - alphaCoNum = 0; - scalar meanAlphaCoNum = 0; + const scalarField sumPhi + ( + mixture.nearInterface()().primitiveField() + *fvc::surfaceSum(mag(phi))().primitiveField() + ); - if (mesh.nInternalFaces()) - { - const scalarField sumPhi - ( - mixture.nearInterface()().primitiveField() - *fvc::surfaceSum(mag(phi))().primitiveField() - ); + alphaCoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); - alphaCoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); - - meanAlphaCoNum = + const scalar meanAlphaCoNum = 0.5*(gSum(sumPhi)/gSum(mesh.V().field()))*runTime.deltaTValue(); - } Info<< "Interface Courant Number mean: " << meanAlphaCoNum << " max: " << alphaCoNum << endl; diff --git a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/multiphaseEuler.C b/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/multiphaseEuler.C index 50bbb23346..0203b3f2ba 100644 --- a/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/multiphaseEuler.C +++ b/applications/solvers/modules/fluid/multiphaseEuler/multiphaseEuler/multiphaseEuler.C @@ -62,31 +62,25 @@ void Foam::solvers::multiphaseEuler::read() void Foam::solvers::multiphaseEuler::correctCoNum() { - CoNum = 0; - scalar meanCoNum = 0.0; + scalarField sumPhi + ( + fvc::surfaceSum(mag(phi))().primitiveField() + ); - if (mesh.nInternalFaces()) + forAll(phases, phasei) { - scalarField sumPhi + sumPhi = max ( - fvc::surfaceSum(mag(phi))().primitiveField() + sumPhi, + fvc::surfaceSum(mag(phases[phasei].phi()))().primitiveField() ); - - forAll(phases, phasei) - { - sumPhi = max - ( - sumPhi, - fvc::surfaceSum(mag(phases[phasei].phi()))().primitiveField() - ); - } - - CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); - - meanCoNum = - 0.5*(gSum(sumPhi)/gSum(mesh.V().field()))*runTime.deltaTValue(); } + CoNum = 0.5*gMax(sumPhi/mesh.V().field())*runTime.deltaTValue(); + + const scalar meanCoNum = + 0.5*(gSum(sumPhi)/gSum(mesh.V().field()))*runTime.deltaTValue(); + Info<< "Courant Number mean: " << meanCoNum << " max: " << CoNum << endl; }