diff --git a/applications/solvers/DNS/dnsFoam/readTransportProperties.H b/applications/solvers/DNS/dnsFoam/readTransportProperties.H
index 0d80908542768ce4ee95f96875bc48bfc24558e4..458ba2481fca15adab88b4ba169b7255beeea67f 100644
--- a/applications/solvers/DNS/dnsFoam/readTransportProperties.H
+++ b/applications/solvers/DNS/dnsFoam/readTransportProperties.H
@@ -14,5 +14,7 @@
dimensionedScalar nu
(
- transportProperties.lookup("nu")
+ "nu",
+ dimViscosity,
+ transportProperties
);
diff --git a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
index 42a208d672fd2a000e76d8eb5cb9f3b44531cf04..9fd96b203300a26cfe976f827355f205b9067d5a 100644
--- a/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
+++ b/applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
@@ -51,8 +51,8 @@ Foam::PDRDragModels::basic::basic
)
:
PDRDragModel(PDRProperties, turbulence, rho, U, phi),
- Csu("Csu", dimless, PDRDragModelCoeffs_.lookup("Csu")),
- Csk("Csk", dimless, PDRDragModelCoeffs_.lookup("Csk")),
+ Csu("Csu", dimless, PDRDragModelCoeffs_),
+ Csk("Csk", dimless, PDRDragModelCoeffs_),
Aw_
(
diff --git a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readThermodynamicProperties.H b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readThermodynamicProperties.H
index 82f3655f4650f7cc4e4ae6f5627d6aebdd806c81..82ebe7ae30f210d690ff15e035f31e9040d14543 100644
--- a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readThermodynamicProperties.H
+++ b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readThermodynamicProperties.H
@@ -14,17 +14,23 @@
dimensionedScalar rho0
(
- thermodynamicProperties.lookup("rho0")
+ "rho0",
+ dimDensity,
+ thermodynamicProperties
);
dimensionedScalar p0
(
- thermodynamicProperties.lookup("p0")
+ "p0",
+ dimPressure,
+ thermodynamicProperties
);
dimensionedScalar psi
(
- thermodynamicProperties.lookup("psi")
+ "psi",
+ dimCompressibility,
+ thermodynamicProperties
);
// Density offset, i.e. the constant part of the density
diff --git a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readTransportProperties.H b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readTransportProperties.H
index c30f65b445886d784d88d0f421f99865fcd423cc..379e2119827cb82257e4a96222c82163033be80f 100644
--- a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readTransportProperties.H
+++ b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/readTransportProperties.H
@@ -1,18 +1,20 @@
- Info<< "Reading transportProperties\n" << endl;
+Info<< "Reading transportProperties\n" << endl;
- IOdictionary transportProperties
+IOdictionary transportProperties
+(
+ IOobject
(
- IOobject
- (
- "transportProperties",
- runTime.constant(),
- mesh,
- IOobject::MUST_READ_IF_MODIFIED,
- IOobject::NO_WRITE
- )
- );
+ "transportProperties",
+ runTime.constant(),
+ mesh,
+ IOobject::MUST_READ_IF_MODIFIED,
+ IOobject::NO_WRITE
+ )
+);
- dimensionedScalar mu
- (
- transportProperties.lookup("mu")
- );
+dimensionedScalar mu
+(
+ "mu",
+ dimDynamicViscosity,
+ transportProperties
+);
diff --git a/applications/solvers/electromagnetics/mhdFoam/createFields.H b/applications/solvers/electromagnetics/mhdFoam/createFields.H
index 528bcd1b540b812a8f32c5abf90632c5256b42b5..1032504738d463f8c7a2e8357894966dde5d50cd 100644
--- a/applications/solvers/electromagnetics/mhdFoam/createFields.H
+++ b/applications/solvers/electromagnetics/mhdFoam/createFields.H
@@ -14,22 +14,30 @@ IOdictionary transportProperties
dimensionedScalar rho
(
- transportProperties.lookup("rho")
+ "rho",
+ dimDensity,
+ transportProperties
);
dimensionedScalar nu
(
- transportProperties.lookup("nu")
+ "nu",
+ dimViscosity,
+ transportProperties
);
dimensionedScalar mu
(
- transportProperties.lookup("mu")
+ "mu",
+ dimensionSet(1, 1, -2, 0, 0, -2, 0),
+ transportProperties
);
dimensionedScalar sigma
(
- transportProperties.lookup("sigma")
+ "sigma",
+ dimensionSet(-1, -3, 3, 0, 0, 2, 0),
+ transportProperties
);
Info<< "Reading field p\n" << endl;
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/readTransportProperties.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/readTransportProperties.H
index f3809377b76459bd49ec14f6c09c92e2d2ddfc4e..d78368dec85d8999157d2f1f2384032c768e3450 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/readTransportProperties.H
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/readTransportProperties.H
@@ -5,14 +5,14 @@ dimensionedScalar beta
(
"beta",
dimless/dimTemperature,
- laminarTransport.lookup("beta")
+ laminarTransport
);
// Reference temperature [K]
-dimensionedScalar TRef("TRef", dimTemperature, laminarTransport.lookup("TRef"));
+dimensionedScalar TRef("TRef", dimTemperature, laminarTransport);
// Laminar Prandtl number
-dimensionedScalar Pr("Pr", dimless, laminarTransport.lookup("Pr"));
+dimensionedScalar Pr("Pr", dimless, laminarTransport);
// Turbulent Prandtl number
-dimensionedScalar Prt("Prt", dimless, laminarTransport.lookup("Prt"));
+dimensionedScalar Prt("Prt", dimless, laminarTransport);
diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H
index 0554d9268aa83e167bea638bc908b35e4091d22d..15faa59f82de08ebb5acf1597dd50c925a63ba0a 100644
--- a/applications/solvers/incompressible/boundaryFoam/createFields.H
+++ b/applications/solvers/incompressible/boundaryFoam/createFields.H
@@ -36,7 +36,7 @@ autoPtr<incompressible::RASModel> turbulence
incompressible::RASModel::New(U, phi, laminarTransport)
);
-dimensionedVector Ubar("Ubar", dimVelocity, laminarTransport.lookup("Ubar"));
+dimensionedVector Ubar("Ubar", dimVelocity, laminarTransport);
vector flowDirection = (Ubar/mag(Ubar)).value();
tensor flowMask = sqr(flowDirection);
diff --git a/applications/solvers/incompressible/icoFoam/createFields.H b/applications/solvers/incompressible/icoFoam/createFields.H
index 0d01e2a5c28eb9bd8b09e5e10945566e2fcca77c..bdaef3a7bf6194d53e3dc60eef68ba297aad9fc3 100644
--- a/applications/solvers/incompressible/icoFoam/createFields.H
+++ b/applications/solvers/incompressible/icoFoam/createFields.H
@@ -14,6 +14,8 @@ IOdictionary transportProperties
dimensionedScalar nu
(
+ "nu",
+ dimViscosity,
transportProperties.lookup("nu")
);
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
index 56b934d58aeb5f5c7fba4d7b8f0387678f5786dd..c8b4dbc4f5fe0418f50cce778334dbae5e01c179 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H
@@ -20,7 +20,7 @@
(
"rhoInf",
dimDensity,
- laminarTransport.lookup("rhoInf")
+ laminarTransport
);
volScalarField rhoInf
diff --git a/applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H b/applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H
index e4e0f7b8a9132393e593dd616cb53960f7eafde2..d97f7f242187e2da695c3819a3107e4455f09230 100644
--- a/applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H
+++ b/applications/solvers/multiphase/cavitatingFoam/readThermodynamicProperties.H
@@ -16,28 +16,28 @@ dimensionedScalar psil
(
"psil",
dimCompressibility,
- thermodynamicProperties.lookup("psil")
+ thermodynamicProperties
);
dimensionedScalar rholSat
(
"rholSat",
dimDensity,
- thermodynamicProperties.lookup("rholSat")
+ thermodynamicProperties
);
dimensionedScalar psiv
(
"psiv",
dimCompressibility,
- thermodynamicProperties.lookup("psiv")
+ thermodynamicProperties
);
dimensionedScalar pSat
(
"pSat",
dimPressure,
- thermodynamicProperties.lookup("pSat")
+ thermodynamicProperties
);
dimensionedScalar rhovSat("rhovSat", psiv*pSat);
@@ -48,5 +48,5 @@ dimensionedScalar rhoMin
(
"rhoMin",
dimDensity,
- thermodynamicProperties.lookup("rhoMin")
+ thermodynamicProperties
);
diff --git a/applications/solvers/multiphase/compressibleInterFoam/createFields.H b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
index 181160c51077dec1be8f15cba7756a3131d6d4d1..48628768280591af1213082d55c8ccf1418ff82a 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
@@ -61,7 +61,7 @@ dimensionedScalar pMin
(
"pMin",
dimPressure,
- mixture.lookup("pMin")
+ mixture
);
mesh.setFluxRequired(p_rgh.name());
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H
index 4110b86e7f6241294c3bf6e1f6b7e30ab9b90f47..8ac81a519583e5f5581c2f396f11add4dee496d9 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H
@@ -46,7 +46,7 @@ volScalarField rho
mixture.rho()
);
-dimensionedScalar pMin("pMin", dimPressure, mixture.lookup("pMin"));
+dimensionedScalar pMin("pMin", dimPressure, mixture);
mesh.setFluxRequired(p_rgh.name());
diff --git a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C
index fded594b70e7cfb30c843b61be9d8454bb86560d..4ee639f30b51e7dcae1f3cd02215c7ac6671ffef 100644
--- a/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C
+++ b/applications/solvers/multiphase/driftFluxFoam/incompressibleTwoPhaseInteractingMixture/incompressibleTwoPhaseInteractingMixture.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -80,8 +80,8 @@ incompressibleTwoPhaseInteractingMixture
)
),
- rhod_("rho", dimDensity, muModel_->viscosityProperties().lookup("rho")),
- rhoc_("rho", dimDensity, nucModel_->viscosityProperties().lookup("rho")),
+ rhod_("rho", dimDensity, muModel_->viscosityProperties()),
+ rhoc_("rho", dimDensity, nucModel_->viscosityProperties()),
dd_
(
"d",
diff --git a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/BinghamPlastic/BinghamPlastic.C b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/BinghamPlastic/BinghamPlastic.C
index 01826f0af476b82d4e344481b2ad52206252de78..2711e79d9d84086e8ea5a42b816a461f75b19da5 100644
--- a/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/BinghamPlastic/BinghamPlastic.C
+++ b/applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/BinghamPlastic/BinghamPlastic.C
@@ -60,19 +60,19 @@ Foam::mixtureViscosityModels::BinghamPlastic::BinghamPlastic
(
"BinghamCoeff",
dimensionSet(1, -1, -2, 0, 0),
- plasticCoeffs_.lookup("BinghamCoeff")
+ plasticCoeffs_
),
yieldStressExponent_
(
"BinghamExponent",
dimless,
- plasticCoeffs_.lookup("BinghamExponent")
+ plasticCoeffs_
),
yieldStressOffset_
(
"BinghamOffset",
dimless,
- plasticCoeffs_.lookup("BinghamOffset")
+ plasticCoeffs_
),
U_(U)
{}
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/general/general.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/general/general.C
index b3d46e1ec24fc3704569de3abee171e3a4f3346c..f8a133b63e33c72283abeef09961ea7539f9e40c 100644
--- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/general/general.C
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/general/general.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -47,9 +47,9 @@ Foam::relativeVelocityModels::general::general
)
:
relativeVelocityModel(dict, mixture),
- a_("a", dimless, dict.lookup("a")),
- a1_("a1", dimless, dict.lookup("a1")),
- V0_("V0", dimVelocity, dict.lookup("V0")),
+ a_("a", dimless, dict),
+ a1_("a1", dimless, dict),
+ V0_("V0", dimVelocity, dict),
residualAlpha_(dict.lookup("residualAlpha"))
{}
diff --git a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/simple/simple.C b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/simple/simple.C
index 5051dcb710fe38a2433b0ac848571e989a343619..ae23daeab287da34aa5cf43d47e3dcf8afe8343e 100644
--- a/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/simple/simple.C
+++ b/applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/simple/simple.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -47,9 +47,9 @@ Foam::relativeVelocityModels::simple::simple
)
:
relativeVelocityModel(dict, mixture),
- a_("a", dimless, dict.lookup("a")),
- V0_("V0", dimVelocity, dict.lookup("V0")),
- residualAlpha_("residualAlpha", dimless, dict.lookup("residualAlpha"))
+ a_("a", dimless, dict),
+ V0_("V0", dimVelocity, dict),
+ residualAlpha_("residualAlpha", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
index 352c85694edce924008f6ae3c9d37d5b60d323e3..f6c00e12a48eae323123bec3961ea5b501451757 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/incompressibleThreePhaseMixture/incompressibleThreePhaseMixture.C
@@ -152,9 +152,9 @@ Foam::incompressibleThreePhaseMixture::incompressibleThreePhaseMixture
)
),
- rho1_("rho", dimDensity, nuModel1_->viscosityProperties().lookup("rho")),
- rho2_("rho", dimDensity, nuModel2_->viscosityProperties().lookup("rho")),
- rho3_("rho", dimDensity, nuModel3_->viscosityProperties().lookup("rho"))
+ rho1_("rho", dimDensity, nuModel1_->viscosityProperties()),
+ rho2_("rho", dimDensity, nuModel2_->viscosityProperties()),
+ rho3_("rho", dimDensity, nuModel3_->viscosityProperties())
{
alpha3_ == 1.0 - alpha1_ - alpha2_;
calcNu();
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C
index 315f16089399f0b3f9d7a65f79df0549464e5d5a..88b867f23bed424545e99135cbe30f9381c552ea 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/constantDiameter/constantDiameter.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -53,7 +53,7 @@ Foam::diameterModels::constant::constant
)
:
diameterModel(dict, phase),
- d_("d", dimLength, dict.lookup("d"))
+ d_("d", dimLength, dict)
{}
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
index 4b9e57150390d1412a9e284549923b657e5be686..3375f228b971e135feaedc1ffb4c751a49e455af 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -53,8 +53,8 @@ Foam::diameterModels::isothermal::isothermal
)
:
diameterModel(dict, phase),
- d0_("d0", dimLength, dict.lookup("d0")),
- p0_("p0", dimPressure, dict.lookup("p0"))
+ d0_("d0", dimLength, dict),
+ p0_("p0", dimPressure, dict)
{}
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
index 3d6f3dde00539b940e6b0b8e55c16fe765aa186c..9f6ed4ac731b7a57593fa8f785f569c3fc6b7660 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/phaseModel/phaseModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -57,25 +57,25 @@ Foam::phaseModel::phaseModel
(
"nu",
dimensionSet(0, 2, -1, 0, 0),
- phaseDict_.lookup("nu")
+ phaseDict_
),
kappa_
(
"kappa",
dimensionSet(1, 1, -3, -1, 0),
- phaseDict_.lookup("kappa")
+ phaseDict_
),
Cp_
(
"Cp",
dimensionSet(0, 2, -2, -1, 0),
- phaseDict_.lookup("Cp")
+ phaseDict_
),
rho_
(
"rho",
dimDensity,
- phaseDict_.lookup("rho")
+ phaseDict_
),
U_
(
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C
index 85954554f70a8caa89d3011ac88bbdbbc8197de3..f3adfa9b6121ee1bf4b01769b80d1bef3fede3ff 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/phase/phase.C
@@ -59,7 +59,7 @@ Foam::phase::phase
phi
)
),
- rho_("rho", dimDensity, phaseDict_.lookup("rho"))
+ rho_("rho", dimDensity, phaseDict_)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/createFields.H
index c1f7a130a74e715de9f7f39d60317687f2f096eb..30b3b0e715e10da6aecea7090b4d4c9d8448fe69 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/createFields.H
@@ -31,7 +31,7 @@ dimensionedScalar pMin
(
"pMin",
dimPressure,
- fluid.lookup("pMin")
+ fluid
);
#include "gh.H"
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C
index 1bfcd4de0c0aa2b63e3b332724ec56ee929966e1..5fd646c5ceeda5899f4107a19ae9d98538dc1329 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/interfaceCompositionModels/InterfaceCompositionModel/InterfaceCompositionModel.C
@@ -89,7 +89,7 @@ Foam::InterfaceCompositionModel<Thermo, OtherThermo>::InterfaceCompositionModel
IOobject::groupName(basicThermo::dictName, pair.phase2().name())
)
),
- Le_("Le", dimless, dict.lookup("Le"))
+ Le_("Le", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C
index 6398caa0e3d59689fe2b1b2e8b845368d038ff33..df9bddabeb97e3f42666081c361b62af970a5410 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/Frossling/Frossling.C
@@ -48,7 +48,7 @@ Foam::massTransferModels::Frossling::Frossling
)
:
massTransferModel(dict, pair),
- Le_("Le", dimless, dict.lookup("Le"))
+ Le_("Le", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C
index e9ba5ccb2d04cc788cfeec624d5232654f1a89eb..71654ddf10e1bbf73cfdd459ad8510646f0bbfec 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/massTransferModels/sphericalMassTransfer/sphericalMassTransfer.C
@@ -53,7 +53,7 @@ Foam::massTransferModels::sphericalMassTransfer::sphericalMassTransfer
)
:
massTransferModel(dict, pair),
- Le_("Le", dimless, dict.lookup("Le"))
+ Le_("Le", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C
index b43ce2311b0baae509cdb9799c6b1e58f4954774..0c273ee8661dbcf7ae5f7a4d653034e452697828 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/Antoine/Antoine.C
@@ -43,9 +43,9 @@ namespace saturationModels
Foam::saturationModels::Antoine::Antoine(const dictionary& dict)
:
saturationModel(),
- A_("A", dimless, dict.lookup("A")),
- B_("B", dimTemperature, dict.lookup("B")),
- C_("C", dimTemperature, dict.lookup("C"))
+ A_("A", dimless, dict),
+ B_("B", dimTemperature, dict),
+ C_("C", dimTemperature, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C
index 52766f2ea2d118940c818a2cc787778aead87ddb..f05ee21b83aca18b88fb2f77aa1618c54955915a 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/AntoineExtended/AntoineExtended.C
@@ -51,9 +51,9 @@ Foam::saturationModels::AntoineExtended::AntoineExtended
)
:
Antoine(dict),
- D_("D", dimless, dict.lookup("D")),
- F_("F", dimless, dict.lookup("F")),
- E_("E", dimless/pow(dimTemperature, F_), dict.lookup("E"))
+ D_("D", dimless, dict),
+ F_("F", dimless, dict),
+ E_("E", dimless/pow(dimTemperature, F_), dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C
index 79256f5b7f6c72811fa04de6ab92c54c75d383fd..241cf8d4b4e0a97138f5d6f230733e68c2e11bfa 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/saturationModels/constantSaturationConditions/constantSaturationConditions.C
@@ -49,8 +49,8 @@ Foam::saturationModels::constantSaturationConditions::
constantSaturationConditions(const dictionary& dict)
:
saturationModel(),
- pSat_("pSat", dimPressure, dict.lookup("pSat")),
- Tsat_("Tsat", dimTemperature, dict.lookup("Tsat"))
+ pSat_("pSat", dimPressure, dict),
+ Tsat_("Tsat", dimTemperature, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
index 99044f4cef5cf3450086c1c38f69ceabd9c4a055..d0632c55dce39f1c0c772b29c46ea582210515ac 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialCompositionModels/surfaceTensionModels/constantSurfaceTensionCoefficient/constantSurfaceTensionCoefficient.C
@@ -55,7 +55,7 @@ constantSurfaceTensionCoefficient
)
:
surfaceTensionModel(dict, pair, registerObject),
- sigma_("sigma", dimSigma, dict.lookup("sigma"))
+ sigma_("sigma", dimSigma, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
index e89646382230569dff8369374ed78b2ac02b4542..386b06d6aa5e493baf36ad7e9d214aaedd8441c7 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
@@ -53,7 +53,7 @@ Foam::aspectRatioModels::constantAspectRatio::constantAspectRatio
)
:
aspectRatioModel(dict, pair),
- E0_("E0", dimless, dict.lookup("E0"))
+ E0_("E0", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
index c637c3bb354a4e23afb748b835caf36a13b0858d..9503264de927965d323d6e87ba5400cb6fb522e8 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
@@ -49,7 +49,7 @@ Foam::dragModels::GidaspowSchillerNaumann::GidaspowSchillerNaumann
)
:
dragModel(dict, pair, registerObject),
- residualRe_("residualRe", dimless, dict.lookup("residualRe"))
+ residualRe_("residualRe", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
index ee1471ac55e795c2464575865d4364e98a893d89..d0818e2c15ce23d72f532c0d378e60bb36c42c66 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
@@ -49,7 +49,7 @@ Foam::dragModels::SchillerNaumann::SchillerNaumann
)
:
dragModel(dict, pair, registerObject),
- residualRe_("residualRe", dimless, dict.lookup("residualRe"))
+ residualRe_("residualRe", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
index 343cd9a897f440609f26ded7dfd665882456c213..77e84e7a4ea1464c81f95ee1c408f15a30027601 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
@@ -49,9 +49,9 @@ Foam::dragModels::TomiyamaAnalytic::TomiyamaAnalytic
)
:
dragModel(dict, pair, registerObject),
- residualRe_("residualRe", dimless, dict.lookup("residualRe")),
- residualEo_("residualEo", dimless, dict.lookup("residualEo")),
- residualE_("residualE", dimless, dict.lookup("residualE"))
+ residualRe_("residualRe", dimless, dict),
+ residualEo_("residualEo", dimless, dict),
+ residualE_("residualE", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
index af34864f0c22e6b799973fcd3b7179c66a3b1c7c..0ad806735022529b1fcc94921ac54ff3d50d0e93 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
@@ -49,7 +49,7 @@ Foam::dragModels::TomiyamaCorrelated::TomiyamaCorrelated
)
:
dragModel(dict, pair, registerObject),
- A_("A", dimless, dict.lookup("A"))
+ A_("A", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
index bf1e1da4a770fb2cb9278fc790d06c29573f94fe..21ed8c53a8af1e8b6646348400f5de70f3a1d9aa 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
@@ -49,7 +49,7 @@ Foam::dragModels::WenYu::WenYu
)
:
dragModel(dict, pair, registerObject),
- residualRe_("residualRe", dimless, dict.lookup("residualRe"))
+ residualRe_("residualRe", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
index b50a711c77fd349f4459a357d842e91d319c4df5..4b1fc88ddc5e6be40b99f12f341c5d75c390798e 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
@@ -51,8 +51,8 @@ Foam::dragModels::segregated::segregated
)
:
dragModel(dict, pair, registerObject),
- m_("m", dimless, dict.lookup("m")),
- n_("n", dimless, dict.lookup("n"))
+ m_("m", dimless, dict),
+ n_("n", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
index 244853634bd1f770044c9bf260d37c551714fd26..22ee620b41e8f543b193bcb2433539608fbe3c70 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
@@ -49,7 +49,7 @@ Foam::liftModels::LegendreMagnaudet::LegendreMagnaudet
)
:
liftModel(dict, pair),
- residualRe_("residualRe", dimless, dict.lookup("residualRe"))
+ residualRe_("residualRe", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
index efba0d332a53cb397a69ffcb1fc67034408553f4..b85199d86a4a89ae9b64ad6c54feaeaba81c5280 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
@@ -48,7 +48,7 @@ Foam::liftModels::constantLiftCoefficient::constantLiftCoefficient
)
:
liftModel(dict, pair),
- Cl_("Cl", dimless, dict.lookup("Cl"))
+ Cl_("Cl", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
index 38c0cf6db69ae387e1bbd25c48627da51fd7b552..8252f4d754feb0650c6a6b9641cf116c745bfbdf 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
@@ -63,7 +63,7 @@ Foam::swarmCorrections::TomiyamaSwarm::TomiyamaSwarm
pair_.dispersed().residualAlpha().value()
)
),
- l_("l", dimless, dict.lookup("l"))
+ l_("l", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C
index c51b716340a930a01de142f51f63d5d19f666586..093013cca3f5993f9edd3e087d92ce222eea2c16 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C
@@ -56,7 +56,7 @@ Foam::turbulentDispersionModels::Burns::Burns
)
:
turbulentDispersionModel(dict, pair),
- sigma_("sigma", dimless, dict.lookup("sigma")),
+ sigma_("sigma", dimless, dict),
residualAlpha_
(
"residualAlpha",
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
index a40dbf07703b4bc11010e2c167b29039ba9e1298..a6f8a16fbd3864b47cefeaeb7a43304b963ddac4 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
@@ -56,7 +56,7 @@ Foam::turbulentDispersionModels::Gosman::Gosman
)
:
turbulentDispersionModel(dict, pair),
- sigma_("sigma", dimless, dict.lookup("sigma"))
+ sigma_("sigma", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
index 52adccb9b44858ff623bca83c4c361a10be66d93..848911fe2dd4f24c3be75b73da7c98cc3e3ab170 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
@@ -54,7 +54,7 @@ Foam::turbulentDispersionModels::LopezDeBertodano::LopezDeBertodano
)
:
turbulentDispersionModel(dict, pair),
- Ctd_("Ctd", dimless, dict.lookup("Ctd"))
+ Ctd_("Ctd", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
index 67566b9f885fb09358340b1b215ac119f4d4c7c6..fb8126c5d2ad56a2d88c5908e31a85a279019724 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
@@ -55,7 +55,7 @@ constantTurbulentDispersionCoefficient
)
:
turbulentDispersionModel(dict, pair),
- Ctd_("Ctd", dimless, dict.lookup("Ctd"))
+ Ctd_("Ctd", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
index 2fa5f493050d66580da2fbf6083c5fc6153d29db..e257ebaf1bf6ce28639ea1027046c30b7ce5b5d8 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
@@ -55,7 +55,7 @@ constantVirtualMassCoefficient
)
:
virtualMassModel(dict, pair, registerObject),
- Cvm_("Cvm", dimless, dict.lookup("Cvm"))
+ Cvm_("Cvm", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C
index fa9b2749f047d79a00b250bbd19906477c87e222..0b2c7b501297aac7928846a492bca32024fb86b1 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C
@@ -53,8 +53,8 @@ Foam::wallLubricationModels::Antal::Antal
)
:
wallLubricationModel(dict, pair),
- Cw1_("Cw1", dimless, dict.lookup("Cw1")),
- Cw2_("Cw2", dimless, dict.lookup("Cw2"))
+ Cw1_("Cw1", dimless, dict),
+ Cw2_("Cw2", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
index f1b11a32cc04fed09cc87d768526fc5cab2d4b75..0b9065a1a9dc49c6f2d2371e8769a86169cc9539 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
@@ -53,8 +53,8 @@ Foam::wallLubricationModels::Frank::Frank
)
:
wallLubricationModel(dict, pair),
- Cwd_("Cwd", dimless, dict.lookup("Cwd")),
- Cwc_("Cwc", dimless, dict.lookup("Cwc")),
+ Cwd_("Cwd", dimless, dict),
+ Cwc_("Cwc", dimless, dict),
p_(readScalar(dict.lookup("p")))
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
index c3db3597af63310b661b599004163f8f2a8753fe..9209c5108cd3d71a0275bef4e2900ffe05509d47 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
@@ -53,7 +53,7 @@ Foam::wallLubricationModels::TomiyamaWallLubrication::TomiyamaWallLubrication
)
:
wallLubricationModel(dict, pair),
- D_("Cwd", dimLength, dict.lookup("D"))
+ D_("Cwd", dimLength, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
index 55541ac8fabfa228a30825ca89c94f6b08476d8e..5abe9f3561d741f93a9140d838b96452e4d9f0fb 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
@@ -57,7 +57,7 @@ Foam::kineticTheoryModels::conductivityModels::HrenyaSinclair::HrenyaSinclair
:
conductivityModel(dict),
coeffDict_(dict.subDict(typeName + "Coeffs")),
- L_("L", dimensionSet(0, 1, 0, 0, 0), coeffDict_.lookup("L"))
+ L_("L", dimensionSet(0, 1, 0, 0, 0), coeffDict_)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
index 9f2be1a235ff6bff0467523fd0a22872e8556f66..2180c0bd2e2ddd50d582cb6ae5759a71bb96f850 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
@@ -58,11 +58,11 @@ JohnsonJackson
:
frictionalStressModel(dict),
coeffDict_(dict.subDict(typeName + "Coeffs")),
- Fr_("Fr", dimensionSet(1, -1, -2, 0, 0), coeffDict_.lookup("Fr")),
- eta_("eta", dimless, coeffDict_.lookup("eta")),
- p_("p", dimless, coeffDict_.lookup("p")),
- phi_("phi", dimless, coeffDict_.lookup("phi")),
- alphaDeltaMin_("alphaDeltaMin", dimless, coeffDict_.lookup("alphaDeltaMin"))
+ Fr_("Fr", dimensionSet(1, -1, -2, 0, 0), coeffDict_),
+ eta_("eta", dimless, coeffDict_),
+ p_("p", dimless, coeffDict_),
+ phi_("phi", dimless, coeffDict_),
+ alphaDeltaMin_("alphaDeltaMin", dimless, coeffDict_)
{
phi_ *= constant::mathematical::pi/180.0;
}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index 7d0a4decd069b863b7cfc079d59c65e0d57e0bd8..55e7b9f2cd2ec8071b1fedd3f1e6324bf7b9aea7 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -56,7 +56,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::Schaeffer
:
frictionalStressModel(dict),
coeffDict_(dict.subDict(typeName + "Coeffs")),
- phi_("phi", dimless, coeffDict_.lookup("phi"))
+ phi_("phi", dimless, coeffDict_)
{
phi_ *= constant::mathematical::pi/180.0;
}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index 8de1fdc9e11b6ac99540eda2602b597027bb655a..11d09d1118fd6b12a205157d4fca0541dcd1eeea 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -92,19 +92,19 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
),
equilibrium_(coeffDict_.lookup("equilibrium")),
- e_("e", dimless, coeffDict_.lookup("e")),
- alphaMax_("alphaMax", dimless, coeffDict_.lookup("alphaMax")),
+ e_("e", dimless, coeffDict_),
+ alphaMax_("alphaMax", dimless, coeffDict_),
alphaMinFriction_
(
"alphaMinFriction",
dimless,
- coeffDict_.lookup("alphaMinFriction")
+ coeffDict_
),
residualAlpha_
(
"residualAlpha",
dimless,
- coeffDict_.lookup("residualAlpha")
+ coeffDict_
),
Theta_
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
index bd95013d0ab95bacab95b8909343cba6e59fef42..415bb3145a572eecdb51a1f9237b7665e6fcacb7 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
@@ -57,7 +57,7 @@ Foam::kineticTheoryModels::viscosityModels::HrenyaSinclair::HrenyaSinclair
:
viscosityModel(dict),
coeffDict_(dict.subDict(typeName + "Coeffs")),
- L_("L", dimensionSet(0, 1, 0, 0, 0), coeffDict_.lookup("L"))
+ L_("L", dimensionSet(0, 1, 0, 0, 0), coeffDict_)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATE.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATE.C
index 4d51d8c43d4850255fd3ad2dd61b449e5fcd4a8e..aaee131eeb0fd7a73fd6079cabfbbc634863f937 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATE.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATE.C
@@ -75,13 +75,13 @@ Foam::diameterModels::IATE::IATE
),
phase_.mesh()
),
- dMax_("dMax", dimLength, diameterProperties_.lookup("dMax")),
- dMin_("dMin", dimLength, diameterProperties_.lookup("dMin")),
+ dMax_("dMax", dimLength, diameterProperties_),
+ dMin_("dMin", dimLength, diameterProperties_),
residualAlpha_
(
"residualAlpha",
dimless,
- diameterProperties_.lookup("residualAlpha")
+ diameterProperties_
),
d_
(
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
index 8fde0b702022bb19fcc5b59f7f214d796ab12495..86072b8dd0a78da67d3a736e101ec0c99a0a25a5 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
@@ -51,9 +51,9 @@ randomCoalescence
)
:
IATEsource(iate),
- Crc_("Crc", dimless, dict.lookup("Crc")),
- C_("C", dimless, dict.lookup("C")),
- alphaMax_("alphaMax", dimless, dict.lookup("alphaMax"))
+ Crc_("Crc", dimless, dict),
+ C_("C", dimless, dict),
+ alphaMax_("alphaMax", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
index 334369f40f1d152b03cf6d469b3bd4c0370d4cfb..1dde056beb451e69b9071781c96815837c3cb607 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
@@ -51,8 +51,8 @@ turbulentBreakUp
)
:
IATEsource(iate),
- Cti_("Cti", dimless, dict.lookup("Cti")),
- WeCr_("WeCr", dimless, dict.lookup("WeCr"))
+ Cti_("Cti", dimless, dict),
+ WeCr_("WeCr", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
index a015be5f76a46b7dc6eea5d8b877e269c6277029..20634b3204cc1e742b88f4d0ec34c083dd5c7649 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
@@ -56,7 +56,7 @@ wakeEntrainmentCoalescence
)
:
IATEsource(iate),
- Cwe_("Cwe", dimless, dict.lookup("Cwe"))
+ Cwe_("Cwe", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.C
index 4cd500fa36db4e3ec55aa4f2ff8476ce2e6b3692..5d8ec7464d43f3118f70f5f41d3a34bd4d909478 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/constantDiameter/constantDiameter.C
@@ -53,7 +53,7 @@ Foam::diameterModels::constant::constant
)
:
diameterModel(diameterProperties, phase),
- d_("d", dimLength, diameterProperties_.lookup("d"))
+ d_("d", dimLength, diameterProperties_)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C
index 9fc5a48874f17968f47c58b0cd2e8454f3e4dad2..921dbdba5b57f212228c6490b49cea00c06670cc 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/diameterModels/isothermalDiameter/isothermalDiameter.C
@@ -53,8 +53,8 @@ Foam::diameterModels::isothermal::isothermal
)
:
diameterModel(diameterProperties, phase),
- d0_("d0", dimLength, diameterProperties_.lookup("d0")),
- p0_("p0", dimPressure, diameterProperties_.lookup("p0"))
+ d0_("d0", dimLength, diameterProperties_),
+ p0_("p0", dimPressure, diameterProperties_)
{}
diff --git a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
index 3d34d8cfe0fd461d3e887a4bf93ceb7cfea1a1ed..d6e05a51397501881f736b519f4e1a66a0af53b2 100644
--- a/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
+++ b/applications/solvers/multiphase/reactingTwoPhaseEulerFoam/phaseSystems/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
@@ -49,13 +49,13 @@ Foam::MultiComponentPhaseModel<BasePhaseModel>::MultiComponentPhaseModel
(
"Sc",
dimless,
- fluid.subDict(phaseName).lookup("Sc")
+ fluid.subDict(phaseName)
),
residualAlpha_
(
"residualAlpha",
dimless,
- fluid.mesh().solverDict("Yi").lookup("residualAlpha")
+ fluid.mesh().solverDict("Yi")
),
inertIndex_(-1)
{
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
index c52c897b3feeeab48570978c35c1054facbf37fe..c38f7e2959b7a6b7ab914d8017eaf09f6e7eef36 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/createFields.H
@@ -37,10 +37,10 @@ volScalarField& alpha2(mixture.alpha2());
const dimensionedScalar& rho1 = mixture.rho1();
const dimensionedScalar& rho2 = mixture.rho2();
-dimensionedScalar Dab("Dab", dimViscosity, mixture.lookup("Dab"));
+dimensionedScalar Dab("Dab", dimViscosity, mixture);
// Read the reciprocal of the turbulent Schmidt number
-dimensionedScalar alphatab("alphatab", dimless, mixture.lookup("alphatab"));
+dimensionedScalar alphatab("alphatab", dimless, mixture);
// Need to store rho for ddt(rho, U)
volScalarField rho("rho", alpha1*rho1 + alpha2*rho2);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
index f76f904fb477122dc3d9769505575df1a67674cf..570d7fd69956d5dd6fc56789decd63f59d6ca585 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
@@ -27,7 +27,7 @@ dimensionedScalar pMin
(
"pMin",
dimPressure,
- fluid.lookup("pMin")
+ fluid
);
#include "gh.H"
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
index e89646382230569dff8369374ed78b2ac02b4542..386b06d6aa5e493baf36ad7e9d214aaedd8441c7 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/aspectRatioModels/constantAspectRatio/constantAspectRatio.C
@@ -53,7 +53,7 @@ Foam::aspectRatioModels::constantAspectRatio::constantAspectRatio
)
:
aspectRatioModel(dict, pair),
- E0_("E0", dimless, dict.lookup("E0"))
+ E0_("E0", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
index c637c3bb354a4e23afb748b835caf36a13b0858d..9503264de927965d323d6e87ba5400cb6fb522e8 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/GidaspowSchillerNaumann/GidaspowSchillerNaumann.C
@@ -49,7 +49,7 @@ Foam::dragModels::GidaspowSchillerNaumann::GidaspowSchillerNaumann
)
:
dragModel(dict, pair, registerObject),
- residualRe_("residualRe", dimless, dict.lookup("residualRe"))
+ residualRe_("residualRe", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
index 2d4a6540304401c6bb05b396d804d3eb6800538d..d0818e2c15ce23d72f532c0d378e60bb36c42c66 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/SchillerNaumann/SchillerNaumann.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -49,7 +49,7 @@ Foam::dragModels::SchillerNaumann::SchillerNaumann
)
:
dragModel(dict, pair, registerObject),
- residualRe_("residualRe", dimless, dict.lookup("residualRe"))
+ residualRe_("residualRe", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
index 01d122debf3c1988a48c451d8bd4c268c2e55c38..77e84e7a4ea1464c81f95ee1c408f15a30027601 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaAnalytic/TomiyamaAnalytic.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -49,9 +49,9 @@ Foam::dragModels::TomiyamaAnalytic::TomiyamaAnalytic
)
:
dragModel(dict, pair, registerObject),
- residualRe_("residualRe", dimless, dict.lookup("residualRe")),
- residualEo_("residualEo", dimless, dict.lookup("residualEo")),
- residualE_("residualE", dimless, dict.lookup("residualE"))
+ residualRe_("residualRe", dimless, dict),
+ residualEo_("residualEo", dimless, dict),
+ residualE_("residualE", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
index 50fdc667f08ceea4e9780e0842ce9f10653e86b3..0ad806735022529b1fcc94921ac54ff3d50d0e93 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/TomiyamaCorrelated/TomiyamaCorrelated.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -49,7 +49,7 @@ Foam::dragModels::TomiyamaCorrelated::TomiyamaCorrelated
)
:
dragModel(dict, pair, registerObject),
- A_("A", dimless, dict.lookup("A"))
+ A_("A", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
index bf1e1da4a770fb2cb9278fc790d06c29573f94fe..21ed8c53a8af1e8b6646348400f5de70f3a1d9aa 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/WenYu/WenYu.C
@@ -49,7 +49,7 @@ Foam::dragModels::WenYu::WenYu
)
:
dragModel(dict, pair, registerObject),
- residualRe_("residualRe", dimless, dict.lookup("residualRe"))
+ residualRe_("residualRe", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
index b50a711c77fd349f4459a357d842e91d319c4df5..4b1fc88ddc5e6be40b99f12f341c5d75c390798e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/segregated/segregated.C
@@ -51,8 +51,8 @@ Foam::dragModels::segregated::segregated
)
:
dragModel(dict, pair, registerObject),
- m_("m", dimless, dict.lookup("m")),
- n_("n", dimless, dict.lookup("n"))
+ m_("m", dimless, dict),
+ n_("n", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
index 244853634bd1f770044c9bf260d37c551714fd26..22ee620b41e8f543b193bcb2433539608fbe3c70 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/LegendreMagnaudet/LegendreMagnaudet.C
@@ -49,7 +49,7 @@ Foam::liftModels::LegendreMagnaudet::LegendreMagnaudet
)
:
liftModel(dict, pair),
- residualRe_("residualRe", dimless, dict.lookup("residualRe"))
+ residualRe_("residualRe", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
index f070c55424f5ad4b0272a17a04ba722b9d7ac921..b85199d86a4a89ae9b64ad6c54feaeaba81c5280 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/liftModels/constantLiftCoefficient/constantLiftCoefficient.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2014-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -48,7 +48,7 @@ Foam::liftModels::constantLiftCoefficient::constantLiftCoefficient
)
:
liftModel(dict, pair),
- Cl_("Cl", dimless, dict.lookup("Cl"))
+ Cl_("Cl", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
index 38c0cf6db69ae387e1bbd25c48627da51fd7b552..8252f4d754feb0650c6a6b9641cf116c745bfbdf 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/swarmCorrections/TomiyamaSwarm/TomiyamaSwarm.C
@@ -63,7 +63,7 @@ Foam::swarmCorrections::TomiyamaSwarm::TomiyamaSwarm
pair_.dispersed().residualAlpha().value()
)
),
- l_("l", dimless, dict.lookup("l"))
+ l_("l", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C
index c51b716340a930a01de142f51f63d5d19f666586..093013cca3f5993f9edd3e087d92ce222eea2c16 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Burns/Burns.C
@@ -56,7 +56,7 @@ Foam::turbulentDispersionModels::Burns::Burns
)
:
turbulentDispersionModel(dict, pair),
- sigma_("sigma", dimless, dict.lookup("sigma")),
+ sigma_("sigma", dimless, dict),
residualAlpha_
(
"residualAlpha",
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
index a40dbf07703b4bc11010e2c167b29039ba9e1298..a6f8a16fbd3864b47cefeaeb7a43304b963ddac4 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/Gosman/Gosman.C
@@ -56,7 +56,7 @@ Foam::turbulentDispersionModels::Gosman::Gosman
)
:
turbulentDispersionModel(dict, pair),
- sigma_("sigma", dimless, dict.lookup("sigma"))
+ sigma_("sigma", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
index 52adccb9b44858ff623bca83c4c361a10be66d93..848911fe2dd4f24c3be75b73da7c98cc3e3ab170 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/LopezDeBertodano/LopezDeBertodano.C
@@ -54,7 +54,7 @@ Foam::turbulentDispersionModels::LopezDeBertodano::LopezDeBertodano
)
:
turbulentDispersionModel(dict, pair),
- Ctd_("Ctd", dimless, dict.lookup("Ctd"))
+ Ctd_("Ctd", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
index 67566b9f885fb09358340b1b215ac119f4d4c7c6..fb8126c5d2ad56a2d88c5908e31a85a279019724 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/turbulentDispersionModels/constantTurbulentDispersionCoefficient/constantTurbulentDispersionCoefficient.C
@@ -55,7 +55,7 @@ constantTurbulentDispersionCoefficient
)
:
turbulentDispersionModel(dict, pair),
- Ctd_("Ctd", dimless, dict.lookup("Ctd"))
+ Ctd_("Ctd", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
index 2fa5f493050d66580da2fbf6083c5fc6153d29db..e257ebaf1bf6ce28639ea1027046c30b7ce5b5d8 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/virtualMassModels/constantVirtualMassCoefficient/constantVirtualMassCoefficient.C
@@ -55,7 +55,7 @@ constantVirtualMassCoefficient
)
:
virtualMassModel(dict, pair, registerObject),
- Cvm_("Cvm", dimless, dict.lookup("Cvm"))
+ Cvm_("Cvm", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C
index fa9b2749f047d79a00b250bbd19906477c87e222..0b2c7b501297aac7928846a492bca32024fb86b1 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Antal/Antal.C
@@ -53,8 +53,8 @@ Foam::wallLubricationModels::Antal::Antal
)
:
wallLubricationModel(dict, pair),
- Cw1_("Cw1", dimless, dict.lookup("Cw1")),
- Cw2_("Cw2", dimless, dict.lookup("Cw2"))
+ Cw1_("Cw1", dimless, dict),
+ Cw2_("Cw2", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
index f1b11a32cc04fed09cc87d768526fc5cab2d4b75..0b9065a1a9dc49c6f2d2371e8769a86169cc9539 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/Frank/Frank.C
@@ -53,8 +53,8 @@ Foam::wallLubricationModels::Frank::Frank
)
:
wallLubricationModel(dict, pair),
- Cwd_("Cwd", dimless, dict.lookup("Cwd")),
- Cwc_("Cwc", dimless, dict.lookup("Cwc")),
+ Cwd_("Cwd", dimless, dict),
+ Cwc_("Cwc", dimless, dict),
p_(readScalar(dict.lookup("p")))
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
index c3db3597af63310b661b599004163f8f2a8753fe..9209c5108cd3d71a0275bef4e2900ffe05509d47 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/wallLubricationModels/TomiyamaWallLubrication/TomiyamaWallLubrication.C
@@ -53,7 +53,7 @@ Foam::wallLubricationModels::TomiyamaWallLubrication::TomiyamaWallLubrication
)
:
wallLubricationModel(dict, pair),
- D_("Cwd", dimLength, dict.lookup("D"))
+ D_("Cwd", dimLength, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
index cc965c84de322cf9f4a1fcb7fa236ec0df8e9f3b..5abe9f3561d741f93a9140d838b96452e4d9f0fb 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/conductivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -57,7 +57,7 @@ Foam::kineticTheoryModels::conductivityModels::HrenyaSinclair::HrenyaSinclair
:
conductivityModel(dict),
coeffDict_(dict.subDict(typeName + "Coeffs")),
- L_("L", dimensionSet(0, 1, 0, 0, 0), coeffDict_.lookup("L"))
+ L_("L", dimensionSet(0, 1, 0, 0, 0), coeffDict_)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
index 9f2be1a235ff6bff0467523fd0a22872e8556f66..2180c0bd2e2ddd50d582cb6ae5759a71bb96f850 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/JohnsonJackson/JohnsonJacksonFrictionalStress.C
@@ -58,11 +58,11 @@ JohnsonJackson
:
frictionalStressModel(dict),
coeffDict_(dict.subDict(typeName + "Coeffs")),
- Fr_("Fr", dimensionSet(1, -1, -2, 0, 0), coeffDict_.lookup("Fr")),
- eta_("eta", dimless, coeffDict_.lookup("eta")),
- p_("p", dimless, coeffDict_.lookup("p")),
- phi_("phi", dimless, coeffDict_.lookup("phi")),
- alphaDeltaMin_("alphaDeltaMin", dimless, coeffDict_.lookup("alphaDeltaMin"))
+ Fr_("Fr", dimensionSet(1, -1, -2, 0, 0), coeffDict_),
+ eta_("eta", dimless, coeffDict_),
+ p_("p", dimless, coeffDict_),
+ phi_("phi", dimless, coeffDict_),
+ alphaDeltaMin_("alphaDeltaMin", dimless, coeffDict_)
{
phi_ *= constant::mathematical::pi/180.0;
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
index 705b66d6bf6ec58d12b434abf62fba9e2e697aa5..55e7b9f2cd2ec8071b1fedd3f1e6324bf7b9aea7 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/frictionalStressModel/Schaeffer/SchaefferFrictionalStress.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -56,7 +56,7 @@ Foam::kineticTheoryModels::frictionalStressModels::Schaeffer::Schaeffer
:
frictionalStressModel(dict),
coeffDict_(dict.subDict(typeName + "Coeffs")),
- phi_("phi", dimless, coeffDict_.lookup("phi"))
+ phi_("phi", dimless, coeffDict_)
{
phi_ *= constant::mathematical::pi/180.0;
}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
index ed109b96def65f8b8cd1cc6ccb7b040b171b60b4..30254f3891b6811927aa84e5bc0a8b51b81662ae 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/kineticTheoryModel/kineticTheoryModel.C
@@ -92,19 +92,19 @@ Foam::RASModels::kineticTheoryModel::kineticTheoryModel
),
equilibrium_(coeffDict_.lookup("equilibrium")),
- e_("e", dimless, coeffDict_.lookup("e")),
- alphaMax_("alphaMax", dimless, coeffDict_.lookup("alphaMax")),
+ e_("e", dimless, coeffDict_),
+ alphaMax_("alphaMax", dimless, coeffDict_),
alphaMinFriction_
(
"alphaMinFriction",
dimless,
- coeffDict_.lookup("alphaMinFriction")
+ coeffDict_
),
residualAlpha_
(
"residualAlpha",
dimless,
- coeffDict_.lookup("residualAlpha")
+ coeffDict_
),
Theta_
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
index a8b7d1c58d9a094fc41aef61bc5ce76dfa77e1b2..415bb3145a572eecdb51a1f9237b7665e6fcacb7 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/phaseCompressibleTurbulenceModels/kineticTheoryModels/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -57,7 +57,7 @@ Foam::kineticTheoryModels::viscosityModels::HrenyaSinclair::HrenyaSinclair
:
viscosityModel(dict),
coeffDict_(dict.subDict(typeName + "Coeffs")),
- L_("L", dimensionSet(0, 1, 0, 0, 0), coeffDict_.lookup("L"))
+ L_("L", dimensionSet(0, 1, 0, 0, 0), coeffDict_)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C
index f6e1a535cb49f90e652fd1b54c4cf4da2555efc1..6999c184cd84bd3b5a4cb6d185be7a45e1ebc1ea 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATE.C
@@ -76,13 +76,13 @@ Foam::diameterModels::IATE::IATE
),
phase_.U().mesh()
),
- dMax_("dMax", dimLength, diameterProperties_.lookup("dMax")),
- dMin_("dMin", dimLength, diameterProperties_.lookup("dMin")),
+ dMax_("dMax", dimLength, diameterProperties_),
+ dMin_("dMin", dimLength, diameterProperties_),
residualAlpha_
(
"residualAlpha",
dimless,
- diameterProperties_.lookup("residualAlpha")
+ diameterProperties_
),
d_
(
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
index a39e9140dbe55a034683d954ef0fdf0f253350bf..480937663be0261b9fcddf2ccc5b1f9c0ff1ab4b 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/randomCoalescence/randomCoalescence.C
@@ -51,9 +51,9 @@ randomCoalescence
)
:
IATEsource(iate),
- Crc_("Crc", dimless, dict.lookup("Crc")),
- C_("C", dimless, dict.lookup("C")),
- alphaMax_("alphaMax", dimless, dict.lookup("alphaMax"))
+ Crc_("Crc", dimless, dict),
+ C_("C", dimless, dict),
+ alphaMax_("alphaMax", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
index 39bd0daf89b8a10c212a31af11075435b96515e0..8c0be0f23284629c22f8420b8971b88077d39610 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/turbulentBreakUp/turbulentBreakUp.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -51,8 +51,8 @@ turbulentBreakUp
)
:
IATEsource(iate),
- Cti_("Cti", dimless, dict.lookup("Cti")),
- WeCr_("WeCr", dimless, dict.lookup("WeCr"))
+ Cti_("Cti", dimless, dict),
+ WeCr_("WeCr", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
index 66c324c761f2c99af4db2afef7173c29c252d584..20634b3204cc1e742b88f4d0ec34c083dd5c7649 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/IATE/IATEsources/wakeEntrainmentCoalescence/wakeEntrainmentCoalescence.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -56,7 +56,7 @@ wakeEntrainmentCoalescence
)
:
IATEsource(iate),
- Cwe_("Cwe", dimless, dict.lookup("Cwe"))
+ Cwe_("Cwe", dimless, dict)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C
index 628f8259b87a6f3f984a062e2ef66dcd9865e580..1f6cf5c44187d7fe36f339d45898fbc836e9919b 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/constantDiameter/constantDiameter.C
@@ -53,7 +53,7 @@ Foam::diameterModels::constant::constant
)
:
diameterModel(diameterProperties, phase),
- d_("d", dimLength, diameterProperties_.lookup("d"))
+ d_("d", dimLength, diameterProperties_)
{}
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
index aab9b469c7c36d054ca17a65d41aeb5277c0b33f..2754ce8d731e6ebf6393c96efde2b495cf185f1a 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/diameterModels/isothermalDiameter/isothermalDiameter.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -53,8 +53,8 @@ Foam::diameterModels::isothermal::isothermal
)
:
diameterModel(diameterProperties, phase),
- d0_("d0", dimLength, diameterProperties_.lookup("d0")),
- p0_("p0", dimPressure, diameterProperties_.lookup("p0"))
+ d0_("d0", dimLength, diameterProperties_),
+ p0_("p0", dimPressure, diameterProperties_)
{}
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
index 4820505ba6be9a180f9f93c8753663a3498fe70e..b9ed09ae800bd110ac93cfb7ebe129cb88971d10 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
@@ -27,39 +27,47 @@ License
#include "pTraits.H"
#include "dictionary.H"
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
-Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrDefault
-(
- const word& name,
- const dictionary& dict,
- const Type& defaultValue,
- const dimensionSet& dims
-)
+void Foam::dimensioned<Type>::initialize(Istream& is)
{
- if (dict.found(name))
+ token nextToken(is);
+ is.putBack(nextToken);
+
+ // Check if the original format is used in which the name is provided
+ // and reset the name to that read
+ if (nextToken.isWord())
{
- return dimensioned<Type>(name, dims, dict.lookup(name));
+ is >> name_;
+ is >> nextToken;
+ is.putBack(nextToken);
}
- else
+
+ // If the dimensions are provided compare with the argument
+ scalar multiplier = 1.0;
+
+ if (nextToken == token::BEGIN_SQR)
{
- return dimensioned<Type>(name, dims, defaultValue);
- }
-}
+ dimensionSet dims(dimless);
+ dims.read(is, multiplier);
+ if (dims != dimensions_)
+ {
+ FatalIOErrorIn
+ (
+ "dimensioned<Type>::dimensioned"
+ "(const word&, const dimensionSet&, Istream&)",
+ is
+ ) << "The dimensions " << dims
+ << " provided do not match the required dimensions "
+ << dimensions_
+ << abort(FatalIOError);
+ }
+ }
-template<class Type>
-Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrAddToDict
-(
- const word& name,
- dictionary& dict,
- const Type& defaultValue,
- const dimensionSet& dims
-)
-{
- Type value = dict.lookupOrAddDefault<Type>(name, defaultValue);
- return dimensioned<Type>(name, dims, value);
+ is >> value_;
+ value_ *= multiplier;
}
@@ -133,42 +141,23 @@ Foam::dimensioned<Type>::dimensioned
dimensions_(dimSet),
value_(pTraits<Type>::zero)
{
- token nextToken(is);
- is.putBack(nextToken);
-
- // Check if the original format is used in which the name is provided
- // and reset the name to that read
- if (nextToken.isWord())
- {
- is >> name_;
- is >> nextToken;
- is.putBack(nextToken);
- }
-
- // If the dimensions are provided compare with the argument
- scalar multiplier = 1.0;
-
- if (nextToken == token::BEGIN_SQR)
- {
- dimensionSet dims(dimless);
- dims.read(is, multiplier);
+ initialize(is);
+}
- if (dims != dimensions_)
- {
- FatalIOErrorIn
- (
- "dimensioned<Type>::dimensioned"
- "(const word&, const dimensionSet&, Istream&)",
- is
- ) << "The dimensions " << dims
- << " provided do not match the required dimensions "
- << dimensions_
- << abort(FatalIOError);
- }
- }
- is >> value_;
- value_ *= multiplier;
+template<class Type>
+Foam::dimensioned<Type>::dimensioned
+(
+ const word& name,
+ const dimensionSet& dimSet,
+ const dictionary& dict
+)
+:
+ name_(name),
+ dimensions_(dimSet),
+ value_(pTraits<Type>::zero)
+{
+ initialize(dict.lookup(name));
}
@@ -182,6 +171,42 @@ Foam::dimensioned<Type>::dimensioned
{}
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+template<class Type>
+Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrDefault
+(
+ const word& name,
+ const dictionary& dict,
+ const Type& defaultValue,
+ const dimensionSet& dims
+)
+{
+ if (dict.found(name))
+ {
+ return dimensioned<Type>(name, dims, dict.lookup(name));
+ }
+ else
+ {
+ return dimensioned<Type>(name, dims, defaultValue);
+ }
+}
+
+
+template<class Type>
+Foam::dimensioned<Type> Foam::dimensioned<Type>::lookupOrAddToDict
+(
+ const word& name,
+ dictionary& dict,
+ const Type& defaultValue,
+ const dimensionSet& dims
+)
+{
+ Type value = dict.lookupOrAddDefault<Type>(name, defaultValue);
+ return dimensioned<Type>(name, dims, value);
+}
+
+
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class Type>
diff --git a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
index 47800b1960ef6083783e7c6a9c791467e2bc0644..bb7f632918f1911673c9259514f865ebd52a857b 100644
--- a/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
+++ b/src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -64,7 +64,7 @@ class dictionary;
template<class Type>
class dimensioned
{
- // private data
+ // Private data
//- Variable name
word name_;
@@ -76,6 +76,13 @@ class dimensioned
Type value_;
+ // Private member functions
+
+ //- Initialize from Istream
+ // Helper-function for constructors
+ void initialize(Istream& is);
+
+
public:
//- Component type
@@ -107,9 +114,15 @@ public:
//- Construct from an Istream with a given name and dimensions
dimensioned(const word&, const dimensionSet&, Istream&);
+ //- Construct from dictionary lookup with a given name and dimensions
+ dimensioned(const word&, const dimensionSet&, const dictionary&);
+
//- Null constructor
dimensioned();
+
+ // Static member functions
+
//- Construct from dictionary, with default value.
static dimensioned<Type> lookupOrDefault
(
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.C
index 4d6daeafcbd7ffabd4fac5a1a0a9356824097971..22598e0140c29104b5399a304918d45ed25917ab 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/ArrheniusViscosity/ArrheniusViscosity.C
@@ -58,9 +58,9 @@ ArrheniusViscosity::ArrheniusViscosity
:
filmViscosityModel(typeName, owner, dict, mu),
viscosity_(filmViscosityModel::New(owner, coeffDict_, mu)),
- k1_("k1", dimTemperature, coeffDict_.lookup("k1")),
- k2_("k2", dimTemperature, coeffDict_.lookup("k2")),
- Tref_("Tref", dimTemperature, coeffDict_.lookup("Tref"))
+ k1_("k1", dimTemperature, coeffDict_),
+ k2_("k2", dimTemperature, coeffDict_),
+ Tref_("Tref", dimTemperature, coeffDict_)
{}
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.C
index 7e9f3e7310dd75a39a3b0f8898c667835315eee8..d1f47f17c535ecb0e355b690700ecf5cb0908eab 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/constantViscosity/constantViscosity.C
@@ -56,7 +56,7 @@ constantViscosity::constantViscosity
)
:
filmViscosityModel(typeName, owner, dict, mu),
- mu0_("mu0", dimDynamicViscosity, coeffDict_.lookup("mu0"))
+ mu0_("mu0", dimDynamicViscosity, coeffDict_)
{
mu_ == mu0_;
}
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C
index d29d9d3ff4193412c0accfb9095bc2e64e2880e2..7152139181aff502b213c4228efb67ac259e1d15 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/thixotropicViscosity/thixotropicViscosity.C
@@ -63,12 +63,12 @@ thixotropicViscosity::thixotropicViscosity
)
:
filmViscosityModel(typeName, owner, dict, mu),
- a_("a", dimless/dimTime, coeffDict_.lookup("a")),
- b_("b", dimless, coeffDict_.lookup("b")),
- d_("d", dimless, coeffDict_.lookup("d")),
- c_("c", pow(dimTime, d_.value() - scalar(1)), coeffDict_.lookup("c")),
- mu0_("mu0", dimPressure*dimTime, coeffDict_.lookup("mu0")),
- muInf_("muInf", mu0_.dimensions(), coeffDict_.lookup("muInf")),
+ a_("a", dimless/dimTime, coeffDict_),
+ b_("b", dimless, coeffDict_),
+ d_("d", dimless, coeffDict_),
+ c_("c", pow(dimTime, d_.value() - scalar(1)), coeffDict_),
+ mu0_("mu0", dimPressure*dimTime, coeffDict_),
+ muInf_("muInf", mu0_.dimensions(), coeffDict_),
K_(1.0 - Foam::sqrt(muInf_/mu0_)),
lambda_
(
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
index bf0a4b5f6d52f84008b133ab157b198aa89360d0..3d59eda215dde59549d14d6c6736997fd157ff5d 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
@@ -97,8 +97,8 @@ Foam::incompressibleTwoPhaseMixture::incompressibleTwoPhaseMixture
)
),
- rho1_("rho", dimDensity, nuModel1_->viscosityProperties().lookup("rho")),
- rho2_("rho", dimDensity, nuModel2_->viscosityProperties().lookup("rho")),
+ rho1_("rho", dimDensity, nuModel1_->viscosityProperties()),
+ rho2_("rho", dimDensity, nuModel2_->viscosityProperties()),
U_(U),
phi_(phi),
diff --git a/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.C b/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.C
index 3deb2a66c99397cd00d49ae9c7590650bd192103..4ea9529eaeffe24a1221e6526d50d96d5945c9bb 100644
--- a/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.C
+++ b/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.C
@@ -68,10 +68,10 @@ Foam::viscosityModels::BirdCarreau::BirdCarreau
:
viscosityModel(name, viscosityProperties, U, phi),
BirdCarreauCoeffs_(viscosityProperties.subDict(typeName + "Coeffs")),
- nu0_("nu0", dimViscosity, BirdCarreauCoeffs_.lookup("nu0")),
- nuInf_("nuInf", dimViscosity, BirdCarreauCoeffs_.lookup("nuInf")),
- k_("k", dimTime, BirdCarreauCoeffs_.lookup("k")),
- n_("n", dimless, BirdCarreauCoeffs_.lookup("n")),
+ nu0_("nu0", dimViscosity, BirdCarreauCoeffs_),
+ nuInf_("nuInf", dimViscosity, BirdCarreauCoeffs_),
+ k_("k", dimTime, BirdCarreauCoeffs_),
+ n_("n", dimless, BirdCarreauCoeffs_),
a_
(
BirdCarreauCoeffs_.lookupOrDefault
diff --git a/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.C b/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.C
index 1201dbb4aaa369e5ab203437a7040bf145103f0f..7359c621d0d2f3109a1dba3ad9e2e52985265fae 100644
--- a/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.C
+++ b/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.C
@@ -66,10 +66,10 @@ Foam::viscosityModels::CrossPowerLaw::CrossPowerLaw
:
viscosityModel(name, viscosityProperties, U, phi),
CrossPowerLawCoeffs_(viscosityProperties.subDict(typeName + "Coeffs")),
- nu0_("nu0", dimViscosity, CrossPowerLawCoeffs_.lookup("nu0")),
- nuInf_("nuInf", dimViscosity, CrossPowerLawCoeffs_.lookup("nuInf")),
- m_("m", dimTime, CrossPowerLawCoeffs_.lookup("m")),
- n_("n", dimless, CrossPowerLawCoeffs_.lookup("n")),
+ nu0_("nu0", dimViscosity, CrossPowerLawCoeffs_),
+ nuInf_("nuInf", dimViscosity, CrossPowerLawCoeffs_),
+ m_("m", dimTime, CrossPowerLawCoeffs_),
+ n_("n", dimless, CrossPowerLawCoeffs_),
nu_
(
IOobject
diff --git a/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C b/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C
index eb41da76fdd7cb4cdc3d672629df5b106bc1a6fd..f9ed2bb86e6724827c6eb5320280541ede5f0a33 100644
--- a/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C
+++ b/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C
@@ -79,10 +79,10 @@ Foam::viscosityModels::HerschelBulkley::HerschelBulkley
:
viscosityModel(name, viscosityProperties, U, phi),
HerschelBulkleyCoeffs_(viscosityProperties.subDict(typeName + "Coeffs")),
- k_("k", dimViscosity, HerschelBulkleyCoeffs_.lookup("k")),
- n_("n", dimless, HerschelBulkleyCoeffs_.lookup("n")),
- tau0_("tau0", dimViscosity/dimTime, HerschelBulkleyCoeffs_.lookup("tau0")),
- nu0_("nu0", dimViscosity, HerschelBulkleyCoeffs_.lookup("nu0")),
+ k_("k", dimViscosity, HerschelBulkleyCoeffs_),
+ n_("n", dimless, HerschelBulkleyCoeffs_),
+ tau0_("tau0", dimViscosity/dimTime, HerschelBulkleyCoeffs_),
+ nu0_("nu0", dimViscosity, HerschelBulkleyCoeffs_),
nu_
(
IOobject
diff --git a/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.C b/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.C
index 622f1a01a1971e0e994cd6f9e90e6e270c17765c..2e6fd44423b858a2d624864673d6afbadfbb00d5 100644
--- a/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.C
+++ b/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.C
@@ -50,7 +50,7 @@ Foam::viscosityModels::Newtonian::Newtonian
)
:
viscosityModel(name, viscosityProperties, U, phi),
- nu0_("nu", dimViscosity, viscosityProperties_.lookup("nu")),
+ nu0_("nu", dimViscosity, viscosityProperties_),
nu_
(
IOobject
diff --git a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C
index afd5b000a9c87eb6b10ac05d9f7c626846840449..d3258f3a58026350853f9ae962a658c071a44db1 100644
--- a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C
+++ b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C
@@ -82,10 +82,10 @@ Foam::viscosityModels::powerLaw::powerLaw
:
viscosityModel(name, viscosityProperties, U, phi),
powerLawCoeffs_(viscosityProperties.subDict(typeName + "Coeffs")),
- k_("k", dimViscosity, powerLawCoeffs_.lookup("k")),
- n_("n", dimless, powerLawCoeffs_.lookup("n")),
- nuMin_("nuMin", dimViscosity, powerLawCoeffs_.lookup("nuMin")),
- nuMax_("nuMax", dimViscosity, powerLawCoeffs_.lookup("nuMax")),
+ k_("k", dimViscosity, powerLawCoeffs_),
+ n_("n", dimless, powerLawCoeffs_),
+ nuMin_("nuMin", dimViscosity, powerLawCoeffs_),
+ nuMax_("nuMax", dimViscosity, powerLawCoeffs_),
nu_
(
IOobject
diff --git a/src/transportModels/interfaceProperties/interfaceProperties.C b/src/transportModels/interfaceProperties/interfaceProperties.C
index 81718a32d7a67f60ebf4e8a71d58a305ae1be6a6..ff4a6bd0648b86ca98f9e1864b1ed14931db84a5 100644
--- a/src/transportModels/interfaceProperties/interfaceProperties.C
+++ b/src/transportModels/interfaceProperties/interfaceProperties.C
@@ -167,7 +167,7 @@ Foam::interfaceProperties::interfaceProperties
alpha1.mesh().solverDict(alpha1.name()).lookup("cAlpha")
)
),
- sigma_("sigma", dimensionSet(1, 0, -2, 0, 0), dict.lookup("sigma")),
+ sigma_("sigma", dimensionSet(1, 0, -2, 0, 0), dict),
deltaN_
(
diff --git a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/externalSolver b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/externalSolver
index 406d2199d55cbc2ef150a1e20291a74249346f18..03c25c644abcccc7d05074160e42835086e3d767 100755
--- a/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/externalSolver
+++ b/tutorials/heatTransfer/buoyantSimpleFoam/externalCoupledCavity/externalSolver
@@ -6,7 +6,7 @@
# Functionality is hard-coded for this particular test case
# - patch temperatures increased by 1K on each step
#
-cd ${0%/*} || exit 1 # Run from this directory
+cd ${0%/*} || exit 1 # run from this directory
echo "Executing dummy external solver"
@@ -51,7 +51,7 @@ init
totalWait=0
step=0
-while [1 ]; do
+while [ 1 ]; do
if [ -f $lockFile ]; then
log "found lock file ${lockFile} - waiting"
totalWait=$(expr $totalWait + $waitSec)