Commit 1f5b9dbb authored by Henry Weller's avatar Henry Weller
Browse files

tutorials/multiphase: Removed unnecessary specification of name and dimensions...

tutorials/multiphase: Removed unnecessary specification of name and dimensions for transport properties
parent dfd611ae
......@@ -40,7 +40,7 @@ const dimensionedScalar& rho1 = mixture.rho1();
const dimensionedScalar& rho2 = mixture.rho2();
const dimensionedScalar& rho3 = mixture.rho3();
dimensionedScalar D23(mixture.lookup("D23"));
dimensionedScalar D23("D23", dimViscosity, mixture);
// Need to store rho for ddt(rho, U)
volScalarField rho
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -168,8 +168,8 @@ Foam::threePhaseInterfaceProperties::threePhaseInterfaceProperties
).lookup("cAlpha")
)
),
sigma12_(mixture.lookup("sigma12")),
sigma13_(mixture.lookup("sigma13")),
sigma12_("sigma12", dimensionSet(1, 0, -2, 0, 0), mixture),
sigma13_("sigma13", dimensionSet(1, 0, -2, 0, 0), mixture),
deltaN_
(
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -47,10 +47,10 @@ Foam::phaseChangeTwoPhaseMixtures::Kunz::Kunz
:
phaseChangeTwoPhaseMixture(typeName, U, phi),
UInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("UInf")),
tInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("tInf")),
Cc_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("Cc")),
Cv_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("Cv")),
UInf_("UInf", dimVelocity, phaseChangeTwoPhaseMixtureCoeffs_),
tInf_("tInf", dimTime, phaseChangeTwoPhaseMixtureCoeffs_),
Cc_("Cc", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
Cv_("Cv", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
p0_("0", pSat().dimensions(), 0.0),
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -47,10 +47,10 @@ Foam::phaseChangeTwoPhaseMixtures::Merkle::Merkle
:
phaseChangeTwoPhaseMixture(typeName, U, phi),
UInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("UInf")),
tInf_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("tInf")),
Cc_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("Cc")),
Cv_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("Cv")),
UInf_("UInf", dimVelocity, phaseChangeTwoPhaseMixtureCoeffs_),
tInf_("tInf", dimTime, phaseChangeTwoPhaseMixtureCoeffs_),
Cc_("Cc", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
Cv_("Cv", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
p0_("0", pSat().dimensions(), 0.0),
......
......@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2017 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
......@@ -54,10 +54,10 @@ Foam::phaseChangeTwoPhaseMixtures::SchnerrSauer::SchnerrSauer
:
phaseChangeTwoPhaseMixture(typeName, U, phi),
n_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("n")),
dNuc_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("dNuc")),
Cc_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("Cc")),
Cv_(phaseChangeTwoPhaseMixtureCoeffs_.lookup("Cv")),
n_("n", dimless/dimVolume, phaseChangeTwoPhaseMixtureCoeffs_),
dNuc_("dNuc", dimLength, phaseChangeTwoPhaseMixtureCoeffs_),
Cc_("Cc", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
Cv_("Cv", dimless, phaseChangeTwoPhaseMixtureCoeffs_),
p0_("0", pSat().dimensions(), 0.0)
{
......
......@@ -20,17 +20,17 @@ phases (phase1 phase2);
phase1
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1e-06;
rho [1 -3 0 0 0 0 0] 300;
nu 1e-06;
rho 300;
}
phase2
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1e-6;
rho [1 -3 0 0 0 0 0] 1027;
nu 1e-6;
rho 1027;
}
sigma [1 0 -2 0 0 0 0] 0.07;
sigma 0.07;
// ************************************************************************* //
......@@ -17,8 +17,8 @@ FoamFile
phases (water air);
pMin [1 -1 -2 0 0 0 0] 1000;
pMin 1000;
sigma [1 0 -2 0 0 0 0] 0;
sigma 0;
// ************************************************************************* //
......@@ -20,18 +20,18 @@ phases (water air);
water
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1e-06;
rho [1 -3 0 0 0 0 0] 998.2;
nu 1e-06;
rho 998.2;
}
air
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1.48e-05;
rho [1 -3 0 0 0 0 0] 1;
nu 1.48e-05;
rho 1;
}
sigma [1 0 -2 0 0 0 0] 0;
sigma 0;
// ************************************************************************* //
......@@ -17,16 +17,16 @@ FoamFile
phases (water oil mercury air);
pMin [1 -1 -2 0 0 0 0] 10000;
pMin 10000;
sigmas
(
(air water) 0.07
(air oil) 0.07
(air mercury) 0.07
(water oil) 0.07
(air water) 0.07
(air oil) 0.07
(air mercury) 0.07
(water oil) 0.07
(water mercury) 0.07
(oil mercury) 0.07
(oil mercury) 0.07
);
......
......@@ -20,17 +20,17 @@ phases (water air);
water
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1.09e-06;
rho [1 -3 0 0 0 0 0] 998.8;
nu 1.09e-06;
rho 998.8;
}
air
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1.48e-05;
rho [1 -3 0 0 0 0 0] 1;
nu 1.48e-05;
rho 1;
}
sigma [1 0 -2 0 0 0 0] 0;
sigma 0;
// ************************************************************************* //
......@@ -20,18 +20,18 @@ phases (water air);
water
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1e-06;
rho [1 -3 0 0 0 0 0] 998.2;
nu 1e-06;
rho 998.2;
}
air
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1.48e-05;
rho [1 -3 0 0 0 0 0] 1;
nu 1.48e-05;
rho 1;
}
sigma [1 0 -2 0 0 0 0] 0;
sigma 0;
// ************************************************************************* //
......@@ -20,17 +20,17 @@ phases (water air);
water
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1e-06;
rho [1 -3 0 0 0 0 0] 300;
nu 1e-06;
rho 300;
}
air
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1e-6;
rho [1 -3 0 0 0 0 0] 1027;
nu 1e-6;
rho 1027;
}
sigma [1 0 -2 0 0 0 0] 0.07;
sigma 0.07;
// ************************************************************************* //
......@@ -20,18 +20,18 @@ phases (water air);
water
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1e-06;
rho [1 -3 0 0 0 0 0] 1000;
nu 1e-06;
rho 1000;
}
air
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1.48e-05;
rho [1 -3 0 0 0 0 0] 1;
nu 1.48e-05;
rho 1;
}
sigma [1 0 -2 0 0 0 0] 0.07;
sigma 0.07;
// ************************************************************************* //
......@@ -20,17 +20,17 @@ phases (water air);
water
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1e-06;
rho [1 -3 0 0 0 0 0] 998.2;
nu 1e-06;
rho 998.2;
}
air
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1.48e-05;
rho [1 -3 0 0 0 0 0] 1;
nu 1.48e-05;
rho 1;
}
sigma [1 0 -2 0 0 0 0] 0.07;
sigma 0.07;
// ************************************************************************* //
......@@ -20,17 +20,17 @@ phases (water air);
water
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1e-06;
rho [1 -3 0 0 0 0 0] 998.2;
nu 1e-06;
rho 998.2;
}
air
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1.48e-05;
rho [1 -3 0 0 0 0 0] 1;
nu 1.48e-05;
rho 1;
}
sigma [1 0 -2 0 0 0 0] 0;
sigma 0;
// ************************************************************************* //
......@@ -20,18 +20,18 @@ phases (water air);
water
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1e-06;
rho [1 -3 0 0 0 0 0] 998.2;
nu 1e-06;
rho 998.2;
}
air
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1.48e-05;
rho [1 -3 0 0 0 0 0] 1;
nu 1.48e-05;
rho 1;
}
sigma [1 0 -2 0 0 0 0] 0;
sigma 0;
// ************************************************************************* //
......@@ -20,17 +20,17 @@ phases (water air);
water
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1e-06;
rho [1 -3 0 0 0 0 0] 998.2;
nu 1e-06;
rho 998.2;
}
air
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1.48e-05;
rho [1 -3 0 0 0 0 0] 1;
nu 1.48e-05;
rho 1;
}
sigma [1 0 -2 0 0 0 0] 0;
sigma 0;
// ************************************************************************* //
......@@ -20,18 +20,18 @@ phases (water air);
water
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1e-06;
rho [1 -3 0 0 0 0 0] 998.2;
nu 1e-06;
rho 998.2;
}
air
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1.48e-05;
rho [1 -3 0 0 0 0 0] 1;
nu 1.48e-05;
rho 1;
}
sigma [1 0 -2 0 0 0 0] 0;
sigma 0;
// ************************************************************************* //
......@@ -20,17 +20,17 @@ phases (water air);
water
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1e-06;
rho [1 -3 0 0 0 0 0] 998.2;
nu 1e-06;
rho 998.2;
}
air
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1.48e-05;
rho [1 -3 0 0 0 0 0] 1;
nu 1.48e-05;
rho 1;
}
sigma [1 0 -2 0 0 0 0] 0;
sigma 0;
// ************************************************************************* //
......@@ -20,18 +20,18 @@ phases (water air);
water
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1e-06;
rho [1 -3 0 0 0 0 0] 998.2;
nu 1e-06;
rho 998.2;
}
air
{
transportModel Newtonian;
nu [0 2 -1 0 0 0 0] 1.48e-05;
rho [1 -3 0 0 0 0 0] 1;
nu 1.48e-05;
rho 1;
}
sigma [1 0 -2 0 0 0 0] 0;
sigma 0;
// ************************************************************************* //
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