zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues 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
parent ffa37bd5aa
commit d3d0e08e35
32 changed files with 135 additions and 114 deletions
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 \ -lfluidThermophysicalModels \
-lspecie \ -lspecie \
-ltwoPhaseMixture \ -ltwoPhaseMixture \
-ltwoPhaseProperties \
-linterfaceProperties \ -linterfaceProperties \
-lturbulenceModels \ -lturbulenceModels \
-lcompressibleTurbulenceModels \ -lcompressibleTurbulenceModels \

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

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

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

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

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

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

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

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

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

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

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

@ -1,3 +1,4 @@
EXE_INC = \ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \ -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
@ -9,6 +10,7 @@ EXE_INC = \
LIB_LIBS = \ LIB_LIBS = \
-ltwoPhaseMixture \ -ltwoPhaseMixture \
-linterfaceProperties \ -linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lfiniteVolume \ -lfiniteVolume \
-lfluidThermophysicalModels -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)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseProperties/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude -I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude
@ -20,8 +21,9 @@ EXE_LIBS = \
-lfvOptions \ -lfvOptions \
-lmeshTools \ -lmeshTools \
-lsampling \ -lsampling \
-ltwoPhaseMixture \
-linterfaceProperties \ -linterfaceProperties \
-ltwoPhaseMixture \
-ltwoPhaseProperties \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lturbulenceModels \ -lturbulenceModels \
-lincompressibleTurbulenceModels \ -lincompressibleTurbulenceModels \

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

