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

multiphaseInterFoam: changed alphaContactAngleFvPatchScalarField to multiphaseAlphaContactAngleFvPatchScalarField

Browse Source 
to avoid name clashed with the version of alphaContactAngleFvPatchScalarField in the interfaceProperties library.
This commit is contained in:
henry 2010-06-10 12:53:54 +01:00
parent 02d5869644
commit 17d36e9353
8 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/multiphase/multiphaseInterFoam/Make/files
View File

@ -1,5 +1,5 @@
multiphaseMixture/phase/phase.C multiphaseMixture/phase/phase.C
multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.C
multiphaseMixture/multiphaseMixture.C multiphaseMixture/multiphaseMixture.C
multiphaseInterFoam.C multiphaseInterFoam.C

4
applications/solvers/multiphase/multiphaseInterFoam/Make/options
View File

@ -2,17 +2,15 @@ EXE_INC = \
-I../interFoam \ -I../interFoam \
-ImultiphaseMixture \ -ImultiphaseMixture \
-ImultiphaseMixture/phase \ -ImultiphaseMixture/phase \
-ImultiphaseMixture/alphaContactAngle \ -ImultiphaseMixture/multiphaseAlphaContactAngle \
-I$(LIB_SRC)/transportModels \ -I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \ -I$(LIB_SRC)/turbulenceModels/incompressible/turbulenceModel \
-I$(LIB_SRC)/finiteVolume/lnInclude -I$(LIB_SRC)/finiteVolume/lnInclude
EXE_LIBS = \ EXE_LIBS = \
-linterfaceProperties \ -linterfaceProperties \
-lincompressibleTransportModels \ -lincompressibleTransportModels \
-lincompressibleTransportModels \
-lincompressibleRASModels \ -lincompressibleRASModels \
-lincompressibleLESModels \ -lincompressibleLESModels \
-lfiniteVolume -lfiniteVolume

2
applications/solvers/multiphase/multiphaseInterFoam/createFields.H
View File

@ -26,7 +26,7 @@
mesh mesh
); );
# include "createPhi.H" #include "createPhi.H"
multiphaseMixture mixture(U, phi); multiphaseMixture mixture(U, phi);

2
applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
View File

@ -80,7 +80,7 @@ int main(int argc, char *argv[])
#include "continuityErrs.H" #include "continuityErrs.H"
turbulence->correct(); //turbulence->correct();
runTime.write(); runTime.write();

29
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.C → applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.C
View File

