From 2eeaa326d61a740f8d0a411f44c8dafcef6409bf Mon Sep 17 00:00:00 2001 From: Mark Olesen Date: Wed, 8 May 2019 18:48:52 +0200 Subject: [PATCH] Revert "COMP: combine twoPhaseProperties library into interfaceProperties" Modified revert of commit 6c6f777bd51977b0bbd7848802f5101d04ee49e0. - The "alphaContactAngleFvPatchScalarField" occurs in several places in the code base: - as abstract class for two-phase properties - in various multiphase solvers To resolve potential linking conflicts, renamed the abstract class as "alphaContactAngleTwoPhaseFvPatchScalarField" instead. This permits potential linking of two-phase and multi-phase libraries without symbol conflicts and has no effect on concrete uses of two-phase alphaContactAngle boudary conditions. --- .../compressibleInterFoam/Make/options | 1 + .../Make/options | 1 + .../compressibleInterDyMFoam/Make/options | 1 + .../compressibleInterFilmFoam/Make/options | 1 + .../Make/options | 2 +- .../Make/options | 1 + .../Make/options | 2 + .../interFoam/interMixingFoam/Make/options | 4 +- .../threePhaseInterfaceProperties.C | 12 +++--- .../interPhaseChangeFoam/Make/options | 1 + .../interPhaseChangeDyMFoam/Make/options | 1 + .../phaseChangeTwoPhaseMixtures/Make/options | 2 +- src/transportModels/Allwmake | 1 + .../Make/options | 1 + .../interfaceProperties/Make/files | 7 +-- .../interfaceProperties/Make/options | 9 ++-- ...aContactAngleTwoPhaseFvPatchScalarField.C} | 39 ++++++++--------- ...aContactAngleTwoPhaseFvPatchScalarField.H} | 43 +++++++++---------- .../interfaceProperties/interfaceProperties.C | 10 ++--- .../interfaceProperties/interfaceProperties.H | 2 +- .../twoPhaseProperties/Make/files | 7 +++ .../twoPhaseProperties/Make/options | 9 ++++ ...stantAlphaContactAngleFvPatchScalarField.C | 14 +++--- ...stantAlphaContactAngleFvPatchScalarField.H | 10 ++--- ...namicAlphaContactAngleFvPatchScalarField.C | 14 +++--- ...namicAlphaContactAngleFvPatchScalarField.H | 10 ++--- ...ndentAlphaContactAngleFvPatchScalarField.C | 14 +++--- ...ndentAlphaContactAngleFvPatchScalarField.H | 8 ++-- ...ryingAlphaContactAngleFvPatchScalarField.C | 12 +++--- ...ryingAlphaContactAngleFvPatchScalarField.H | 10 ++--- .../alphaFixedPressureFvPatchScalarField.C | 0 .../alphaFixedPressureFvPatchScalarField.H | 0 32 files changed, 135 insertions(+), 114 deletions(-) rename src/transportModels/interfaceProperties/alphaContactAngle/{alphaContactAngle/alphaContactAngleFvPatchScalarField.C => alphaContactAngleTwoPhaseFvPatchScalarField.C} (77%) rename src/transportModels/interfaceProperties/alphaContactAngle/{alphaContactAngle/alphaContactAngleFvPatchScalarField.H => alphaContactAngleTwoPhaseFvPatchScalarField.H} (78%) create mode 100644 src/transportModels/twoPhaseProperties/Make/files create mode 100644 src/transportModels/twoPhaseProperties/Make/options rename src/transportModels/{interfaceProperties => twoPhaseProperties}/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C (88%) rename src/transportModels/{interfaceProperties => twoPhaseProperties}/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H (93%) rename src/transportModels/{interfaceProperties => twoPhaseProperties}/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C (91%) rename src/transportModels/{interfaceProperties => twoPhaseProperties}/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H (94%) rename src/transportModels/{interfaceProperties => twoPhaseProperties}/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C (90%) rename src/transportModels/{interfaceProperties => twoPhaseProperties}/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H (96%) rename src/transportModels/{interfaceProperties => twoPhaseProperties}/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C (91%) rename src/transportModels/{interfaceProperties => twoPhaseProperties}/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H (94%) rename src/transportModels/{interfaceProperties => twoPhaseProperties}/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C (100%) rename src/transportModels/{interfaceProperties => twoPhaseProperties}/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.H (100%) diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options index 995fd38e75..3d55f7f675 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/Make/options @@ -23,6 +23,7 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -ltwoPhaseMixture \ + -ltwoPhaseProperties \ -linterfaceProperties \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options index 43c9b6871f..d6736fe7c8 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options @@ -16,6 +16,7 @@ LIB_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -ltwoPhaseMixture \ + -ltwoPhaseProperties \ -linterfaceProperties \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options index dd4418a547..12483a736d 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options @@ -26,6 +26,7 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -ltwoPhaseMixture \ + -ltwoPhaseProperties \ -linterfaceProperties \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options index a1fb85d4d6..e96dde6590 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options +++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options @@ -34,6 +34,7 @@ EXE_LIBS = \ -lfluidThermophysicalModels \ -lspecie \ -ltwoPhaseMixture \ + -ltwoPhaseProperties \ -linterfaceProperties \ -lturbulenceModels \ -lcompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options index a1ce378ad8..8e3f95e80f 100644 --- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options +++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options @@ -29,5 +29,5 @@ EXE_LIBS = \ -lmassTransferModels \ -lsolidThermo \ -lsolidSpecie \ - -linterfaceProperties \ + -ltwoPhaseProperties \ -llaserDTRM diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options index eb4da264f6..3f2792391d 100644 --- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options +++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options @@ -24,6 +24,7 @@ EXE_LIBS = \ -lphaseTemperatureChangeTwoPhaseMixtures \ -ltwoPhaseMixture \ -linterfaceProperties \ + -ltwoPhaseProperties \ -lincompressibleTransportModels \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options index 4da1b25615..4a85a0ae9f 100644 --- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options +++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options @@ -1,3 +1,4 @@ + EXE_INC = \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ @@ -9,6 +10,7 @@ EXE_INC = \ LIB_LIBS = \ -ltwoPhaseMixture \ -linterfaceProperties \ + -ltwoPhaseProperties \ -lincompressibleTransportModels \ -lfiniteVolume \ -lfluidThermophysicalModels diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options index 59ebe3cc9f..76551a9d1c 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options @@ -12,6 +12,7 @@ EXE_INC = \ -I$(LIB_SRC)/dynamicFvMesh/lnInclude \ -I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude @@ -20,8 +21,9 @@ EXE_LIBS = \ -lfvOptions \ -lmeshTools \ -lsampling \ - -ltwoPhaseMixture \ -linterfaceProperties \ + -ltwoPhaseMixture \ + -ltwoPhaseProperties \ -lincompressibleTransportModels \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C index fd1d515c7d..4602251370 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C +++ b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C @@ -26,7 +26,7 @@ License \*---------------------------------------------------------------------------*/ #include "threePhaseInterfaceProperties.H" -#include "alphaContactAngleFvPatchScalarField.H" +#include "alphaContactAngleTwoPhaseFvPatchScalarField.H" #include "mathematicalConstants.H" #include "surfaceInterpolate.H" #include "fvcDiv.H" @@ -55,14 +55,14 @@ void Foam::threePhaseInterfaceProperties::correctContactAngle forAll(boundary, patchi) { - if (isA(alpha1[patchi])) + if (isA(alpha1[patchi])) { - const alphaContactAngleFvPatchScalarField& a2cap = - refCast + const alphaContactAngleTwoPhaseFvPatchScalarField& a2cap = + refCast (alpha2[patchi]); - const alphaContactAngleFvPatchScalarField& a3cap = - refCast + const alphaContactAngleTwoPhaseFvPatchScalarField& a3cap = + refCast (alpha3[patchi]); scalarField twoPhaseAlpha2(max(a2cap, scalar(0))); diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options index 3a8113d189..6e898b3f43 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/Make/options +++ b/applications/solvers/multiphase/interPhaseChangeFoam/Make/options @@ -18,6 +18,7 @@ EXE_LIBS = \ -lphaseChangeTwoPhaseMixtures \ -ltwoPhaseMixture \ -linterfaceProperties \ + -ltwoPhaseProperties \ -lincompressibleTransportModels \ -lturbulenceModels \ -lincompressibleTurbulenceModels diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options index 6e5522bc5e..9985961973 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options +++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options @@ -21,6 +21,7 @@ EXE_LIBS = \ -lphaseChangeTwoPhaseMixtures \ -ltwoPhaseMixture \ -linterfaceProperties \ + -ltwoPhaseProperties \ -lincompressibleTransportModels \ -lturbulenceModels \ -lincompressibleTurbulenceModels \ diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options index 0391ed7c62..2e61e4ba77 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options +++ b/applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options @@ -6,6 +6,6 @@ EXE_INC = \ LIB_LIBS = \ -ltwoPhaseMixture \ - -linterfaceProperties \ + -ltwoPhaseProperties \ -lincompressibleTransportModels \ -lfiniteVolume diff --git a/src/transportModels/Allwmake b/src/transportModels/Allwmake index e94119d61a..4790540e34 100755 --- a/src/transportModels/Allwmake +++ b/src/transportModels/Allwmake @@ -6,6 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory wmake $targetType twoPhaseMixture wmake $targetType interfaceProperties +wmake $targetType twoPhaseProperties wmake $targetType incompressible wmake $targetType compressible wmake $targetType immiscibleIncompressibleTwoPhaseMixture diff --git a/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options b/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options index 4f2d1e9eeb..4ae2fbf966 100644 --- a/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options +++ b/src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options @@ -9,4 +9,5 @@ LIB_LIBS = \ -ltwoPhaseMixture \ -lincompressibleTransportModels \ -linterfaceProperties \ + -ltwoPhaseProperties \ -lfiniteVolume diff --git a/src/transportModels/interfaceProperties/Make/files b/src/transportModels/interfaceProperties/Make/files index 71a9d307c9..5e1436426b 100644 --- a/src/transportModels/interfaceProperties/Make/files +++ b/src/transportModels/interfaceProperties/Make/files @@ -1,12 +1,7 @@ interfaceProperties.C interfaceCompression/interfaceCompression.C -alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C -alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C -alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C -alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C -alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C -alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C +alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C diff --git a/src/transportModels/interfaceProperties/Make/options b/src/transportModels/interfaceProperties/Make/options index 8ca45c1d12..cc63db7dcc 100644 --- a/src/transportModels/interfaceProperties/Make/options +++ b/src/transportModels/interfaceProperties/Make/options @@ -1,7 +1,8 @@ EXE_INC = \ - -I$(LIB_SRC)/finiteVolume/lnInclude \ - -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude + -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/transportModels/twoPhaseProperties/alphaContactAngle/alphaContactAngle \ + -I$(LIB_SRC)/finiteVolume/lnInclude LIB_LIBS = \ - -lfiniteVolume \ - -ltwoPhaseMixture + -ltwoPhaseMixture \ + -lfiniteVolume diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C similarity index 77% rename from src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C rename to src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C index f7e52cff54..34ae049a3f 100644 --- a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C +++ b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011-2015 OpenFOAM Foundation @@ -25,23 +25,17 @@ License \*---------------------------------------------------------------------------*/ -#include "alphaContactAngleFvPatchScalarField.H" +#include "alphaContactAngleTwoPhaseFvPatchScalarField.H" #include "fvPatchFieldMapper.H" #include "volMesh.H" -#include "addToRunTimeSelectionTable.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // -namespace Foam -{ - defineTypeNameAndDebug(alphaContactAngleFvPatchScalarField, 0); -} - const Foam::Enum < - Foam::alphaContactAngleFvPatchScalarField::limitControls + Foam::alphaContactAngleTwoPhaseFvPatchScalarField::limitControls > -Foam::alphaContactAngleFvPatchScalarField::limitControlNames_ +Foam::alphaContactAngleTwoPhaseFvPatchScalarField::limitControlNames_ ({ { limitControls::lcNone, "none" }, { limitControls::lcGradient, "gradient" }, @@ -52,7 +46,8 @@ Foam::alphaContactAngleFvPatchScalarField::limitControlNames_ // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // -Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField +Foam::alphaContactAngleTwoPhaseFvPatchScalarField:: +alphaContactAngleTwoPhaseFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF @@ -63,7 +58,8 @@ Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField {} -Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField +Foam::alphaContactAngleTwoPhaseFvPatchScalarField:: +alphaContactAngleTwoPhaseFvPatchScalarField ( const fvPatch& p, const DimensionedField& iF, @@ -87,9 +83,10 @@ Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField } -Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField +Foam::alphaContactAngleTwoPhaseFvPatchScalarField:: +alphaContactAngleTwoPhaseFvPatchScalarField ( - const alphaContactAngleFvPatchScalarField& acpsf, + const alphaContactAngleTwoPhaseFvPatchScalarField& acpsf, const fvPatch& p, const DimensionedField& iF, const fvPatchFieldMapper& mapper @@ -100,9 +97,10 @@ Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField {} -Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField +Foam::alphaContactAngleTwoPhaseFvPatchScalarField:: +alphaContactAngleTwoPhaseFvPatchScalarField ( - const alphaContactAngleFvPatchScalarField& acpsf + const alphaContactAngleTwoPhaseFvPatchScalarField& acpsf ) : fixedGradientFvPatchScalarField(acpsf), @@ -110,9 +108,10 @@ Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField {} -Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField +Foam::alphaContactAngleTwoPhaseFvPatchScalarField:: +alphaContactAngleTwoPhaseFvPatchScalarField ( - const alphaContactAngleFvPatchScalarField& acpsf, + const alphaContactAngleTwoPhaseFvPatchScalarField& acpsf, const DimensionedField& iF ) : @@ -123,7 +122,7 @@ Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // -void Foam::alphaContactAngleFvPatchScalarField::evaluate +void Foam::alphaContactAngleTwoPhaseFvPatchScalarField::evaluate ( const Pstream::commsTypes ) @@ -154,7 +153,7 @@ void Foam::alphaContactAngleFvPatchScalarField::evaluate } -void Foam::alphaContactAngleFvPatchScalarField::write +void Foam::alphaContactAngleTwoPhaseFvPatchScalarField::write ( Ostream& os ) const diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.H similarity index 78% rename from src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H rename to src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.H index f7d2efd755..3a7af4217e 100644 --- a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H +++ b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011-2017 OpenFOAM Foundation @@ -24,15 +24,15 @@ License along with OpenFOAM. If not, see . Class - Foam::alphaContactAngleFvPatchScalarField + Foam::alphaContactAngleTwoPhaseFvPatchScalarField Group grpWallBoundaryConditions grpGenericBoundaryConditions Description - Abstract base class for alphaContactAngle boundary conditions. + Abstract base class for two-phase alphaContactAngle boundary conditions. - Derived classes must implement the theta() fuction which returns the + Derived classes must implement the theta() function which returns the wall contact angle field. The essential entry "limit" controls the gradient of alpha1 on the wall: @@ -56,12 +56,12 @@ Description \endverbatim SourceFiles - alphaContactAngleFvPatchScalarField.C + alphaContactAngleTwoPhaseFvPatchScalarField.C \*---------------------------------------------------------------------------*/ -#ifndef alphaContactAngleFvPatchScalarField_H -#define alphaContactAngleFvPatchScalarField_H +#ifndef alphaContactAngleTwoPhaseFvPatchScalarField_H +#define alphaContactAngleTwoPhaseFvPatchScalarField_H #include "fixedGradientFvPatchFields.H" #include "fvsPatchFields.H" @@ -72,18 +72,16 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class alphaContactAngleFvPatchScalarField Declaration + Class alphaContactAngleTwoPhaseFvPatchScalarField Declaration \*---------------------------------------------------------------------------*/ -class alphaContactAngleFvPatchScalarField +class alphaContactAngleTwoPhaseFvPatchScalarField : public fixedGradientFvPatchScalarField { - public: - //- Runtime type information - TypeName("alphaContactAngle"); + // Abstract class, no runtime information //- Alpha limit options enum limitControls @@ -100,40 +98,39 @@ public: // Constructors //- Construct from patch and internal field - alphaContactAngleFvPatchScalarField + alphaContactAngleTwoPhaseFvPatchScalarField ( const fvPatch&, const DimensionedField& ); //- Construct from patch, internal field and dictionary - alphaContactAngleFvPatchScalarField + alphaContactAngleTwoPhaseFvPatchScalarField ( const fvPatch&, const DimensionedField&, const dictionary& ); - //- Construct by mapping given alphaContactAngleFvPatchScalarField - // onto a new patch - alphaContactAngleFvPatchScalarField + //- Construct by mapping onto a new patch + alphaContactAngleTwoPhaseFvPatchScalarField ( - const alphaContactAngleFvPatchScalarField&, + const alphaContactAngleTwoPhaseFvPatchScalarField&, const fvPatch&, const DimensionedField&, const fvPatchFieldMapper& ); //- Construct as copy - alphaContactAngleFvPatchScalarField + alphaContactAngleTwoPhaseFvPatchScalarField ( - const alphaContactAngleFvPatchScalarField& + const alphaContactAngleTwoPhaseFvPatchScalarField& ); //- Construct as copy setting internal field reference - alphaContactAngleFvPatchScalarField + alphaContactAngleTwoPhaseFvPatchScalarField ( - const alphaContactAngleFvPatchScalarField&, + const alphaContactAngleTwoPhaseFvPatchScalarField&, const DimensionedField& ); @@ -154,7 +151,7 @@ public: ); //- Write - virtual void write(Ostream&) const; + virtual void write(Ostream& os) const; }; diff --git a/src/transportModels/interfaceProperties/interfaceProperties.C b/src/transportModels/interfaceProperties/interfaceProperties.C index cee147e9b3..7c974d7363 100644 --- a/src/transportModels/interfaceProperties/interfaceProperties.C +++ b/src/transportModels/interfaceProperties/interfaceProperties.C @@ -26,7 +26,7 @@ License \*---------------------------------------------------------------------------*/ #include "interfaceProperties.H" -#include "alphaContactAngleFvPatchScalarField.H" +#include "alphaContactAngleTwoPhaseFvPatchScalarField.H" #include "mathematicalConstants.H" #include "surfaceInterpolate.H" #include "fvcDiv.H" @@ -55,12 +55,12 @@ void Foam::interfaceProperties::correctContactAngle forAll(boundary, patchi) { - if (isA(abf[patchi])) + if (isA(abf[patchi])) { - alphaContactAngleFvPatchScalarField& acap = - const_cast + alphaContactAngleTwoPhaseFvPatchScalarField& acap = + const_cast ( - refCast + refCast ( abf[patchi] ) diff --git a/src/transportModels/interfaceProperties/interfaceProperties.H b/src/transportModels/interfaceProperties/interfaceProperties.H index 4d1ae6b815..c74a84232c 100644 --- a/src/transportModels/interfaceProperties/interfaceProperties.H +++ b/src/transportModels/interfaceProperties/interfaceProperties.H @@ -52,7 +52,7 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class interfaceProperties Declaration + Class interfaceProperties Declaration \*---------------------------------------------------------------------------*/ class interfaceProperties diff --git a/src/transportModels/twoPhaseProperties/Make/files b/src/transportModels/twoPhaseProperties/Make/files new file mode 100644 index 0000000000..9c16bbc4a3 --- /dev/null +++ b/src/transportModels/twoPhaseProperties/Make/files @@ -0,0 +1,7 @@ +alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C +alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C +alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C +alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C +alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C + +LIB = $(FOAM_LIBBIN)/libtwoPhaseProperties diff --git a/src/transportModels/twoPhaseProperties/Make/options b/src/transportModels/twoPhaseProperties/Make/options new file mode 100644 index 0000000000..32ce36b959 --- /dev/null +++ b/src/transportModels/twoPhaseProperties/Make/options @@ -0,0 +1,9 @@ +EXE_INC = \ + -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ + -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ + -I$(LIB_SRC)/finiteVolume/lnInclude + +LIB_LIBS = \ + -ltwoPhaseMixture \ + -linterfaceProperties \ + -lfiniteVolume diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C similarity index 88% rename from src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C rename to src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C index 2ba3ac1468..2978eecfed 100644 --- a/src/transportModels/interfaceProperties/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 | + \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011-2015 OpenFOAM Foundation @@ -39,7 +39,7 @@ constantAlphaContactAngleFvPatchScalarField const DimensionedField& iF ) : - alphaContactAngleFvPatchScalarField(p, iF), + alphaContactAngleTwoPhaseFvPatchScalarField(p, iF), theta0_(0.0) {} @@ -52,7 +52,7 @@ constantAlphaContactAngleFvPatchScalarField const dictionary& dict ) : - alphaContactAngleFvPatchScalarField(p, iF, dict), + alphaContactAngleTwoPhaseFvPatchScalarField(p, iF, dict), theta0_(dict.get("theta0")) { evaluate(); @@ -68,7 +68,7 @@ constantAlphaContactAngleFvPatchScalarField const fvPatchFieldMapper& mapper ) : - alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper), + alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, p, iF, mapper), theta0_(gcpsf.theta0_) {} @@ -79,7 +79,7 @@ constantAlphaContactAngleFvPatchScalarField const constantAlphaContactAngleFvPatchScalarField& gcpsf ) : - alphaContactAngleFvPatchScalarField(gcpsf), + alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf), theta0_(gcpsf.theta0_) {} @@ -91,7 +91,7 @@ constantAlphaContactAngleFvPatchScalarField const DimensionedField& iF ) : - alphaContactAngleFvPatchScalarField(gcpsf, iF), + alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, iF), theta0_(gcpsf.theta0_) {} @@ -114,7 +114,7 @@ void Foam::constantAlphaContactAngleFvPatchScalarField::write Ostream& os ) const { - alphaContactAngleFvPatchScalarField::write(os); + alphaContactAngleTwoPhaseFvPatchScalarField::write(os); os.writeEntry("theta0", theta0_); writeEntry("value", os); } diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H similarity index 93% rename from src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H rename to src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H index 18d9f65431..3e12b7eb88 100644 --- a/src/transportModels/interfaceProperties/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 | + \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011-2016 OpenFOAM Foundation @@ -30,7 +30,7 @@ Description A constant alphaContactAngle scalar boundary condition. See also - Foam::alphaContactAngleFvPatchScalarField + Foam::alphaContactAngleTwoPhaseFvPatchScalarField Foam::temperatureDependentAlphaContactAngleFvPatchScalarField SourceFiles @@ -41,7 +41,7 @@ SourceFiles #ifndef constantAlphaContactAngleFvPatchScalarField_H #define constantAlphaContactAngleFvPatchScalarField_H -#include "alphaContactAngleFvPatchScalarField.H" +#include "alphaContactAngleTwoPhaseFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -49,12 +49,12 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class constantAlphaContactAngleFvPatch Declaration + Class constantAlphaContactAngleFvPatch Declaration \*---------------------------------------------------------------------------*/ class constantAlphaContactAngleFvPatchScalarField : - public alphaContactAngleFvPatchScalarField + public alphaContactAngleTwoPhaseFvPatchScalarField { // Private data diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C similarity index 91% rename from src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C rename to src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C index ab5782c4c9..a253bafe90 100644 --- a/src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C +++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011-2013 OpenFOAM Foundation @@ -39,7 +39,7 @@ dynamicAlphaContactAngleFvPatchScalarField const DimensionedField& iF ) : - alphaContactAngleFvPatchScalarField(p, iF), + alphaContactAngleTwoPhaseFvPatchScalarField(p, iF), theta0_(0.0), uTheta_(0.0), thetaA_(0.0), @@ -56,7 +56,7 @@ dynamicAlphaContactAngleFvPatchScalarField const fvPatchFieldMapper& mapper ) : - alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper), + alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, p, iF, mapper), theta0_(gcpsf.theta0_), uTheta_(gcpsf.uTheta_), thetaA_(gcpsf.thetaA_), @@ -72,7 +72,7 @@ dynamicAlphaContactAngleFvPatchScalarField const dictionary& dict ) : - alphaContactAngleFvPatchScalarField(p, iF, dict), + alphaContactAngleTwoPhaseFvPatchScalarField(p, iF, dict), theta0_(dict.get("theta0")), uTheta_(dict.get("uTheta")), thetaA_(dict.get("thetaA")), @@ -88,7 +88,7 @@ dynamicAlphaContactAngleFvPatchScalarField const dynamicAlphaContactAngleFvPatchScalarField& gcpsf ) : - alphaContactAngleFvPatchScalarField(gcpsf), + alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf), theta0_(gcpsf.theta0_), uTheta_(gcpsf.uTheta_), thetaA_(gcpsf.thetaA_), @@ -103,7 +103,7 @@ dynamicAlphaContactAngleFvPatchScalarField const DimensionedField& iF ) : - alphaContactAngleFvPatchScalarField(gcpsf, iF), + alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, iF), theta0_(gcpsf.theta0_), uTheta_(gcpsf.uTheta_), thetaA_(gcpsf.thetaA_), @@ -147,7 +147,7 @@ Foam::dynamicAlphaContactAngleFvPatchScalarField::theta void Foam::dynamicAlphaContactAngleFvPatchScalarField::write(Ostream& os) const { - alphaContactAngleFvPatchScalarField::write(os); + alphaContactAngleTwoPhaseFvPatchScalarField::write(os); os.writeEntry("theta0", theta0_); os.writeEntry("uTheta", uTheta_); os.writeEntry("thetaA", thetaA_); diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H b/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H similarity index 94% rename from src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H rename to src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H index aa314829e9..6c77b021e8 100644 --- a/src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H +++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011-2013 OpenFOAM Foundation @@ -28,7 +28,7 @@ Class Description A dynamic alphaContactAngle scalar boundary condition - (alphaContactAngleFvPatchScalarField) + (alphaContactAngleTwoPhaseFvPatchScalarField) SourceFiles dynamicAlphaContactAngleFvPatchScalarField.C @@ -38,7 +38,7 @@ SourceFiles #ifndef dynamicAlphaContactAngleFvPatchScalarField_H #define dynamicAlphaContactAngleFvPatchScalarField_H -#include "alphaContactAngleFvPatchScalarField.H" +#include "alphaContactAngleTwoPhaseFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -46,12 +46,12 @@ namespace Foam { /*---------------------------------------------------------------------------*\ - Class dynamicAlphaContactAngleFvPatch Declaration + Class dynamicAlphaContactAngleFvPatch Declaration \*---------------------------------------------------------------------------*/ class dynamicAlphaContactAngleFvPatchScalarField : - public alphaContactAngleFvPatchScalarField + public alphaContactAngleTwoPhaseFvPatchScalarField { // Private data diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C similarity index 90% rename from src/transportModels/interfaceProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C rename to src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C index 371a15434f..36f362f0c3 100644 --- a/src/transportModels/interfaceProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C +++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2015-2016 OpenFOAM Foundation @@ -39,7 +39,7 @@ temperatureDependentAlphaContactAngleFvPatchScalarField const DimensionedField& iF ) : - alphaContactAngleFvPatchScalarField(p, iF), + alphaContactAngleTwoPhaseFvPatchScalarField(p, iF), TName_("T"), theta0_() {} @@ -53,7 +53,7 @@ temperatureDependentAlphaContactAngleFvPatchScalarField const dictionary& dict ) : - alphaContactAngleFvPatchScalarField(p, iF, dict), + alphaContactAngleTwoPhaseFvPatchScalarField(p, iF, dict), TName_(dict.lookupOrDefault("T", "T")), theta0_(Function1::New("theta0", dict)) { @@ -70,7 +70,7 @@ temperatureDependentAlphaContactAngleFvPatchScalarField const fvPatchFieldMapper& mapper ) : - alphaContactAngleFvPatchScalarField(psf, p, iF, mapper), + alphaContactAngleTwoPhaseFvPatchScalarField(psf, p, iF, mapper), TName_(psf.TName_), theta0_(psf.theta0_.clone()) {} @@ -82,7 +82,7 @@ temperatureDependentAlphaContactAngleFvPatchScalarField const temperatureDependentAlphaContactAngleFvPatchScalarField& psf ) : - alphaContactAngleFvPatchScalarField(psf), + alphaContactAngleTwoPhaseFvPatchScalarField(psf), TName_(psf.TName_), theta0_(psf.theta0_.clone()) {} @@ -95,7 +95,7 @@ temperatureDependentAlphaContactAngleFvPatchScalarField const DimensionedField& iF ) : - alphaContactAngleFvPatchScalarField(psf, iF), + alphaContactAngleTwoPhaseFvPatchScalarField(psf, iF), TName_(psf.TName_), theta0_(psf.theta0_.clone()) {} @@ -122,7 +122,7 @@ void Foam::temperatureDependentAlphaContactAngleFvPatchScalarField::write Ostream& os ) const { - alphaContactAngleFvPatchScalarField::write(os); + alphaContactAngleTwoPhaseFvPatchScalarField::write(os); os.writeEntryIfDifferent("T", "T", TName_); theta0_->writeData(os); writeEntry("value", os); diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H similarity index 96% rename from src/transportModels/interfaceProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H rename to src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H index 7a212147bb..93e1c13570 100644 --- a/src/transportModels/interfaceProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H +++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2015-2017 OpenFOAM Foundation @@ -50,7 +50,7 @@ Usage \endverbatim See also - Foam::alphaContactAngleFvPatchScalarField + Foam::alphaContactAngleTwoPhaseFvPatchScalarField Foam::constantAlphaContactAngleFvPatchScalarField Foam::Function1 @@ -62,7 +62,7 @@ SourceFiles #ifndef temperatureDependentAlphaContactAngleFvPatchScalarField_H #define temperatureDependentAlphaContactAngleFvPatchScalarField_H -#include "alphaContactAngleFvPatchScalarField.H" +#include "alphaContactAngleTwoPhaseFvPatchScalarField.H" #include "Function1.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -76,7 +76,7 @@ namespace Foam class temperatureDependentAlphaContactAngleFvPatchScalarField : - public alphaContactAngleFvPatchScalarField + public alphaContactAngleTwoPhaseFvPatchScalarField { // Private data diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C similarity index 91% rename from src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C rename to src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C index 7bb8bc0501..4f3f0ee2fb 100644 --- a/src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C +++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011-2013 OpenFOAM Foundation @@ -40,7 +40,7 @@ timeVaryingAlphaContactAngleFvPatchScalarField const DimensionedField& iF ) : - alphaContactAngleFvPatchScalarField(p, iF), + alphaContactAngleTwoPhaseFvPatchScalarField(p, iF), t0_(0.0), thetaT0_(0.0), te_(0.0), @@ -57,7 +57,7 @@ timeVaryingAlphaContactAngleFvPatchScalarField const fvPatchFieldMapper& mapper ) : - alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper), + alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, p, iF, mapper), t0_(gcpsf.t0_), thetaT0_(gcpsf.thetaT0_), te_(gcpsf.te_), @@ -73,7 +73,7 @@ timeVaryingAlphaContactAngleFvPatchScalarField const dictionary& dict ) : - alphaContactAngleFvPatchScalarField(p, iF, dict), + alphaContactAngleTwoPhaseFvPatchScalarField(p, iF, dict), t0_(dict.get("t0")), thetaT0_(dict.get("thetaT0")), te_(dict.get("te")), @@ -90,7 +90,7 @@ timeVaryingAlphaContactAngleFvPatchScalarField const DimensionedField& iF ) : - alphaContactAngleFvPatchScalarField(gcpsf, iF), + alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, iF), t0_(gcpsf.t0_), thetaT0_(gcpsf.thetaT0_), te_(gcpsf.te_), @@ -132,7 +132,7 @@ void Foam::timeVaryingAlphaContactAngleFvPatchScalarField::write Ostream& os ) const { - alphaContactAngleFvPatchScalarField::write(os); + alphaContactAngleTwoPhaseFvPatchScalarField::write(os); os.writeEntry("t0", t0_); os.writeEntry("thetaT0", thetaT0_); os.writeEntry("te", te_); diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H b/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H similarity index 94% rename from src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H rename to src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H index d726110bfc..f99ff17dd9 100644 --- a/src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H +++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | + \\ / A nd | Copyright (C) 2019 OpenCFD Ltd. \\/ M anipulation | ------------------------------------------------------------------------------- | Copyright (C) 2011-2013 OpenFOAM Foundation @@ -28,7 +28,7 @@ Class Description A time-varying alphaContactAngle scalar boundary condition - (alphaContactAngleFvPatchScalarField) + (alphaContactAngleTwoPhaseFvPatchScalarField) SourceFiles timeVaryingAlphaContactAngleFvPatchScalarField.C @@ -38,7 +38,7 @@ SourceFiles #ifndef timeVaryingAlphaContactAngleFvPatchScalarField_H #define timeVaryingAlphaContactAngleFvPatchScalarField_H -#include "alphaContactAngleFvPatchScalarField.H" +#include "alphaContactAngleTwoPhaseFvPatchScalarField.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // @@ -51,7 +51,7 @@ namespace Foam class timeVaryingAlphaContactAngleFvPatchScalarField : - public alphaContactAngleFvPatchScalarField + public alphaContactAngleTwoPhaseFvPatchScalarField { // Private data @@ -124,7 +124,7 @@ public: } - // Member functions + // Member Functions //- Evaluate and return the time-varying equilibrium contact-angle virtual tmp theta diff --git a/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C similarity index 100% rename from src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C rename to src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C diff --git a/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.H b/src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.H similarity index 100% rename from src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.H rename to src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.H