songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "COMP: combine twoPhaseProperties library into interfaceProperties"

Browse Source 
Modified revert of commit 6c6f777bd5.

- 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.
This commit is contained in:
Mark Olesen 2019-05-08 18:48:52 +02:00 committed by Andrew Heather
parent 6630fb2b69
commit 2eeaa326d6
32 changed files with 135 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
applications/solvers/multiphase/compressibleInterFoam/Make/options
View File

@ -23,6 +23,7 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-ltwoPhaseMixture \
-ltwoPhaseProperties \
-linterfaceProperties \
-lturbulenceModels \
-lcompressibleTurbulenceModels \

1
applications/solvers/multiphase/compressibleInterFoam/VoFphaseCompressibleTurbulenceModels/Make/options
View File

@ -16,6 +16,7 @@ LIB_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-ltwoPhaseMixture \
-ltwoPhaseProperties \
-linterfaceProperties \
-lturbulenceModels \
-lcompressibleTurbulenceModels \

1
applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/Make/options
View File

@ -26,6 +26,7 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-ltwoPhaseMixture \
-ltwoPhaseProperties \
-linterfaceProperties \
-lturbulenceModels \
-lcompressibleTurbulenceModels \

1
applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/Make/options
View File

@ -34,6 +34,7 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-ltwoPhaseMixture \
-ltwoPhaseProperties \
-linterfaceProperties \
-lturbulenceModels \
-lcompressibleTurbulenceModels \

2
applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options
View File

@ -29,5 +29,5 @@ EXE_LIBS = \
-lmassTransferModels \
-lsolidThermo \
-lsolidSpecie \
-linterfaceProperties \
-ltwoPhaseProperties \
-llaserDTRM

1
applications/solvers/multiphase/interCondensatingEvaporatingFoam/Make/options
View File

@ -24,6 +24,7 @@ EXE_LIBS = \
-lphaseTemperatureChangeTwoPhaseMixtures \
-ltwoPhaseMixture \
-linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \
-lturbulenceModels \
-lincompressibleTurbulenceModels \

2
applications/solvers/multiphase/interCondensatingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/Make/options
View File

@ -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

4
applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
View File

@ -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 \

12
applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
View File

@ -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)));

1
applications/solvers/multiphase/interPhaseChangeFoam/Make/options
View File

@ -18,6 +18,7 @@ EXE_LIBS = \
-lphaseChangeTwoPhaseMixtures \
-ltwoPhaseMixture \
-linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \
-lturbulenceModels \
-lincompressibleTurbulenceModels

1
applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/Make/options
View File

@ -21,6 +21,7 @@ EXE_LIBS = \
-lphaseChangeTwoPhaseMixtures \
-ltwoPhaseMixture \
-linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \
-lturbulenceModels \
-lincompressibleTurbulenceModels \

2
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Make/options
View File

@ -6,6 +6,6 @@ EXE_INC = \
LIB_LIBS = \
-ltwoPhaseMixture \
-linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \
-lfiniteVolume

1
src/transportModels/Allwmake
View File

@ -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

1
src/transportModels/immiscibleIncompressibleTwoPhaseMixture/Make/options
View File

@ -9,4 +9,5 @@ LIB_LIBS = \
-ltwoPhaseMixture \
-lincompressibleTransportModels \
-linterfaceProperties \
-ltwoPhaseProperties \
-lfiniteVolume

7
src/transportModels/interfaceProperties/Make/files
View File

@ -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

9
src/transportModels/interfaceProperties/Make/options
View File

@ -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

39
src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C → src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
View File

@ -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

43
src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H → src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.H
View File

@ -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;
};

10
src/transportModels/interfaceProperties/interfaceProperties.C
View File

@ -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]
)

2
src/transportModels/interfaceProperties/interfaceProperties.H
View File

@ -52,7 +52,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class interfaceProperties Declaration
Class interfaceProperties Declaration
\*---------------------------------------------------------------------------*/
class interfaceProperties

7
src/transportModels/twoPhaseProperties/Make/files Normal file
View File

@ -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

9
src/transportModels/twoPhaseProperties/Make/options Normal file
View File

@ -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

14
src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C → src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
View File

@ -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);
}

10
src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H → src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H
View File

@ -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

14
src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C → src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
View File

@ -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_);

10
src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H → src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H
View File

@ -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

14
src/transportModels/interfaceProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C → src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
View File

@ -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);

8
src/transportModels/interfaceProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H → src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.H
View File

@ -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

12
src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C → src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
View File

@ -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_);

10
src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H → src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H
View File

@ -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

0
src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C → src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
View File

0
src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.H → src/transportModels/twoPhaseProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.H
View File