@ -23,7 +23,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "alphaContactAngleFvPatchScalarField.H" #include "multiphaseAlphaContactAngleFvPatchScalarField.H"
#include "addToRunTimeSelectionTable.H" #include "addToRunTimeSelectionTable.H"
#include "fvPatchFieldMapper.H" #include "fvPatchFieldMapper.H"
@ -32,7 +32,8 @@ License
namespace Foam namespace Foam
{ {
alphaContactAngleFvPatchScalarField::interfaceThetaProps::interfaceThetaProps multiphaseAlphaContactAngleFvPatchScalarField::interfaceThetaProps::
interfaceThetaProps
( (
Istream& is Istream& is
) )
@ -47,7 +48,7 @@ alphaContactAngleFvPatchScalarField::interfaceThetaProps::interfaceThetaProps
Istream& operator>> Istream& operator>>
( (
Istream& is, Istream& is,
alphaContactAngleFvPatchScalarField::interfaceThetaProps& tp multiphaseAlphaContactAngleFvPatchScalarField::interfaceThetaProps& tp
) )
{ {
is >> tp.theta0_ >> tp.uTheta_ >> tp.thetaA_ >> tp.thetaR_; is >> tp.theta0_ >> tp.uTheta_ >> tp.thetaA_ >> tp.thetaR_;
@ -58,7 +59,7 @@ Istream& operator>>
Ostream& operator<< Ostream& operator<<
( (
Ostream& os, Ostream& os,
const alphaContactAngleFvPatchScalarField::interfaceThetaProps& tp const multiphaseAlphaContactAngleFvPatchScalarField::interfaceThetaProps& tp
) )
{ {
os << tp.theta0_ << token::SPACE os << tp.theta0_ << token::SPACE
@ -72,7 +73,8 @@ Ostream& operator<<
// * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * Constructors * * * * * * * * * * * * * * //
alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField multiphaseAlphaContactAngleFvPatchScalarField::
multiphaseAlphaContactAngleFvPatchScalarField
( (
const fvPatch& p, const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
@ -82,9 +84,10 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
{} {}
alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField multiphaseAlphaContactAngleFvPatchScalarField::
multiphaseAlphaContactAngleFvPatchScalarField
( (
const alphaContactAngleFvPatchScalarField& gcpsf, const multiphaseAlphaContactAngleFvPatchScalarField& gcpsf,
const fvPatch& p, const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF, const DimensionedField<scalar, volMesh>& iF,
const fvPatchFieldMapper& mapper const fvPatchFieldMapper& mapper
@ -95,7 +98,8 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
{} {}
alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField multiphaseAlphaContactAngleFvPatchScalarField::
multiphaseAlphaContactAngleFvPatchScalarField
( (
const fvPatch& p, const fvPatch& p,
const DimensionedField<scalar, volMesh>& iF, const DimensionedField<scalar, volMesh>& iF,
@ -109,9 +113,10 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
} }
alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField multiphaseAlphaContactAngleFvPatchScalarField::
multiphaseAlphaContactAngleFvPatchScalarField
( (
const alphaContactAngleFvPatchScalarField& gcpsf, const multiphaseAlphaContactAngleFvPatchScalarField& gcpsf,
const DimensionedField<scalar, volMesh>& iF const DimensionedField<scalar, volMesh>& iF
) )
: :
@ -122,7 +127,7 @@ alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void alphaContactAngleFvPatchScalarField::write(Ostream& os) const void multiphaseAlphaContactAngleFvPatchScalarField::write(Ostream& os) const
{ {
fvPatchScalarField::write(os); fvPatchScalarField::write(os);
os.writeKeyword("thetaProperties") os.writeKeyword("thetaProperties")
@ -133,7 +138,7 @@ void alphaContactAngleFvPatchScalarField::write(Ostream& os) const
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
makePatchTypeField(fvPatchScalarField, alphaContactAngleFvPatchScalarField); makePatchTypeField(fvPatchScalarField, multiphaseAlphaContactAngleFvPatchScalarField);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

32
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/alphaContactAngle/alphaContactAngleFvPatchScalarField.H → applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseAlphaContactAngle/multiphaseAlphaContactAngleFvPatchScalarField.H
View File

@ -22,19 +22,19 @@ 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::multiphaseAlphaContactAngleFvPatchScalarField
Description Description
Contact-angle boundary condition for multi-phase interface-capturing Contact-angle boundary condition for multi-phase interface-capturing
simulations. Used in conjuction with multiphaseMixture. simulations. Used in conjuction with multiphaseMixture.
SourceFiles SourceFiles
alphaContactAngleFvPatchScalarField.C multiphaseAlphaContactAngleFvPatchScalarField.C
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#ifndef alphaContactAngleFvPatchScalarField_H #ifndef multiphaseAlphaContactAngleFvPatchScalarField_H
#define alphaContactAngleFvPatchScalarField_H #define multiphaseAlphaContactAngleFvPatchScalarField_H
#include "zeroGradientFvPatchFields.H" #include "zeroGradientFvPatchFields.H"
#include "multiphaseMixture.H" #include "multiphaseMixture.H"
@ -45,10 +45,10 @@ namespace Foam
{ {
/*---------------------------------------------------------------------------*\ /*---------------------------------------------------------------------------*\
Class alphaContactAngleFvPatch Declaration Class multiphaseAlphaContactAngleFvPatch Declaration
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
class alphaContactAngleFvPatchScalarField class multiphaseAlphaContactAngleFvPatchScalarField
: :
public zeroGradientFvPatchScalarField public zeroGradientFvPatchScalarField
{ {
@ -132,31 +132,31 @@ private:
public: public:
//- Runtime type information //- Runtime type information
TypeName("alphaContactAngle"); TypeName("multiphaseAlphaContactAngle");
// Constructors // Constructors
//- Construct from patch and internal field //- Construct from patch and internal field
alphaContactAngleFvPatchScalarField multiphaseAlphaContactAngleFvPatchScalarField
( (
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 multiphaseAlphaContactAngleFvPatchScalarField
( (
const fvPatch&, const fvPatch&,
const DimensionedField<scalar, volMesh>&, const DimensionedField<scalar, volMesh>&,
const dictionary& const dictionary&
); );
//- Construct by mapping given alphaContactAngleFvPatchScalarField //- Construct by mapping given multiphaseAlphaContactAngleFvPatchScalarField
// onto a new patch // onto a new patch
alphaContactAngleFvPatchScalarField multiphaseAlphaContactAngleFvPatchScalarField
( (
const alphaContactAngleFvPatchScalarField&, const multiphaseAlphaContactAngleFvPatchScalarField&,
const fvPatch&, const fvPatch&,
const DimensionedField<scalar, volMesh>&, const DimensionedField<scalar, volMesh>&,
const fvPatchFieldMapper& const fvPatchFieldMapper&
@ -167,14 +167,14 @@ public:
{ {
return tmp<fvPatchScalarField> return tmp<fvPatchScalarField>
( (
new alphaContactAngleFvPatchScalarField(*this) new multiphaseAlphaContactAngleFvPatchScalarField(*this)
); );
} }
//- Construct as copy setting internal field reference //- Construct as copy setting internal field reference
alphaContactAngleFvPatchScalarField multiphaseAlphaContactAngleFvPatchScalarField
( (
const alphaContactAngleFvPatchScalarField&, const multiphaseAlphaContactAngleFvPatchScalarField&,
const DimensionedField<scalar, volMesh>& const DimensionedField<scalar, volMesh>&
); );
@ -186,7 +186,7 @@ public:
{ {
return tmp<fvPatchScalarField> return tmp<fvPatchScalarField>
( (
new alphaContactAngleFvPatchScalarField(*this, iF) new multiphaseAlphaContactAngleFvPatchScalarField(*this, iF)
); );
} }

11
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
View File

@ -24,7 +24,7 @@ License
\*---------------------------------------------------------------------------*/ \*---------------------------------------------------------------------------*/
#include "multiphaseMixture.H" #include "multiphaseMixture.H"
#include "alphaContactAngleFvPatchScalarField.H" #include "multiphaseAlphaContactAngleFvPatchScalarField.H"
#include "Time.H" #include "Time.H"
#include "subCycle.H" #include "subCycle.H"
#include "fvCFD.H" #include "fvCFD.H"
@ -351,10 +351,11 @@ void Foam::multiphaseMixture::correctContactAngle
forAll(boundary, patchi) forAll(boundary, patchi)
{ {
if (isA<alphaContactAngleFvPatchScalarField>(gbf[patchi])) if (isA<multiphaseAlphaContactAngleFvPatchScalarField>(gbf[patchi]))
{ {
const alphaContactAngleFvPatchScalarField& acap = const multiphaseAlphaContactAngleFvPatchScalarField& acap =
refCast<const alphaContactAngleFvPatchScalarField>(gbf[patchi]); refCast<const multiphaseAlphaContactAngleFvPatchScalarField>
(gbf[patchi]);
vectorField& nHatPatch = nHatb[patchi]; vectorField& nHatPatch = nHatb[patchi];
@ -362,7 +363,7 @@ void Foam::multiphaseMixture::correctContactAngle
mesh_.Sf().boundaryField()[patchi] mesh_.Sf().boundaryField()[patchi]
/mesh_.magSf().boundaryField()[patchi]; /mesh_.magSf().boundaryField()[patchi];
alphaContactAngleFvPatchScalarField::thetaPropsTable:: multiphaseAlphaContactAngleFvPatchScalarField::thetaPropsTable::
const_iterator tp = const_iterator tp =
acap.thetaProps().find(interfacePair(alpha1, alpha2)); acap.thetaProps().find(interfacePair(alpha1, alpha2));

2
applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
View File

@ -210,7 +210,7 @@ public:
//- Destructor //- Destructor
~multiphaseMixture() virtual ~multiphaseMixture()
{} {}