From 94ed45c1627c3575011a98f31c696f171bb8eb94 Mon Sep 17 00:00:00 2001 From: Henry Weller <http://cfd.direct> Date: Sun, 20 Dec 2015 18:16:15 +0000 Subject: [PATCH] alphaContactAngleFvPatchScalarField, constantAlphaContactAngleFvPatchScalarField: minor update --- .../alphaContactAngleFvPatchScalarField.C | 30 +++++++++---------- ...stantAlphaContactAngleFvPatchScalarField.C | 26 ++++++++-------- ...stantAlphaContactAngleFvPatchScalarField.H | 9 ++++-- 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C index f183641e461..78bd0115271 100644 --- a/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C +++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,9 +24,9 @@ License \*---------------------------------------------------------------------------*/ #include "alphaContactAngleFvPatchScalarField.H" -#include "addToRunTimeSelectionTable.H" #include "fvPatchFieldMapper.H" #include "volMesh.H" +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -69,19 +69,6 @@ Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField {} -Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField -( - const alphaContactAngleFvPatchScalarField& acpsf, - const fvPatch& p, - const DimensionedField<scalar, volMesh>& iF, - const fvPatchFieldMapper& mapper -) -: - fixedGradientFvPatchScalarField(acpsf, p, iF, mapper), - limit_(acpsf.limit_) -{} - - Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField ( const fvPatch& p, @@ -106,6 +93,19 @@ Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField } +Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField +( + const alphaContactAngleFvPatchScalarField& acpsf, + const fvPatch& p, + const DimensionedField<scalar, volMesh>& iF, + const fvPatchFieldMapper& mapper +) +: + fixedGradientFvPatchScalarField(acpsf, p, iF, mapper), + limit_(acpsf.limit_) +{} + + Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField ( const alphaContactAngleFvPatchScalarField& acpsf diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C index ea35d3999cf..c94e36ce778 100644 --- a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C +++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -24,9 +24,9 @@ License \*---------------------------------------------------------------------------*/ #include "constantAlphaContactAngleFvPatchScalarField.H" -#include "addToRunTimeSelectionTable.H" #include "volMesh.H" #include "fvPatchFieldMapper.H" +#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // @@ -45,30 +45,30 @@ constantAlphaContactAngleFvPatchScalarField Foam::constantAlphaContactAngleFvPatchScalarField:: constantAlphaContactAngleFvPatchScalarField ( - const constantAlphaContactAngleFvPatchScalarField& gcpsf, const fvPatch& p, const DimensionedField<scalar, volMesh>& iF, - const fvPatchFieldMapper& mapper + const dictionary& dict ) : - alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper), - theta0_(gcpsf.theta0_) -{} + alphaContactAngleFvPatchScalarField(p, iF, dict), + theta0_(readScalar(dict.lookup("theta0"))) +{ + evaluate(); +} Foam::constantAlphaContactAngleFvPatchScalarField:: constantAlphaContactAngleFvPatchScalarField ( + const constantAlphaContactAngleFvPatchScalarField& gcpsf, const fvPatch& p, const DimensionedField<scalar, volMesh>& iF, - const dictionary& dict + const fvPatchFieldMapper& mapper ) : - alphaContactAngleFvPatchScalarField(p, iF, dict), - theta0_(readScalar(dict.lookup("theta0"))) -{ - evaluate(); -} + alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper), + theta0_(gcpsf.theta0_) +{} Foam::constantAlphaContactAngleFvPatchScalarField:: diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H index 02eaf6b352c..7ce340390e6 100644 --- a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H +++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -25,8 +25,11 @@ Class Foam::constantAlphaContactAngleFvPatchScalarField Description - A constant alphaContactAngle scalar boundary condition - (alphaContactAngleFvPatchScalarField) + A constant alphaContactAngle scalar boundary condition. + +SeeAlso + Foam::alphaContactAngleFvPatchScalarField + Foam::temperatureDependentAlphaContactAngleFvPatchScalarField SourceFiles constantAlphaContactAngleFvPatchScalarField.C -- GitLab