Commit df0d196b authored by h.weller@opencfd.co.uk's avatar h.weller@opencfd.co.uk Committed by graham
Browse files
parent 85ace749
...@@ -29,14 +29,9 @@ License ...@@ -29,14 +29,9 @@ License
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volMesh.H" #include "volMesh.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
dynamicGammaContactAngleFvPatchScalarField:: Foam::dynamicGammaContactAngleFvPatchScalarField::
dynamicGammaContactAngleFvPatchScalarField dynamicGammaContactAngleFvPatchScalarField
( (
const fvPatch& p, const fvPatch& p,
...@@ -51,7 +46,7 @@ dynamicGammaContactAngleFvPatchScalarField ...@@ -51,7 +46,7 @@ dynamicGammaContactAngleFvPatchScalarField
{} {}
dynamicGammaContactAngleFvPatchScalarField:: Foam::dynamicGammaContactAngleFvPatchScalarField::
dynamicGammaContactAngleFvPatchScalarField dynamicGammaContactAngleFvPatchScalarField
( (
const dynamicGammaContactAngleFvPatchScalarField& gcpsf, const dynamicGammaContactAngleFvPatchScalarField& gcpsf,
...@@ -64,11 +59,11 @@ dynamicGammaContactAngleFvPatchScalarField ...@@ -64,11 +59,11 @@ dynamicGammaContactAngleFvPatchScalarField
theta0_(gcpsf.theta0_), theta0_(gcpsf.theta0_),
uTheta_(gcpsf.uTheta_), uTheta_(gcpsf.uTheta_),
thetaA_(gcpsf.thetaA_), thetaA_(gcpsf.thetaA_),
thetaR_(gcpsf.thetaA_) thetaR_(gcpsf.thetaR_)
{} {}
dynamicGammaContactAngleFvPatchScalarField:: Foam::dynamicGammaContactAngleFvPatchScalarField::
dynamicGammaContactAngleFvPatchScalarField dynamicGammaContactAngleFvPatchScalarField
( (
const fvPatch& p, const fvPatch& p,
...@@ -86,7 +81,7 @@ dynamicGammaContactAngleFvPatchScalarField ...@@ -86,7 +81,7 @@ dynamicGammaContactAngleFvPatchScalarField
} }
dynamicGammaContactAngleFvPatchScalarField:: Foam::dynamicGammaContactAngleFvPatchScalarField::
dynamicGammaContactAngleFvPatchScalarField dynamicGammaContactAngleFvPatchScalarField
( (
const dynamicGammaContactAngleFvPatchScalarField& gcpsf const dynamicGammaContactAngleFvPatchScalarField& gcpsf
...@@ -100,7 +95,7 @@ dynamicGammaContactAngleFvPatchScalarField ...@@ -100,7 +95,7 @@ dynamicGammaContactAngleFvPatchScalarField
{} {}
dynamicGammaContactAngleFvPatchScalarField:: Foam::dynamicGammaContactAngleFvPatchScalarField::
dynamicGammaContactAngleFvPatchScalarField dynamicGammaContactAngleFvPatchScalarField
( (
const dynamicGammaContactAngleFvPatchScalarField& gcpsf, const dynamicGammaContactAngleFvPatchScalarField& gcpsf,
...@@ -117,7 +112,8 @@ dynamicGammaContactAngleFvPatchScalarField ...@@ -117,7 +112,8 @@ dynamicGammaContactAngleFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
tmp<scalarField> dynamicGammaContactAngleFvPatchScalarField::theta Foam::tmp<Foam::scalarField>
Foam::dynamicGammaContactAngleFvPatchScalarField::theta
( (
const fvPatchVectorField& Up, const fvPatchVectorField& Up,
const fvsPatchVectorField& nHat const fvsPatchVectorField& nHat
...@@ -133,22 +129,22 @@ tmp<scalarField> dynamicGammaContactAngleFvPatchScalarField::theta ...@@ -133,22 +129,22 @@ tmp<scalarField> dynamicGammaContactAngleFvPatchScalarField::theta
// Calculated the component of the velocity parallel to the wall // Calculated the component of the velocity parallel to the wall
vectorField Uwall = Up.patchInternalField() - Up; vectorField Uwall = Up.patchInternalField() - Up;
Uwall -= (nf & Uwall)*nf; Uwall -= (nf & Uwall)*nf;
// Find the direction of the interface parallel to the wall // Find the direction of the interface parallel to the wall
vectorField nWall = nHat - (nf & nHat)*nf; vectorField nWall = nHat - (nf & nHat)*nf;
// Normalise nWall // Normalise nWall
nWall /= (mag(nWall) + SMALL); nWall /= (mag(nWall) + SMALL);
// Calculate Uwall resolved normal to the interface parallel to // Calculate Uwall resolved normal to the interface parallel to
// the interface // the interface
scalarField uwall = nWall & Uwall; scalarField uwall = nWall & Uwall;
return theta0_ + (thetaA_ - thetaR_)*tanh(uwall/uTheta_); return theta0_ + (thetaA_ - thetaR_)*tanh(uwall/uTheta_);
} }
void dynamicGammaContactAngleFvPatchScalarField::write(Ostream& os) const void Foam::dynamicGammaContactAngleFvPatchScalarField::write(Ostream& os) const
{ {
fvPatchScalarField::write(os); fvPatchScalarField::write(os);
os.writeKeyword("theta0") << theta0_ << token::END_STATEMENT << nl; os.writeKeyword("theta0") << theta0_ << token::END_STATEMENT << nl;
...@@ -161,10 +157,14 @@ void dynamicGammaContactAngleFvPatchScalarField::write(Ostream& os) const ...@@ -161,10 +157,14 @@ void dynamicGammaContactAngleFvPatchScalarField::write(Ostream& os) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makePatchTypeField(fvPatchScalarField, dynamicGammaContactAngleFvPatchScalarField); namespace Foam
{
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // makePatchTypeField
(
fvPatchScalarField,
dynamicGammaContactAngleFvPatchScalarField
);
}
} // End namespace Foam
// ************************************************************************* // // ************************************************************************* //
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment