From a067151810727d3a63aa535e9f9fd7347a90cd93 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 31 Mar 2017 20:46:52 +0100
Subject: [PATCH] surfaceFilmModels::contactAngleForce: Use of boundary values
of surface tension and contact angle
---
.../contactAngleForce/contactAngleForce.C | 29 ++++++++++---------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C
index c91d299eb47..abd10960629 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/contactAngleForce/contactAngleForce.C
@@ -27,7 +27,6 @@ License
#include "addToRunTimeSelectionTable.H"
#include "fvcGrad.H"
#include "unitConversion.H"
-#include "fvPatchField.H"
#include "meshWavePatchDistMethod.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -188,25 +187,27 @@ tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
{
if (!filmModel_.isCoupledPatch(patchi))
{
- const fvPatchField<scalar>& alphaf = alpha.boundaryField()[patchi];
- const fvPatchField<scalar>& maskf = mask_.boundaryField()[patchi];
- const scalarField& invDx = alphaf.patch().deltaCoeffs();
- const labelUList& faceCells = alphaf.patch().faceCells();
-
- forAll(alphaf, facei)
+ const fvPatchField<scalar>& alphaPf = alpha.boundaryField()[patchi];
+ const fvPatchField<scalar>& maskPf = mask_.boundaryField()[patchi];
+ const fvPatchField<scalar>& sigmaPf = sigma.boundaryField()[patchi];
+ const fvPatchField<scalar>& thetaPf = theta.boundaryField()[patchi];
+ const scalarField& invDx = alphaPf.patch().deltaCoeffs();
+ const labelUList& faceCells = alphaPf.patch().faceCells();
+
+ forAll(alphaPf, facei)
{
- if (maskf[facei] > 0.5)
+ if (maskPf[facei] > 0.5)
{
label cellO = faceCells[facei];
- if ((alpha[cellO] > 0.5) && (alphaf[facei] < 0.5))
+ if ((alpha[cellO] > 0.5) && (alphaPf[facei] < 0.5))
{
const vector n =
gradAlpha[cellO]
/(mag(gradAlpha[cellO]) + ROOTVSMALL);
- const scalar cosTheta = cos(degToRad(theta[cellO]));
+ const scalar cosTheta = cos(degToRad(thetaPf[facei]));
force[cellO] +=
- Ccf_*n*sigma[cellO]*(1 - cosTheta)/invDx[facei];
+ Ccf_*n*sigmaPf[facei]*(1 - cosTheta)/invDx[facei];
}
}
}
@@ -220,8 +221,10 @@ tmp<fvVectorMatrix> contactAngleForce::correct(volVectorField& U)
tForce().write();
}
- tmp<fvVectorMatrix>
- tfvm(new fvVectorMatrix(U, dimForce/dimArea*dimVolume));
+ tmp<fvVectorMatrix> tfvm
+ (
+ new fvVectorMatrix(U, dimForce/dimArea*dimVolume)
+ );
tfvm.ref() += tForce;
--
GitLab