@ -26,7 +26,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "threePhaseInterfaceProperties.H" #include "threePhaseInterfaceProperties.H"
#include "alphaContactAngleFvPatchScalarField.H" #include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
#include "surfaceInterpolate.H" #include "surfaceInterpolate.H"
#include "fvcDiv.H" #include "fvcDiv.H"
@ -55,14 +55,14 @@ void Foam::threePhaseInterfaceProperties::correctContactAngle
forAll(boundary, patchi) forAll(boundary, patchi)
{ {
if (isA<alphaContactAngleFvPatchScalarField>(alpha1[patchi])) if (isA<alphaContactAngleTwoPhaseFvPatchScalarField>(alpha1[patchi]))
{ {
const alphaContactAngleFvPatchScalarField& a2cap = const alphaContactAngleTwoPhaseFvPatchScalarField& a2cap =
refCast<const alphaContactAngleFvPatchScalarField> refCast<const alphaContactAngleTwoPhaseFvPatchScalarField>
(alpha2[patchi]); (alpha2[patchi]);
const alphaContactAngleFvPatchScalarField& a3cap = const alphaContactAngleTwoPhaseFvPatchScalarField& a3cap =
refCast<const alphaContactAngleFvPatchScalarField> refCast<const alphaContactAngleTwoPhaseFvPatchScalarField>
(alpha3[patchi]); (alpha3[patchi]);
scalarField twoPhaseAlpha2(max(a2cap, scalar(0))); scalarField twoPhaseAlpha2(max(a2cap, scalar(0)));

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

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

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

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

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

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

1
src/transportModels/Allwmake
View File

@ -6,6 +6,7 @@ cd ${0%/*} || exit 1 # Run from this directory
wmake $targetType twoPhaseMixture wmake $targetType twoPhaseMixture
wmake $targetType interfaceProperties wmake $targetType interfaceProperties
wmake $targetType twoPhaseProperties
wmake $targetType incompressible wmake $targetType incompressible
wmake $targetType compressible wmake $targetType compressible
wmake $targetType immiscibleIncompressibleTwoPhaseMixture wmake $targetType immiscibleIncompressibleTwoPhaseMixture

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

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

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

@ -1,12 +1,7 @@
interfaceProperties.C interfaceProperties.C
interfaceCompression/interfaceCompression.C interfaceCompression/interfaceCompression.C
alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C alphaContactAngle/alphaContactAngleTwoPhaseFvPatchScalarField.C
alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C surfaceTensionModels/surfaceTensionModel/surfaceTensionModel.C
surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C

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

@ -1,7 +1,8 @@
EXE_INC = \ 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 = \ 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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2015 OpenFOAM Foundation | Copyright (C) 2011-2015 OpenFOAM Foundation
@ -25,23 +25,17 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "alphaContactAngleFvPatchScalarField.H" #include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
#include "volMesh.H" #include "volMesh.H"
#include "addToRunTimeSelectionTable.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam
{
defineTypeNameAndDebug(alphaContactAngleFvPatchScalarField, 0);
}
const Foam::Enum const Foam::Enum
< <
Foam::alphaContactAngleFvPatchScalarField::limitControls Foam::alphaContactAngleTwoPhaseFvPatchScalarField::limitControls
> >
Foam::alphaContactAngleFvPatchScalarField::limitControlNames_ Foam::alphaContactAngleTwoPhaseFvPatchScalarField::limitControlNames_
({ ({
{ limitControls::lcNone, "none" }, { limitControls::lcNone, "none" },
{ limitControls::lcGradient, "gradient" }, { limitControls::lcGradient, "gradient" },
@ -52,7 +46,8 @@ Foam::alphaContactAngleFvPatchScalarField::limitControlNames_
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField Foam::alphaContactAngleTwoPhaseFvPatchScalarField::
alphaContactAngleTwoPhaseFvPatchScalarField
( (
const fvPatch& p, const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
@ -63,7 +58,8 @@ Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
{} {}
Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField Foam::alphaContactAngleTwoPhaseFvPatchScalarField::
alphaContactAngleTwoPhaseFvPatchScalarField
( (
const fvPatch& p, const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF, 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 fvPatch& p,
const DimensionedField<scalar, volMesh>& iF, const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper const fvPatchFieldMapper& mapper
@ -100,9 +97,10 @@ Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
{} {}
Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField Foam::alphaContactAngleTwoPhaseFvPatchScalarField::
alphaContactAngleTwoPhaseFvPatchScalarField
( (
const alphaContactAngleFvPatchScalarField& acpsf const alphaContactAngleTwoPhaseFvPatchScalarField& acpsf
) )
: :
fixedGradientFvPatchScalarField(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 const DimensionedField<scalar, volMesh>& iF
) )
: :
@ -123,7 +122,7 @@ Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::alphaContactAngleFvPatchScalarField::evaluate void Foam::alphaContactAngleTwoPhaseFvPatchScalarField::evaluate
( (
const Pstream::commsTypes const Pstream::commsTypes
) )
@ -154,7 +153,7 @@ void Foam::alphaContactAngleFvPatchScalarField::evaluate
} }
void Foam::alphaContactAngleFvPatchScalarField::write void Foam::alphaContactAngleTwoPhaseFvPatchScalarField::write
( (
Ostream& os Ostream& os
) const ) 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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2017 OpenFOAM Foundation | Copyright (C) 2011-2017 OpenFOAM Foundation
@ -24,15 +24,15 @@ License
along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>. along with OpenFOAM. If not, see <http://www.gnu.org/licenses/>.
Class Class
Foam::alphaContactAngleFvPatchScalarField Foam::alphaContactAngleTwoPhaseFvPatchScalarField
Group Group
grpWallBoundaryConditions grpGenericBoundaryConditions grpWallBoundaryConditions grpGenericBoundaryConditions
Description 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. wall contact angle field.
The essential entry "limit" controls the gradient of alpha1 on the wall: The essential entry "limit" controls the gradient of alpha1 on the wall:
@ -56,12 +56,12 @@ Description
\endverbatim \endverbatim
SourceFiles SourceFiles
alphaContactAngleFvPatchScalarField.C alphaContactAngleTwoPhaseFvPatchScalarField.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef alphaContactAngleFvPatchScalarField_H #ifndef alphaContactAngleTwoPhaseFvPatchScalarField_H
#define alphaContactAngleFvPatchScalarField_H #define alphaContactAngleTwoPhaseFvPatchScalarField_H
#include "fixedGradientFvPatchFields.H" #include "fixedGradientFvPatchFields.H"
#include "fvsPatchFields.H" #include "fvsPatchFields.H"
@ -72,18 +72,16 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class alphaContactAngleFvPatchScalarField Declaration Class alphaContactAngleTwoPhaseFvPatchScalarField Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class alphaContactAngleFvPatchScalarField class alphaContactAngleTwoPhaseFvPatchScalarField
: :
public fixedGradientFvPatchScalarField public fixedGradientFvPatchScalarField
{ {
public: public:
//- Runtime type information // Abstract class, no runtime information
TypeName("alphaContactAngle");
//- Alpha limit options //- Alpha limit options
enum limitControls enum limitControls
@ -100,40 +98,39 @@ public:
// Constructors // Constructors
//- Construct from patch and internal field //- Construct from patch and internal field
alphaContactAngleFvPatchScalarField alphaContactAngleTwoPhaseFvPatchScalarField
( (
const fvPatch&, const fvPatch&,
const DimensionedField<scalar, volMesh>& const DimensionedField<scalar, volMesh>&
); );
//- Construct from patch, internal field and dictionary //- Construct from patch, internal field and dictionary
alphaContactAngleFvPatchScalarField alphaContactAngleTwoPhaseFvPatchScalarField
( (
const fvPatch&, const fvPatch&,
const DimensionedField<scalar, volMesh>&, const DimensionedField<scalar, volMesh>&,
const dictionary& const dictionary&
); );
//- Construct by mapping given alphaContactAngleFvPatchScalarField //- Construct by mapping onto a new patch
// onto a new patch alphaContactAngleTwoPhaseFvPatchScalarField
alphaContactAngleFvPatchScalarField
( (
const alphaContactAngleFvPatchScalarField&, const alphaContactAngleTwoPhaseFvPatchScalarField&,
const fvPatch&, const fvPatch&,
const DimensionedField<scalar, volMesh>&, const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper& const fvPatchFieldMapper&
); );
//- Construct as copy //- Construct as copy
alphaContactAngleFvPatchScalarField alphaContactAngleTwoPhaseFvPatchScalarField
( (
const alphaContactAngleFvPatchScalarField& const alphaContactAngleTwoPhaseFvPatchScalarField&
); );
//- Construct as copy setting internal field reference //- Construct as copy setting internal field reference
alphaContactAngleFvPatchScalarField alphaContactAngleTwoPhaseFvPatchScalarField
( (
const alphaContactAngleFvPatchScalarField&, const alphaContactAngleTwoPhaseFvPatchScalarField&,
const DimensionedField<scalar, volMesh>& const DimensionedField<scalar, volMesh>&
); );
@ -154,7 +151,7 @@ public:
); );
//- Write //- 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 "interfaceProperties.H"
#include "alphaContactAngleFvPatchScalarField.H" #include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
#include "mathematicalConstants.H" #include "mathematicalConstants.H"
#include "surfaceInterpolate.H" #include "surfaceInterpolate.H"
#include "fvcDiv.H" #include "fvcDiv.H"
@ -55,12 +55,12 @@ void Foam::interfaceProperties::correctContactAngle
forAll(boundary, patchi) forAll(boundary, patchi)
{ {
if (isA<alphaContactAngleFvPatchScalarField>(abf[patchi])) if (isA<alphaContactAngleTwoPhaseFvPatchScalarField>(abf[patchi]))
{ {
alphaContactAngleFvPatchScalarField& acap = alphaContactAngleTwoPhaseFvPatchScalarField& acap =
const_cast<alphaContactAngleFvPatchScalarField&> const_cast<alphaContactAngleTwoPhaseFvPatchScalarField&>
( (
refCast<const alphaContactAngleFvPatchScalarField> refCast<const alphaContactAngleTwoPhaseFvPatchScalarField>
( (
abf[patchi] abf[patchi]
) )

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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2008-2010, 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2015 OpenFOAM Foundation | Copyright (C) 2011-2015 OpenFOAM Foundation
@ -39,7 +39,7 @@ constantAlphaContactAngleFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
) )
: :
alphaContactAngleFvPatchScalarField(p, iF), alphaContactAngleTwoPhaseFvPatchScalarField(p, iF),
theta0_(0.0) theta0_(0.0)
{} {}
@ -52,7 +52,7 @@ constantAlphaContactAngleFvPatchScalarField
const dictionary& dict const dictionary& dict
) )
: :
alphaContactAngleFvPatchScalarField(p, iF, dict), alphaContactAngleTwoPhaseFvPatchScalarField(p, iF, dict),
theta0_(dict.get<scalar>("theta0")) theta0_(dict.get<scalar>("theta0"))
{ {
evaluate(); evaluate();
@ -68,7 +68,7 @@ constantAlphaContactAngleFvPatchScalarField
const fvPatchFieldMapper& mapper const fvPatchFieldMapper& mapper
) )
: :
alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper), alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, p, iF, mapper),
theta0_(gcpsf.theta0_) theta0_(gcpsf.theta0_)
{} {}
@ -79,7 +79,7 @@ constantAlphaContactAngleFvPatchScalarField
const constantAlphaContactAngleFvPatchScalarField& gcpsf const constantAlphaContactAngleFvPatchScalarField& gcpsf
) )
: :
alphaContactAngleFvPatchScalarField(gcpsf), alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf),
theta0_(gcpsf.theta0_) theta0_(gcpsf.theta0_)
{} {}
@ -91,7 +91,7 @@ constantAlphaContactAngleFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
) )
: :
alphaContactAngleFvPatchScalarField(gcpsf, iF), alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, iF),
theta0_(gcpsf.theta0_) theta0_(gcpsf.theta0_)
{} {}
@ -114,7 +114,7 @@ void Foam::constantAlphaContactAngleFvPatchScalarField::write
Ostream& os Ostream& os
) const ) const
{ {
alphaContactAngleFvPatchScalarField::write(os); alphaContactAngleTwoPhaseFvPatchScalarField::write(os);
os.writeEntry("theta0", theta0_); os.writeEntry("theta0", theta0_);
writeEntry("value", os); writeEntry("value", os);
} }

8
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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2008-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2008-2010, 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2016 OpenFOAM Foundation | Copyright (C) 2011-2016 OpenFOAM Foundation
@ -30,7 +30,7 @@ Description
A constant alphaContactAngle scalar boundary condition. A constant alphaContactAngle scalar boundary condition.
See also See also
Foam::alphaContactAngleFvPatchScalarField Foam::alphaContactAngleTwoPhaseFvPatchScalarField
Foam::temperatureDependentAlphaContactAngleFvPatchScalarField Foam::temperatureDependentAlphaContactAngleFvPatchScalarField
SourceFiles SourceFiles
@ -41,7 +41,7 @@ SourceFiles
#ifndef constantAlphaContactAngleFvPatchScalarField_H #ifndef constantAlphaContactAngleFvPatchScalarField_H
#define constantAlphaContactAngleFvPatchScalarField_H #define constantAlphaContactAngleFvPatchScalarField_H
#include "alphaContactAngleFvPatchScalarField.H" #include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -54,7 +54,7 @@ namespace Foam
class constantAlphaContactAngleFvPatchScalarField class constantAlphaContactAngleFvPatchScalarField
: :
public alphaContactAngleFvPatchScalarField public alphaContactAngleTwoPhaseFvPatchScalarField
{ {
// Private data // 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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2004-2010, 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2013 OpenFOAM Foundation | Copyright (C) 2011-2013 OpenFOAM Foundation
@ -39,7 +39,7 @@ dynamicAlphaContactAngleFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
) )
: :
alphaContactAngleFvPatchScalarField(p, iF), alphaContactAngleTwoPhaseFvPatchScalarField(p, iF),
theta0_(0.0), theta0_(0.0),
uTheta_(0.0), uTheta_(0.0),
thetaA_(0.0), thetaA_(0.0),
@ -56,7 +56,7 @@ dynamicAlphaContactAngleFvPatchScalarField
const fvPatchFieldMapper& mapper const fvPatchFieldMapper& mapper
) )
: :
alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper), alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, p, iF, mapper),
theta0_(gcpsf.theta0_), theta0_(gcpsf.theta0_),
uTheta_(gcpsf.uTheta_), uTheta_(gcpsf.uTheta_),
thetaA_(gcpsf.thetaA_), thetaA_(gcpsf.thetaA_),
@ -72,7 +72,7 @@ dynamicAlphaContactAngleFvPatchScalarField
const dictionary& dict const dictionary& dict
) )
: :
alphaContactAngleFvPatchScalarField(p, iF, dict), alphaContactAngleTwoPhaseFvPatchScalarField(p, iF, dict),
theta0_(dict.get<scalar>("theta0")), theta0_(dict.get<scalar>("theta0")),
uTheta_(dict.get<scalar>("uTheta")), uTheta_(dict.get<scalar>("uTheta")),
thetaA_(dict.get<scalar>("thetaA")), thetaA_(dict.get<scalar>("thetaA")),
@ -88,7 +88,7 @@ dynamicAlphaContactAngleFvPatchScalarField
const dynamicAlphaContactAngleFvPatchScalarField& gcpsf const dynamicAlphaContactAngleFvPatchScalarField& gcpsf
) )
: :
alphaContactAngleFvPatchScalarField(gcpsf), alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf),
theta0_(gcpsf.theta0_), theta0_(gcpsf.theta0_),
uTheta_(gcpsf.uTheta_), uTheta_(gcpsf.uTheta_),
thetaA_(gcpsf.thetaA_), thetaA_(gcpsf.thetaA_),
@ -103,7 +103,7 @@ dynamicAlphaContactAngleFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
) )
: :
alphaContactAngleFvPatchScalarField(gcpsf, iF), alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, iF),
theta0_(gcpsf.theta0_), theta0_(gcpsf.theta0_),
uTheta_(gcpsf.uTheta_), uTheta_(gcpsf.uTheta_),
thetaA_(gcpsf.thetaA_), thetaA_(gcpsf.thetaA_),
@ -147,7 +147,7 @@ Foam::dynamicAlphaContactAngleFvPatchScalarField::theta
void Foam::dynamicAlphaContactAngleFvPatchScalarField::write(Ostream& os) const void Foam::dynamicAlphaContactAngleFvPatchScalarField::write(Ostream& os) const
{ {
alphaContactAngleFvPatchScalarField::write(os); alphaContactAngleTwoPhaseFvPatchScalarField::write(os);
os.writeEntry("theta0", theta0_); os.writeEntry("theta0", theta0_);
os.writeEntry("uTheta", uTheta_); os.writeEntry("uTheta", uTheta_);
os.writeEntry("thetaA", thetaA_); os.writeEntry("thetaA", thetaA_);

8
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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2004-2010, 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2013 OpenFOAM Foundation | Copyright (C) 2011-2013 OpenFOAM Foundation
@ -28,7 +28,7 @@ Class
Description Description
A dynamic alphaContactAngle scalar boundary condition A dynamic alphaContactAngle scalar boundary condition
(alphaContactAngleFvPatchScalarField) (alphaContactAngleTwoPhaseFvPatchScalarField)
SourceFiles SourceFiles
dynamicAlphaContactAngleFvPatchScalarField.C dynamicAlphaContactAngleFvPatchScalarField.C
@ -38,7 +38,7 @@ SourceFiles
#ifndef dynamicAlphaContactAngleFvPatchScalarField_H #ifndef dynamicAlphaContactAngleFvPatchScalarField_H
#define dynamicAlphaContactAngleFvPatchScalarField_H #define dynamicAlphaContactAngleFvPatchScalarField_H
#include "alphaContactAngleFvPatchScalarField.H" #include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -51,7 +51,7 @@ namespace Foam
class dynamicAlphaContactAngleFvPatchScalarField class dynamicAlphaContactAngleFvPatchScalarField
: :
public alphaContactAngleFvPatchScalarField public alphaContactAngleTwoPhaseFvPatchScalarField
{ {
// Private data // 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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2015-2016 OpenFOAM Foundation | Copyright (C) 2015-2016 OpenFOAM Foundation
@ -39,7 +39,7 @@ temperatureDependentAlphaContactAngleFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
) )
: :
alphaContactAngleFvPatchScalarField(p, iF), alphaContactAngleTwoPhaseFvPatchScalarField(p, iF),
TName_("T"), TName_("T"),
theta0_() theta0_()
{} {}
@ -53,7 +53,7 @@ temperatureDependentAlphaContactAngleFvPatchScalarField
const dictionary& dict const dictionary& dict
) )
: :
alphaContactAngleFvPatchScalarField(p, iF, dict), alphaContactAngleTwoPhaseFvPatchScalarField(p, iF, dict),
TName_(dict.lookupOrDefault<word>("T", "T")), TName_(dict.lookupOrDefault<word>("T", "T")),
theta0_(Function1<scalar>::New("theta0", dict)) theta0_(Function1<scalar>::New("theta0", dict))
{ {
@ -70,7 +70,7 @@ temperatureDependentAlphaContactAngleFvPatchScalarField
const fvPatchFieldMapper& mapper const fvPatchFieldMapper& mapper
) )
: :
alphaContactAngleFvPatchScalarField(psf, p, iF, mapper), alphaContactAngleTwoPhaseFvPatchScalarField(psf, p, iF, mapper),
TName_(psf.TName_), TName_(psf.TName_),
theta0_(psf.theta0_.clone()) theta0_(psf.theta0_.clone())
{} {}
@ -82,7 +82,7 @@ temperatureDependentAlphaContactAngleFvPatchScalarField
const temperatureDependentAlphaContactAngleFvPatchScalarField& psf const temperatureDependentAlphaContactAngleFvPatchScalarField& psf
) )
: :
alphaContactAngleFvPatchScalarField(psf), alphaContactAngleTwoPhaseFvPatchScalarField(psf),
TName_(psf.TName_), TName_(psf.TName_),
theta0_(psf.theta0_.clone()) theta0_(psf.theta0_.clone())
{} {}
@ -95,7 +95,7 @@ temperatureDependentAlphaContactAngleFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
) )
: :
alphaContactAngleFvPatchScalarField(psf, iF), alphaContactAngleTwoPhaseFvPatchScalarField(psf, iF),
TName_(psf.TName_), TName_(psf.TName_),
theta0_(psf.theta0_.clone()) theta0_(psf.theta0_.clone())
{} {}
@ -122,7 +122,7 @@ void Foam::temperatureDependentAlphaContactAngleFvPatchScalarField::write
Ostream& os Ostream& os
) const ) const
{ {
alphaContactAngleFvPatchScalarField::write(os); alphaContactAngleTwoPhaseFvPatchScalarField::write(os);
os.writeEntryIfDifferent<word>("T", "T", TName_); os.writeEntryIfDifferent<word>("T", "T", TName_);
theta0_->writeData(os); theta0_->writeData(os);
writeEntry("value", 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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | \\ / A nd | Copyright (C) 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2015-2017 OpenFOAM Foundation | Copyright (C) 2015-2017 OpenFOAM Foundation
@ -50,7 +50,7 @@ Usage
\endverbatim \endverbatim
See also See also
Foam::alphaContactAngleFvPatchScalarField Foam::alphaContactAngleTwoPhaseFvPatchScalarField
Foam::constantAlphaContactAngleFvPatchScalarField Foam::constantAlphaContactAngleFvPatchScalarField
Foam::Function1 Foam::Function1
@ -62,7 +62,7 @@ SourceFiles
#ifndef temperatureDependentAlphaContactAngleFvPatchScalarField_H #ifndef temperatureDependentAlphaContactAngleFvPatchScalarField_H
#define temperatureDependentAlphaContactAngleFvPatchScalarField_H #define temperatureDependentAlphaContactAngleFvPatchScalarField_H
#include "alphaContactAngleFvPatchScalarField.H" #include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
#include "Function1.H" #include "Function1.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -76,7 +76,7 @@ namespace Foam
class temperatureDependentAlphaContactAngleFvPatchScalarField class temperatureDependentAlphaContactAngleFvPatchScalarField
: :
public alphaContactAngleFvPatchScalarField public alphaContactAngleTwoPhaseFvPatchScalarField
{ {
// Private data // 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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2004-2010, 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2013 OpenFOAM Foundation | Copyright (C) 2011-2013 OpenFOAM Foundation
@ -40,7 +40,7 @@ timeVaryingAlphaContactAngleFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
) )
: :
alphaContactAngleFvPatchScalarField(p, iF), alphaContactAngleTwoPhaseFvPatchScalarField(p, iF),
t0_(0.0), t0_(0.0),
thetaT0_(0.0), thetaT0_(0.0),
te_(0.0), te_(0.0),
@ -57,7 +57,7 @@ timeVaryingAlphaContactAngleFvPatchScalarField
const fvPatchFieldMapper& mapper const fvPatchFieldMapper& mapper
) )
: :
alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper), alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, p, iF, mapper),
t0_(gcpsf.t0_), t0_(gcpsf.t0_),
thetaT0_(gcpsf.thetaT0_), thetaT0_(gcpsf.thetaT0_),
te_(gcpsf.te_), te_(gcpsf.te_),
@ -73,7 +73,7 @@ timeVaryingAlphaContactAngleFvPatchScalarField
const dictionary& dict const dictionary& dict
) )
: :
alphaContactAngleFvPatchScalarField(p, iF, dict), alphaContactAngleTwoPhaseFvPatchScalarField(p, iF, dict),
t0_(dict.get<scalar>("t0")), t0_(dict.get<scalar>("t0")),
thetaT0_(dict.get<scalar>("thetaT0")), thetaT0_(dict.get<scalar>("thetaT0")),
te_(dict.get<scalar>("te")), te_(dict.get<scalar>("te")),
@ -90,7 +90,7 @@ timeVaryingAlphaContactAngleFvPatchScalarField
const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
) )
: :
alphaContactAngleFvPatchScalarField(gcpsf, iF), alphaContactAngleTwoPhaseFvPatchScalarField(gcpsf, iF),
t0_(gcpsf.t0_), t0_(gcpsf.t0_),
thetaT0_(gcpsf.thetaT0_), thetaT0_(gcpsf.thetaT0_),
te_(gcpsf.te_), te_(gcpsf.te_),
@ -132,7 +132,7 @@ void Foam::timeVaryingAlphaContactAngleFvPatchScalarField::write
Ostream& os Ostream& os
) const ) const
{ {
alphaContactAngleFvPatchScalarField::write(os); alphaContactAngleTwoPhaseFvPatchScalarField::write(os);
os.writeEntry("t0", t0_); os.writeEntry("t0", t0_);
os.writeEntry("thetaT0", thetaT0_); os.writeEntry("thetaT0", thetaT0_);
os.writeEntry("te", te_); 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 \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2004-2010 OpenCFD Ltd. \\ / A nd | Copyright (C) 2004-2010, 2019 OpenCFD Ltd.
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
| Copyright (C) 2011-2013 OpenFOAM Foundation | Copyright (C) 2011-2013 OpenFOAM Foundation
@ -28,7 +28,7 @@ Class
Description Description
A time-varying alphaContactAngle scalar boundary condition A time-varying alphaContactAngle scalar boundary condition
(alphaContactAngleFvPatchScalarField) (alphaContactAngleTwoPhaseFvPatchScalarField)
SourceFiles SourceFiles
timeVaryingAlphaContactAngleFvPatchScalarField.C timeVaryingAlphaContactAngleFvPatchScalarField.C
@ -38,7 +38,7 @@ SourceFiles
#ifndef timeVaryingAlphaContactAngleFvPatchScalarField_H #ifndef timeVaryingAlphaContactAngleFvPatchScalarField_H
#define timeVaryingAlphaContactAngleFvPatchScalarField_H #define timeVaryingAlphaContactAngleFvPatchScalarField_H
#include "alphaContactAngleFvPatchScalarField.H" #include "alphaContactAngleTwoPhaseFvPatchScalarField.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -51,7 +51,7 @@ namespace Foam
class timeVaryingAlphaContactAngleFvPatchScalarField class timeVaryingAlphaContactAngleFvPatchScalarField
: :
public alphaContactAngleFvPatchScalarField public alphaContactAngleTwoPhaseFvPatchScalarField
{ {
// Private data // Private data
@ -124,7 +124,7 @@ public:
} }
// Member functions // Member Functions
//- Evaluate and return the time-varying equilibrium contact-angle //- Evaluate and return the time-varying equilibrium contact-angle
virtual tmp<scalarField> theta 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