Skip to content
Snippets Groups Projects
Commit 005bfcd8 authored by Henry's avatar Henry
Browse files

multiphase: completed renaming of phase fields to use the new groupName convention and interface

parent dba34498
No related branches found
No related tags found
No related merge requests found
Showing
with 105 additions and 33 deletions
......@@ -2,7 +2,6 @@
cd ${0%/*} || exit 1 # run from this directory
set -x
wclean libso phaseModel
wclean libso multiphaseSystem
wclean libso interfacialModels
wclean
......
......@@ -2,9 +2,9 @@
cd ${0%/*} || exit 1 # run from this directory
set -x
wmake libso phaseModel
wmake libso interfacialModels
wmakeLnInclude interfacialModels
wmake libso multiphaseSystem
wmake libso interfacialModels
wmake
# ----------------------------------------------------------------- end-of-file
EXE_INC = \
-IphaseModel/lnInclude \
-ImultiphaseSystem/lnInclude \
-ImultiphaseFixedFluxPressure \
-IinterfacialModels/lnInclude \
......@@ -15,7 +14,6 @@ EXE_INC = \
EXE_LIBS = \
-lmultiphaseSystem \
-lcompressibleMultiPhaseModel \
-linterfaceProperties \
-lincompressibleTransportModels \
-lcompressibleMultiphaseEulerianInterfacialModels \
......
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I../phaseModel/lnInclude
-I../multiphaseSystem/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = \
-lcompressibleMultiPhaseModel
-lmultiphaseSystem
phaseModel/phaseModel.C
diameterModels/diameterModel/diameterModel.C
diameterModels/diameterModel/newDiameterModel.C
diameterModels/constantDiameter/constantDiameter.C
diameterModels/isothermalDiameter/isothermalDiameter.C
alphaContactAngle/alphaContactAngleFvPatchScalarField.C
multiphaseSystem.C
......
......@@ -8,7 +8,6 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude
LIB_LIBS = \
-lcompressibleMultiPhaseModel \
-linterfaceProperties \
-lincompressibleTransportModels \
-lcompressibleMultiphaseEulerianInterfacialModels \
......
......@@ -34,7 +34,7 @@ License
Foam::phaseModel::phaseModel
(
const word& name,
const word& phaseName,
const dictionary& phaseDict,
const fvMesh& mesh
)
......@@ -43,7 +43,7 @@ Foam::phaseModel::phaseModel
(
IOobject
(
"alpha" + name,
IOobject::groupName("alpha", phaseName),
mesh.time().timeName(),
mesh,
IOobject::MUST_READ,
......@@ -51,7 +51,7 @@ Foam::phaseModel::phaseModel
),
mesh
),
name_(name),
name_(phaseName),
phaseDict_(phaseDict),
nu_
(
......@@ -81,7 +81,7 @@ Foam::phaseModel::phaseModel
(
IOobject
(
"U" + name,
IOobject::groupName("U", phaseName),
mesh.time().timeName(),
mesh,
IOobject::MUST_READ,
......@@ -93,7 +93,7 @@ Foam::phaseModel::phaseModel
(
IOobject
(
"DDtU" + name,
IOobject::groupName("DDtU", phaseName),
mesh.time().timeName(),
mesh
),
......@@ -104,7 +104,7 @@ Foam::phaseModel::phaseModel
(
IOobject
(
"phiAlpha" + name,
IOobject::groupName("phiAlpha", phaseName),
mesh.time().timeName(),
mesh
),
......@@ -112,7 +112,7 @@ Foam::phaseModel::phaseModel
dimensionedScalar("0", dimensionSet(0, 3, -1, 0, 0), 0)
)
{
const word phiName = "phi" + name;
const word phiName = IOobject::groupName("phi", name_);
IOobject phiHeader
(
......
phaseModel/phaseModel.C
diameterModels/diameterModel/diameterModel.C
diameterModels/diameterModel/newDiameterModel.C
diameterModels/constantDiameter/constantDiameter.C
diameterModels/isothermalDiameter/isothermalDiameter.C
LIB = $(FOAM_LIBBIN)/libcompressibleMultiPhaseModel
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude
LIB_LIBS = \
-lincompressibleTransportModels
......@@ -29,7 +29,7 @@ License
Foam::phase::phase
(
const word& name,
const word& phaseName,
const dictionary& phaseDict,
const volVectorField& U,
const surfaceScalarField& phi
......@@ -39,7 +39,7 @@ Foam::phase::phase
(
IOobject
(
"alpha" + name,
IOobject::groupName("alpha", phaseName),
U.mesh().time().timeName(),
U.mesh(),
IOobject::MUST_READ,
......@@ -47,9 +47,18 @@ Foam::phase::phase
),
U.mesh()
),
name_(name),
name_(phaseName),
phaseDict_(phaseDict),
nuModel_(viscosityModel::New("nu" + name, phaseDict_, U, phi)),
nuModel_
(
viscosityModel::New
(
IOobject::groupName("nu", phaseName),
phaseDict_,
U,
phi
)
),
rho_(phaseDict_.lookup("rho"))
{}
......
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volVectorField;
location "constant";
object U;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 1 -1 0 0 0 0];
internalField uniform (0 0 0);
boundaryField
{
atmosphere
{
type pressureInletOutletVelocity;
value uniform (0 0 0);
}
walls
{
type fixedValue;
value uniform (0 0 0);
}
}
// ************************************************************************* //
/*--------------------------------*- C++ -*----------------------------------*\
| ========= | |
| \\ / F ield | OpenFOAM: The Open Source CFD Toolbox |
| \\ / O peration | Version: dev |
| \\ / A nd | Web: www.OpenFOAM.org |
| \\/ M anipulation | |
\*---------------------------------------------------------------------------*/
FoamFile
{
version 2.0;
format ascii;
class volScalarField;
location "constant";
object alpha.water;
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
dimensions [0 0 0 0 0 0 0];
internalField uniform 0;
boundaryField
{
atmosphere
{
type inletOutlet;
inletValue uniform 0;
value uniform 0;
}
walls
{
type zeroGradient;
}
}
// ************************************************************************* //
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment