From 365f9b000644920524ea2959f868e3ed2ed8a95a Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Tue, 21 Jul 2015 12:57:07 +0100
Subject: [PATCH] dimensioned<Type>: Added constructor from name, dimensions
and dictionary to simplify construction of dimensionedScalar properties and
avoid the duplication of the name string in the constructor call.
---
.../DNS/dnsFoam/readTransportProperties.H | 4 +-
.../PDRModels/dragModels/basic/basic.C | 4 +-
.../readThermodynamicProperties.H | 12 +-
.../sonicLiquidFoam/readTransportProperties.H | 32 ++--
.../electromagnetics/mhdFoam/createFields.H | 16 +-
.../readTransportProperties.H | 8 +-
.../boundaryFoam/createFields.H | 2 +-
.../incompressible/icoFoam/createFields.H | 2 +
.../createFields.H | 2 +-
.../readThermodynamicProperties.H | 10 +-
.../compressibleInterFoam/createFields.H | 2 +-
.../createFields.H | 2 +-
...incompressibleTwoPhaseInteractingMixture.C | 6 +-
.../BinghamPlastic/BinghamPlastic.C | 6 +-
.../relativeVelocityModels/general/general.C | 8 +-
.../relativeVelocityModels/simple/simple.C | 8 +-
.../incompressibleThreePhaseMixture.C | 6 +-
.../constantDiameter/constantDiameter.C | 4 +-
.../isothermalDiameter/isothermalDiameter.C | 6 +-
.../multiphaseSystem/phaseModel/phaseModel.C | 10 +-
.../multiphaseMixture/phase/phase.C | 2 +-
.../reactingTwoPhaseEulerFoam/createFields.H | 2 +-
.../InterfaceCompositionModel.C | 2 +-
.../massTransferModels/Frossling/Frossling.C | 2 +-
.../sphericalMassTransfer.C | 2 +-
.../saturationModels/Antoine/Antoine.C | 6 +-
.../AntoineExtended/AntoineExtended.C | 6 +-
.../constantSaturationConditions.C | 4 +-
.../constantSurfaceTensionCoefficient.C | 2 +-
.../constantAspectRatio/constantAspectRatio.C | 2 +-
.../GidaspowSchillerNaumann.C | 2 +-
.../SchillerNaumann/SchillerNaumann.C | 2 +-
.../TomiyamaAnalytic/TomiyamaAnalytic.C | 6 +-
.../TomiyamaCorrelated/TomiyamaCorrelated.C | 2 +-
.../dragModels/WenYu/WenYu.C | 2 +-
.../dragModels/segregated/segregated.C | 4 +-
.../LegendreMagnaudet/LegendreMagnaudet.C | 2 +-
.../constantLiftCoefficient.C | 2 +-
.../TomiyamaSwarm/TomiyamaSwarm.C | 2 +-
.../turbulentDispersionModels/Burns/Burns.C | 2 +-
.../turbulentDispersionModels/Gosman/Gosman.C | 2 +-
.../LopezDeBertodano/LopezDeBertodano.C | 2 +-
.../constantTurbulentDispersionCoefficient.C | 2 +-
.../constantVirtualMassCoefficient.C | 2 +-
.../wallLubricationModels/Antal/Antal.C | 4 +-
.../wallLubricationModels/Frank/Frank.C | 4 +-
.../TomiyamaWallLubrication.C | 2 +-
.../HrenyaSinclairConductivity.C | 2 +-
.../JohnsonJacksonFrictionalStress.C | 10 +-
.../Schaeffer/SchaefferFrictionalStress.C | 2 +-
.../kineticTheoryModel/kineticTheoryModel.C | 8 +-
.../HrenyaSinclair/HrenyaSinclairViscosity.C | 2 +-
.../phaseSystems/diameterModels/IATE/IATE.C | 6 +-
.../randomCoalescence/randomCoalescence.C | 6 +-
.../turbulentBreakUp/turbulentBreakUp.C | 4 +-
.../wakeEntrainmentCoalescence.C | 2 +-
.../constantDiameter/constantDiameter.C | 2 +-
.../isothermalDiameter/isothermalDiameter.C | 4 +-
.../MultiComponentPhaseModel.C | 4 +-
.../twoLiquidMixingFoam/createFields.H | 4 +-
.../twoPhaseEulerFoam/createFields.H | 2 +-
.../constantAspectRatio/constantAspectRatio.C | 2 +-
.../GidaspowSchillerNaumann.C | 2 +-
.../SchillerNaumann/SchillerNaumann.C | 4 +-
.../TomiyamaAnalytic/TomiyamaAnalytic.C | 8 +-
.../TomiyamaCorrelated/TomiyamaCorrelated.C | 4 +-
.../dragModels/WenYu/WenYu.C | 2 +-
.../dragModels/segregated/segregated.C | 4 +-
.../LegendreMagnaudet/LegendreMagnaudet.C | 2 +-
.../constantLiftCoefficient.C | 4 +-
.../TomiyamaSwarm/TomiyamaSwarm.C | 2 +-
.../turbulentDispersionModels/Burns/Burns.C | 2 +-
.../turbulentDispersionModels/Gosman/Gosman.C | 2 +-
.../LopezDeBertodano/LopezDeBertodano.C | 2 +-
.../constantTurbulentDispersionCoefficient.C | 2 +-
.../constantVirtualMassCoefficient.C | 2 +-
.../wallLubricationModels/Antal/Antal.C | 4 +-
.../wallLubricationModels/Frank/Frank.C | 4 +-
.../TomiyamaWallLubrication.C | 2 +-
.../HrenyaSinclairConductivity.C | 4 +-
.../JohnsonJacksonFrictionalStress.C | 10 +-
.../Schaeffer/SchaefferFrictionalStress.C | 4 +-
.../kineticTheoryModel/kineticTheoryModel.C | 8 +-
.../HrenyaSinclair/HrenyaSinclairViscosity.C | 4 +-
.../twoPhaseSystem/diameterModels/IATE/IATE.C | 6 +-
.../randomCoalescence/randomCoalescence.C | 6 +-
.../turbulentBreakUp/turbulentBreakUp.C | 6 +-
.../wakeEntrainmentCoalescence.C | 4 +-
.../constantDiameter/constantDiameter.C | 2 +-
.../isothermalDiameter/isothermalDiameter.C | 6 +-
.../dimensionedType/dimensionedType.C | 143 ++++++++++--------
.../dimensionedType/dimensionedType.H | 17 ++-
.../ArrheniusViscosity/ArrheniusViscosity.C | 6 +-
.../constantViscosity/constantViscosity.C | 2 +-
.../thixotropicViscosity.C | 12 +-
.../incompressibleTwoPhaseMixture.C | 4 +-
.../viscosityModels/BirdCarreau/BirdCarreau.C | 8 +-
.../CrossPowerLaw/CrossPowerLaw.C | 8 +-
.../HerschelBulkley/HerschelBulkley.C | 8 +-
.../viscosityModels/Newtonian/Newtonian.C | 2 +-
.../viscosityModels/powerLaw/powerLaw.C | 8 +-
.../interfaceProperties/interfaceProperties.C | 2 +-
.../externalCoupledCavity/externalSolver | 4 +-
103 files changed, 339 insertions(+), 281 deletions(-)
diff --git a/applications/solvers/DNS/dnsFoam/readTransportProperties.H b/applications/solvers/DNS/dnsFoam/readTransportProperties.H
index 0d809085427..458ba2481fc 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 42a208d672f..9fd96b20330 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 82f3655f465..82ebe7ae30f 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 c30f65b4458..379e2119827 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 528bcd1b540..1032504738d 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 f3809377b76..d78368dec85 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 0554d9268aa..15faa59f82d 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 0d01e2a5c28..bdaef3a7bf6 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 56b934d58ae..c8b4dbc4f5f 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 e4e0f7b8a91..d97f7f24218 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 181160c5107..48628768280 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 4110b86e7f6..8ac81a51958 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 fded594b70e..4ee639f30b5 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 01826f0af47..2711e79d9d8 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 b3d46e1ec24..f8a133b63e3 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 5051dcb710f..ae23daeab28 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 352c85694ed..f6c00e12a48 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 315f1608939..88b867f23be 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 4b9e5715039..3375f228b97 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 3d6f3dde005..9f6ed4ac731 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 85954554f70..f3adfa9b612 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 c1f7a130a74..30b3b0e715e 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 1bfcd4de0c0..5fd646c5cee 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 6398caa0e3d..df9bddabeb9 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 e9ba5ccb2d0..71654ddf10e 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 b43ce2311b0..0c273ee8661 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 52766f2ea2d..f05ee21b83a 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 79256f5b7f6..241cf8d4b4e 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 99044f4cef5..d0632c55dce 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 e8964638223..386b06d6aa5 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 c637c3bb354..9503264de92 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 ee1471ac55e..d0818e2c15c 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 343cd9a897f..77e84e7a4ea 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 af34864f0c2..0ad80673502 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 bf1e1da4a77..21ed8c53a8a 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 b50a711c77f..4b1fc88ddc5 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 244853634bd..22ee620b41e 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 efba0d332a5..b85199d86a4 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 38c0cf6db69..8252f4d754f 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 c51b716340a..093013cca3f 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 a40dbf07703..a6f8a16fbd3 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 52adccb9b44..848911fe2dd 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 67566b9f885..fb8126c5d2a 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 2fa5f493050..e257ebaf1bf 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 fa9b2749f04..0b2c7b50129 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 f1b11a32cc0..0b9065a1a9d 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 c3db3597af6..9209c5108cd 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 55541ac8fab..5abe9f3561d 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 9f2be1a235f..2180c0bd2e2 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 7d0a4decd06..55e7b9f2cd2 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 8de1fdc9e11..11d09d1118f 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 bd95013d0ab..415bb3145a5 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 4d51d8c43d4..aaee131eeb0 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 8fde0b70202..86072b8dd0a 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 334369f40f1..1dde056beb4 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 a015be5f76a..20634b3204c 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 4cd500fa36d..5d8ec7464d4 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 9fc5a48874f..921dbdba5b5 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 3d34d8cfe0f..d6e05a51397 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 c52c897b3fe..c38f7e2959b 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 f76f904fb47..570d7fd6995 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 e8964638223..386b06d6aa5 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 c637c3bb354..9503264de92 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 2d4a6540304..d0818e2c15c 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 01d122debf3..77e84e7a4ea 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 50fdc667f08..0ad80673502 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 bf1e1da4a77..21ed8c53a8a 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 b50a711c77f..4b1fc88ddc5 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 244853634bd..22ee620b41e 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 f070c55424f..b85199d86a4 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 38c0cf6db69..8252f4d754f 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 c51b716340a..093013cca3f 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 a40dbf07703..a6f8a16fbd3 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 52adccb9b44..848911fe2dd 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 67566b9f885..fb8126c5d2a 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 2fa5f493050..e257ebaf1bf 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 fa9b2749f04..0b2c7b50129 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 f1b11a32cc0..0b9065a1a9d 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 c3db3597af6..9209c5108cd 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 cc965c84de3..5abe9f3561d 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 9f2be1a235f..2180c0bd2e2 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 705b66d6bf6..55e7b9f2cd2 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 ed109b96def..30254f3891b 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 a8b7d1c58d9..415bb3145a5 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 f6e1a535cb4..6999c184cd8 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 a39e9140dbe..480937663be 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 39bd0daf89b..8c0be0f2328 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 66c324c761f..20634b3204c 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 628f8259b87..1f6cf5c4418 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 aab9b469c7c..2754ce8d731 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 4820505ba6b..b9ed09ae800 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 47800b1960e..bb7f632918f 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 4d6daeafcbd..22598e0140c 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 7e9f3e7310d..d1f47f17c53 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 d29d9d3ff41..7152139181a 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 bf0a4b5f6d5..3d59eda215d 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 3deb2a66c99..4ea9529eaef 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 1201dbb4aaa..7359c621d0d 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 eb41da76fdd..f9ed2bb86e6 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 622f1a01a19..2e6fd44423b 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 afd5b000a9c..d3258f3a580 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 81718a32d7a..ff4a6bd0648 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 406d2199d55..03c25c644ab 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)
--
GitLab