diff --git a/applications/solvers/multiphase/compressibleInterFoam/Make/options b/applications/solvers/multiphase/compressibleInterFoam/Make/options
index 995fd38e75da62aadab95d074e512bf768c08179..3d55f7f6759d86d79b82e59f5593fd1c7aedaec1 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 43c9b6871fd7b6e5c3224d71861b739c10a86d3b..d6736fe7c84f2f803bcd1d18be2e55a5688e2148 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 dd4418a547cf2d98a68c447c70f728a810368cac..12483a736df01072b7c9ea54f2982c179b752798 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 a1fb85d4d60d31860a7ca94c00d5c195a7e9d869..e96dde659071f894f59e92ae506b99f545a8ee56 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 a1ce378ad80e8773e274c56ad7f4e4dc7d887abb..8e3f95e80f223315594f35dc104ea79d1b95acd3 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 eb4da264f6fa14761e097af90a93c72e7b0d25b2..3f2792391d844557c75cdb03d3944893ec94da0a 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 4da1b2561522478d2b162edc871381440bc321f0..4a85a0ae9f3df278ee724f0e46e2e8025c8f6c82 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 59ebe3cc9f58f514d6113b9980fea1b97cce39e5..76551a9d1cd18caec728679591fcf3ee5e9776bf 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 fd1d515c7d8466c96131ccaaabd3dbf3cc99135e..4602251370a425b83b6228da1af72e4f00bb693d 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<alphaContactAngleFvPatchScalarField>(alpha1[patchi]))
+ if (isA<alphaContactAngleTwoPhaseFvPatchScalarField>(alpha1[patchi]))
{
- const alphaContactAngleFvPatchScalarField& a2cap =
- refCast<const alphaContactAngleFvPatchScalarField>
+ const alphaContactAngleTwoPhaseFvPatchScalarField& a2cap =
+ refCast<const alphaContactAngleTwoPhaseFvPatchScalarField>
(alpha2[patchi]);
- const alphaContactAngleFvPatchScalarField& a3cap =
- refCast<const alphaContactAngleFvPatchScalarField>
+ const alphaContactAngleTwoPhaseFvPatchScalarField& a3cap =
+ refCast<const alphaContactAngleTwoPhaseFvPatchScalarField>
(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 3a8113d1893b6d3a74e504102443b21834c49c23..6e898b3f435559c099086df8f61125c2eab8069e 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 6e5522bc5e876ad2d523465cc473c1765707580d..9985961973a30e800fe4e1aa308f75ce5bce6042 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 0391ed7c62761aa2987e4e0d50fd51f2fb1c4aa9..2e61e4ba77d0be0dc1abb39def18867c4c7dba18 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 e94119d61a7d003c8be878455cbaca485310d9da..4790540e340032cc82bbd7304925d8ace24981f1 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 4f2d1e9eeb5d752138df7ea172104540bfba569c..4ae2fbf96644b3ac1443ae0bea87926356d158fd 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 71a9d307c9632ecc122c4d9d7bbfab6cc6ae3e4c..5e1436426b37109e5fe9b08e5a4b55b1ba19aae8 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 8ca45c1d122484f53a034789e094ea14e36abe4e..cc63db7dcc45c854ad4a57862b1b9ad635ec5ce7 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 f7e52cff54f77d619f1ea5b0a5ad0206e83b3f9f..34ae049a3f458c49c3a1b6c2a5109a1926e8c301 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<scalar, volMesh>& iF
@@ -63,7 +58,8 @@ Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
{}
-Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
+Foam::alphaContactAngleTwoPhaseFvPatchScalarField::
+alphaContactAngleTwoPhaseFvPatchScalarField
(
const fvPatch& p,
const DimensionedField<scalar, volMesh>& 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<scalar, volMesh>& 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<scalar, volMesh>& 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 f7d2efd7555214a5574a19c147fae969e9d25f5c..3a7af4217e734cb4c7908b9cc89a9e5e78e549e2 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 <http://www.gnu.org/licenses/>.
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<scalar, volMesh>&
);
//- Construct from patch, internal field and dictionary
- alphaContactAngleFvPatchScalarField
+ alphaContactAngleTwoPhaseFvPatchScalarField
(
const fvPatch&,
const DimensionedField<scalar, volMesh>&,
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<scalar, volMesh>&,
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<scalar, volMesh>&
);
@@ -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 cee147e9b3ba8f7ca00831b1f4e9736455d0ec69..7c974d7363e730942dfaf26d725c3e65a0fe9d12 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<alphaContactAngleFvPatchScalarField>(abf[patchi]))
+ if (isA<alphaContactAngleTwoPhaseFvPatchScalarField>(abf[patchi]))
{
- alphaContactAngleFvPatchScalarField& acap =
- const_cast<alphaContactAngleFvPatchScalarField&>
+ alphaContactAngleTwoPhaseFvPatchScalarField& acap =
+ const_cast<alphaContactAngleTwoPhaseFvPatchScalarField&>
(
- refCast<const alphaContactAngleFvPatchScalarField>
+ refCast<const alphaContactAngleTwoPhaseFvPatchScalarField>
(
abf[patchi]
)
diff --git a/src/transportModels/interfaceProperties/interfaceProperties.H b/src/transportModels/interfaceProperties/interfaceProperties.H
index 4d1ae6b8155d497c2ffaf93c45c1dca51ef1e79b..c74a84232c92549b84dfca1dbff77457966d9e17 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 0000000000000000000000000000000000000000..9c16bbc4a35c13259c86d8854a23d98cb82ba9af
--- /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 0000000000000000000000000000000000000000..32ce36b9594d8e970ba45526b49fce90d0d9fef0
--- /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 2ba3ac1468d205da95f29d85d7aefc8a93a3ee16..2978eecfed6da004fb9c97d63c2c6a904543b393 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<scalar, volMesh>& 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<scalar>("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<scalar, volMesh>& 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 18d9f654312078fc22a4b677688c99e9e2c0a759..3e12b7eb885e9974f289c245eeecbd176f3fbcb3 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 ab5782c4c9f58f234f35beec9d1edd384932e624..a253bafe90b84f77d0768de6a488217fe54ad051 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<scalar, volMesh>& 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<scalar>("theta0")),
uTheta_(dict.get<scalar>("uTheta")),
thetaA_(dict.get<scalar>("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<scalar, volMesh>& 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 aa314829e93348ffc1db4de8e7a641d96a140033..6c77b021e8281d34ed1dd2726e1da726dc7b7819 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 371a15434f72312c2a7325d1b54d9c2ca5eeda07..36f362f0c3d80bfc2a76c3c28c0a66b9bb4bfa99 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<scalar, volMesh>& 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<word>("T", "T")),
theta0_(Function1<scalar>::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<scalar, volMesh>& 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<word>("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 7a212147bb8d76283666ab3ad2986f591893a2dc..93e1c135709c71a9decc8b4ee0ff7fed98c97652 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 7bb8bc0501d80d02688d5db3d4e34d6f752bb59e..4f3f0ee2fb02c90c2b43ee552a9e282834851bfe 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<scalar, volMesh>& 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<scalar>("t0")),
thetaT0_(dict.get<scalar>("thetaT0")),
te_(dict.get<scalar>("te")),
@@ -90,7 +90,7 @@ timeVaryingAlphaContactAngleFvPatchScalarField
const DimensionedField<scalar, volMesh>& 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 d726110bfcbe1fe9138302279b5ffc2777b178c8..f99ff17dd939c01a39e84a4a52500e751e7af1f6 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<scalarField> 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