Commit 2eeaa326 authored by Mark Olesen's avatar Mark Olesen Committed by Andrew Heather
Browse files

Revert "COMP: combine twoPhaseProperties library into interfaceProperties"

Modified revert of commit 6c6f777b.

- 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.
parent 6630fb2b
......@@ -23,6 +23,7 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-ltwoPhaseMixture \
-ltwoPhaseProperties \
-linterfaceProperties \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
......
......@@ -16,6 +16,7 @@ LIB_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-ltwoPhaseMixture \
-ltwoPhaseProperties \
-linterfaceProperties \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
......
......@@ -26,6 +26,7 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-ltwoPhaseMixture \
-ltwoPhaseProperties \
-linterfaceProperties \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
......
......@@ -34,6 +34,7 @@ EXE_LIBS = \
-lfluidThermophysicalModels \
-lspecie \
-ltwoPhaseMixture \
-ltwoPhaseProperties \
-linterfaceProperties \
-lturbulenceModels \
-lcompressibleTurbulenceModels \
......
......@@ -29,5 +29,5 @@ EXE_LIBS = \
-lmassTransferModels \
-lsolidThermo \
-lsolidSpecie \
-linterfaceProperties \
-ltwoPhaseProperties \
-llaserDTRM
......@@ -24,6 +24,7 @@ EXE_LIBS = \
-lphaseTemperatureChangeTwoPhaseMixtures \
-ltwoPhaseMixture \
-linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
......
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
......@@ -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 \
......
......@@ -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)));
......
......@@ -18,6 +18,7 @@ EXE_LIBS = \
-lphaseChangeTwoPhaseMixtures \
-ltwoPhaseMixture \
-linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \
-lturbulenceModels \
-lincompressibleTurbulenceModels
......@@ -21,6 +21,7 @@ EXE_LIBS = \
-lphaseChangeTwoPhaseMixtures \
-ltwoPhaseMixture \
-linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
......
......@@ -6,6 +6,6 @@ EXE_INC = \
LIB_LIBS = \
-ltwoPhaseMixture \
-linterfaceProperties \
-ltwoPhaseProperties \
-lincompressibleTransportModels \
-lfiniteVolume
......@@ -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
......
......@@ -9,4 +9,5 @@ LIB_LIBS = \
-ltwoPhaseMixture \
-lincompressibleTransportModels \
-linterfaceProperties \
-ltwoPhaseProperties \
-lfiniteVolume
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
......
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
......@@ -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
......
......@@ -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;
};
......
......@@ -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]
)
......
......@@ -52,7 +52,7 @@ namespace Foam
{
/*---------------------------------------------------------------------------*\
Class interfaceProperties Declaration
Class interfaceProperties Declaration
\*---------------------------------------------------------------------------*/
class interfaceProperties
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment