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
2022-02-03 21:08:56 +00:00
parent 68cb2aef55 2fc40b7895
commit edce47e02c
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
applications/solvers/multiphase/multiphaseEulerFoam/phaseSystems/BlendedInterfacialModel/blendingMethods/blendingMethod/blendingMethod.C
View File

@ -211,16 +211,19 @@ Foam::tmp<Foam::volScalarField> Foam::blendingMethod::f
{
return constant(alphas, 0);
}
else
if (canBeContinuousPhaseSet == canBeContinuousSystemSet)
{
return
fContinuous
(
alphas,
canBeContinuousPhaseSet,
canBeContinuousSystemSet
);
return constant(alphas, 1);
}
return
fContinuous
(
alphas,
canBeContinuousPhaseSet,
canBeContinuousSystemSet
);
}

6
src/sampling/sampledSet/sampledSet/sampledSetParticle.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2021-2022 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -144,8 +144,8 @@ bool Foam::sampledSetParticle::move
while (onInternalFace())
{
if (td.storeFaces_) storeFace(cloud, td);
if (td.storeCells_) storeCell(cloud, td);
if (td.storeFaces_) storeFace(cloud, td);
hitFace(setF_*s, 0, cloud, td);
@ -156,8 +156,8 @@ bool Foam::sampledSetParticle::move
if (onFace())
{
if (td.storeFaces_) storeFace(cloud, td);
if (td.storeCells_) storeCell(cloud, td);
if (td.storeFaces_) storeFace(cloud, td);
hitFace(setF_*s, 0, cloud, td);
}