diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
index c6a2d14de06cbc71a8417a94093b9f386f045b56..2a13f7d76792b85bb146a42daa99c88ccbfb0031 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/incompressibleTwoPhaseMixture.C
@@ -129,14 +129,11 @@ Foam::incompressibleTwoPhaseMixture::mu() const
min(max(alpha1_, scalar(0)), scalar(1))
);
- return tmp<volScalarField>
+ return tmp<volScalarField>::New
(
- new volScalarField
- (
- "mu",
- limitedAlpha1*rho1_*nuModel1_->nu()
- + (scalar(1) - limitedAlpha1)*rho2_*nuModel2_->nu()
- )
+ "mu",
+ limitedAlpha1*rho1_*nuModel1_->nu()
+ + (scalar(1) - limitedAlpha1)*rho2_*nuModel2_->nu()
);
}
@@ -157,14 +154,11 @@ Foam::incompressibleTwoPhaseMixture::muf() const
min(max(fvc::interpolate(alpha1_), scalar(0)), scalar(1))
);
- return tmp<surfaceScalarField>
+ return tmp<surfaceScalarField>::New
(
- new surfaceScalarField
- (
- "muf",
- alpha1f*rho1_*fvc::interpolate(nuModel1_->nu())
- + (scalar(1) - alpha1f)*rho2_*fvc::interpolate(nuModel2_->nu())
- )
+ "muf",
+ alpha1f*rho1_*fvc::interpolate(nuModel1_->nu())
+ + (scalar(1) - alpha1f)*rho2_*fvc::interpolate(nuModel2_->nu())
);
}
@@ -177,16 +171,13 @@ Foam::incompressibleTwoPhaseMixture::nuf() const
min(max(fvc::interpolate(alpha1_), scalar(0)), scalar(1))
);
- return tmp<surfaceScalarField>
+ return tmp<surfaceScalarField>::New
(
- new surfaceScalarField
+ "nuf",
(
- "nuf",
- (
- alpha1f*rho1_*fvc::interpolate(nuModel1_->nu())
- + (scalar(1) - alpha1f)*rho2_*fvc::interpolate(nuModel2_->nu())
- )/(alpha1f*rho1_ + (scalar(1) - alpha1f)*rho2_)
- )
+ alpha1f*rho1_*fvc::interpolate(nuModel1_->nu())
+ + (scalar(1) - alpha1f)*rho2_*fvc::interpolate(nuModel2_->nu())
+ )/(alpha1f*rho1_ + (scalar(1) - alpha1f)*rho2_)
);
}
@@ -207,20 +198,14 @@ bool Foam::incompressibleTwoPhaseMixture::read()
)
)
{
- nuModel1_->viscosityProperties().lookup("rho") >> rho1_;
- nuModel2_->viscosityProperties().lookup("rho") >> rho2_;
+ nuModel1_->viscosityProperties().readEntry("rho", rho1_);
+ nuModel2_->viscosityProperties().readEntry("rho", rho2_);
return true;
}
- else
- {
- return false;
- }
- }
- else
- {
- return false;
}
+
+ return false;
}
diff --git a/src/transportModels/incompressible/singlePhaseTransportModel/singlePhaseTransportModel.C b/src/transportModels/incompressible/singlePhaseTransportModel/singlePhaseTransportModel.C
index be956510d9ca1cce3e95a6f172a1fa268972869a..880b670b557f968fc3c4f937e08bd54c246d1421 100644
--- a/src/transportModels/incompressible/singlePhaseTransportModel/singlePhaseTransportModel.C
+++ b/src/transportModels/incompressible/singlePhaseTransportModel/singlePhaseTransportModel.C
@@ -92,10 +92,8 @@ bool Foam::singlePhaseTransportModel::read()
{
return viscosityModelPtr_->read(*this);
}
- else
- {
- return false;
- }
+
+ return false;
}
diff --git a/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.C b/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.C
index 2e5014f7497b7f8196c532fccb9cb76d8da5b1da..48f1373385c2f212f27fd87cea754ac9ec077748 100644
--- a/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.C
+++ b/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.C
@@ -83,8 +83,8 @@ bool Foam::viscosityModels::Arrhenius<ViscousModel>::read
ArrheniusCoeffs_ =
viscosityProperties.optionalSubDict(typeName + "Coeffs");
- ArrheniusCoeffs_.lookup("alpha") >> alpha_;
- ArrheniusCoeffs_.lookup("Talpha") >> Talpha_;
+ ArrheniusCoeffs_.readEntry("alpha", alpha_);
+ ArrheniusCoeffs_.readEntry("Talpha", Talpha_);
return true;
}
diff --git a/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.C b/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.C
index 11c992916ae9a97a5f1def7d4fa4b37877258893..be2e2f47317585f18bd13ac8a2d9a12671572785 100644
--- a/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.C
+++ b/src/transportModels/incompressible/viscosityModels/BirdCarreau/BirdCarreau.C
@@ -110,10 +110,10 @@ bool Foam::viscosityModels::BirdCarreau::read
BirdCarreauCoeffs_ =
viscosityProperties.optionalSubDict(typeName + "Coeffs");
- BirdCarreauCoeffs_.lookup("nu0") >> nu0_;
- BirdCarreauCoeffs_.lookup("nuInf") >> nuInf_;
- BirdCarreauCoeffs_.lookup("k") >> k_;
- BirdCarreauCoeffs_.lookup("n") >> n_;
+ BirdCarreauCoeffs_.readEntry("nu0", nu0_);
+ BirdCarreauCoeffs_.readEntry("nuInf", nuInf_);
+ BirdCarreauCoeffs_.readEntry("k", k_);
+ BirdCarreauCoeffs_.readEntry("n", n_);
a_ = BirdCarreauCoeffs_.lookupOrDefault
(
"a",
diff --git a/src/transportModels/incompressible/viscosityModels/Casson/Casson.C b/src/transportModels/incompressible/viscosityModels/Casson/Casson.C
index ff75e828d1db2f926826bb6989918a35219a0bf4..fedca4b7602c4ad1064eafd7fd4d1aa5e3374655 100644
--- a/src/transportModels/incompressible/viscosityModels/Casson/Casson.C
+++ b/src/transportModels/incompressible/viscosityModels/Casson/Casson.C
@@ -114,10 +114,10 @@ bool Foam::viscosityModels::Casson::read
CassonCoeffs_ = viscosityProperties.optionalSubDict(typeName + "Coeffs");
- CassonCoeffs_.lookup("m") >> m_;
- CassonCoeffs_.lookup("tau0") >> tau0_;
- CassonCoeffs_.lookup("nuMin_") >> nuMin_;
- CassonCoeffs_.lookup("nuMax_") >> nuMax_;
+ CassonCoeffs_.readEntry("m", m_);
+ CassonCoeffs_.readEntry("tau0", tau0_);
+ CassonCoeffs_.readEntry("nuMin_", nuMin_);
+ CassonCoeffs_.readEntry("nuMax_", nuMax_);
return true;
}
diff --git a/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.C b/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.C
index 3f7dbb3ff959990483f001105503851e5fe4ce43..10f7b601549b5ec624dd70ae8457e5b2a28956ae 100644
--- a/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.C
+++ b/src/transportModels/incompressible/viscosityModels/CrossPowerLaw/CrossPowerLaw.C
@@ -100,10 +100,10 @@ bool Foam::viscosityModels::CrossPowerLaw::read
CrossPowerLawCoeffs_ =
viscosityProperties.optionalSubDict(typeName + "Coeffs");
- CrossPowerLawCoeffs_.lookup("nu0") >> nu0_;
- CrossPowerLawCoeffs_.lookup("nuInf") >> nuInf_;
- CrossPowerLawCoeffs_.lookup("m") >> m_;
- CrossPowerLawCoeffs_.lookup("n") >> n_;
+ CrossPowerLawCoeffs_.readEntry("nu0", nu0_);
+ CrossPowerLawCoeffs_.readEntry("nuInf", nuInf_);
+ CrossPowerLawCoeffs_.readEntry("m", m_);
+ CrossPowerLawCoeffs_.readEntry("n", n_);
return true;
}
diff --git a/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C b/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C
index e6af2ad62bdb1fc84794c8b07e47e8cf57dfe48d..ac4db8d66e5503b7747717ee10663217a5738edf 100644
--- a/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C
+++ b/src/transportModels/incompressible/viscosityModels/HerschelBulkley/HerschelBulkley.C
@@ -113,10 +113,10 @@ bool Foam::viscosityModels::HerschelBulkley::read
HerschelBulkleyCoeffs_ =
viscosityProperties.optionalSubDict(typeName + "Coeffs");
- HerschelBulkleyCoeffs_.lookup("k") >> k_;
- HerschelBulkleyCoeffs_.lookup("n") >> n_;
- HerschelBulkleyCoeffs_.lookup("tau0") >> tau0_;
- HerschelBulkleyCoeffs_.lookup("nu0") >> nu0_;
+ HerschelBulkleyCoeffs_.readEntry("k", k_);
+ HerschelBulkleyCoeffs_.readEntry("n", n_);
+ HerschelBulkleyCoeffs_.readEntry("tau0", tau0_);
+ HerschelBulkleyCoeffs_.readEntry("nu0", nu0_);
return true;
}
diff --git a/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.C b/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.C
index b0121ba1c99b35789af6f04effff744cf0db748f..2bfbea83be4439dc9c688af2e08221919349e5f9 100644
--- a/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.C
+++ b/src/transportModels/incompressible/viscosityModels/Newtonian/Newtonian.C
@@ -76,7 +76,7 @@ bool Foam::viscosityModels::Newtonian::read
{
viscosityModel::read(viscosityProperties);
- viscosityProperties_.lookup("nu") >> nu0_;
+ viscosityProperties_.readEntry("nu", nu0_);
nu_ = nu0_;
return true;
diff --git a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C
index 5a165c83ec501e10cb2e8e0e250f7d0f4909119f..c1f7c9144fb00bfdb3795444fd054c8c79a0a44f 100644
--- a/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C
+++ b/src/transportModels/incompressible/viscosityModels/powerLaw/powerLaw.C
@@ -112,10 +112,10 @@ bool Foam::viscosityModels::powerLaw::read
powerLawCoeffs_ = viscosityProperties.optionalSubDict(typeName + "Coeffs");
- powerLawCoeffs_.lookup("k") >> k_;
- powerLawCoeffs_.lookup("n") >> n_;
- powerLawCoeffs_.lookup("nuMin") >> nuMin_;
- powerLawCoeffs_.lookup("nuMax") >> nuMax_;
+ powerLawCoeffs_.readEntry("k", k_);
+ powerLawCoeffs_.readEntry("n", n_);
+ powerLawCoeffs_.readEntry("nuMin", nuMin_);
+ powerLawCoeffs_.readEntry("nuMax", nuMax_);
return true;
}
diff --git a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C
index 482036bbbbabf68ba4bae2be6cb83e249adf2753..5d57c28bc1999c6fcf951f33e713f4cccf0a4526 100644
--- a/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C
+++ b/src/transportModels/incompressible/viscosityModels/viscosityModel/viscosityModelNew.C
@@ -37,7 +37,7 @@ Foam::autoPtr<Foam::viscosityModel> Foam::viscosityModel::New
const surfaceScalarField& phi
)
{
- const word modelType(viscosityProperties.lookup("transportModel"));
+ const word modelType(viscosityProperties.get<word>("transportModel"));
Info<< "Selecting incompressible transport model " << modelType << endl;
diff --git a/src/transportModels/interfaceProperties/interfaceProperties.C b/src/transportModels/interfaceProperties/interfaceProperties.C
index aec4481f9b24e19bd1fe560cb0c60b6bca235827..4aab32d13690c7499190597fed2a674b8df74f8d 100644
--- a/src/transportModels/interfaceProperties/interfaceProperties.C
+++ b/src/transportModels/interfaceProperties/interfaceProperties.C
@@ -157,10 +157,7 @@ Foam::interfaceProperties::interfaceProperties
transportPropertiesDict_(dict),
cAlpha_
(
- readScalar
- (
- alpha1.mesh().solverDict(alpha1.name()).lookup("cAlpha")
- )
+ alpha1.mesh().solverDict(alpha1.name()).get<scalar>("cAlpha")
),
sigmaPtr_(surfaceTensionModel::New(dict, alpha1.mesh())),
@@ -233,7 +230,7 @@ void Foam::interfaceProperties::correct()
bool Foam::interfaceProperties::read()
{
- alpha1_.mesh().solverDict(alpha1_.name()).lookup("cAlpha") >> cAlpha_;
+ alpha1_.mesh().solverDict(alpha1_.name()).readEntry("cAlpha", cAlpha_);
sigmaPtr_->readDict(transportPropertiesDict_);
return true;
diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C b/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C
index 58593465835b45c898a918d26ea7f2effdb1f94e..82470fdba76b90c1a894fd74bd1f6b343a5bc030 100644
--- a/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C
+++ b/src/transportModels/interfaceProperties/surfaceTensionModels/constant/constantSurfaceTension.C
@@ -63,22 +63,19 @@ Foam::surfaceTensionModels::constant::~constant()
Foam::tmp<Foam::volScalarField>
Foam::surfaceTensionModels::constant::sigma() const
{
- return tmp<volScalarField>
+ return tmp<volScalarField>::New
(
- new volScalarField
+ IOobject
(
- IOobject
- (
- "sigma",
- mesh_.time().timeName(),
- mesh_,
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
+ "sigma",
+ mesh_.time().timeName(),
mesh_,
- sigma_
- )
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false
+ ),
+ mesh_,
+ sigma_
);
}
@@ -88,11 +85,11 @@ bool Foam::surfaceTensionModels::constant::readDict(const dictionary& dict)
// Handle sub-dictionary format as a special case
if (dict.isDict("sigma"))
{
- dict.subDict("sigma").lookup("sigma") >> sigma_;
+ dict.subDict("sigma").readEntry("sigma", sigma_);
}
else
{
- dict.lookup("sigma") >> sigma_;
+ dict.readEntry("sigma", sigma_);
}
return true;
diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C b/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C
index e48c64445e2b49fc5ac8620a29dedddf65c8d41c..d391f076a4ffabff169ef64fd26bd7ab7df90d9f 100644
--- a/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C
+++ b/src/transportModels/interfaceProperties/surfaceTensionModels/surfaceTensionModel/surfaceTensionModelNew.C
@@ -38,7 +38,7 @@ Foam::autoPtr<Foam::surfaceTensionModel> Foam::surfaceTensionModel::New
{
const dictionary& sigmaDict = surfaceTensionModel::sigmaDict(dict);
- const word modelType(sigmaDict.lookup("type"));
+ const word modelType(sigmaDict.get<word>("type"));
Info<< "Selecting surfaceTensionModel " << modelType << endl;
diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
index 0cf8f63b8bf551840f9973448e7486b1c3846501..1d6b3075a84ca4106d420c6dcacd1ca9e82aac18 100644
--- a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
+++ b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
@@ -69,24 +69,21 @@ Foam::surfaceTensionModels::temperatureDependent::~temperatureDependent()
Foam::tmp<Foam::volScalarField>
Foam::surfaceTensionModels::temperatureDependent::sigma() const
{
- tmp<volScalarField> tsigma
+ auto tsigma = tmp<volScalarField>::New
(
- new volScalarField
+ IOobject
(
- IOobject
- (
- "sigma",
- mesh_.time().timeName(),
- mesh_,
- IOobject::NO_READ,
- IOobject::NO_WRITE,
- false
- ),
+ "sigma",
+ mesh_.time().timeName(),
mesh_,
- dimSigma
- )
+ IOobject::NO_READ,
+ IOobject::NO_WRITE,
+ false
+ ),
+ mesh_,
+ dimSigma
);
- volScalarField& sigma = tsigma.ref();
+ auto& sigma = tsigma.ref();
const volScalarField& T = mesh_.lookupObject<volScalarField>(TName_);
diff --git a/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C b/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C
index 253b1092e754593a82f42924ff895ac67e89d0d2..8ad8459b945e52fcc91a0a3b20e7e547c64d4fa4 100644
--- a/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C
+++ b/src/transportModels/twoPhaseMixture/twoPhaseMixture/twoPhaseMixture.C
@@ -34,8 +34,8 @@ Foam::twoPhaseMixture::twoPhaseMixture
const dictionary& dict
)
:
- phase1Name_(wordList(dict.lookup("phases"))[0]),
- phase2Name_(wordList(dict.lookup("phases"))[1]),
+ phase1Name_(dict.get<wordList>("phases")[0]),
+ phase2Name_(dict.get<wordList>("phases")[1]),
alpha1_
(
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
index c030375845c30a06f92a8d88e50382e9a037a680..c3c6651e9f31e8b013f9d513c7969a142674c1f2 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
@@ -51,7 +51,7 @@ constantAlphaContactAngleFvPatchScalarField
)
:
alphaContactAngleFvPatchScalarField(p, iF, dict),
- theta0_(readScalar(dict.lookup("theta0")))
+ theta0_(dict.get<scalar>("theta0"))
{
evaluate();
}
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
index 13301320b3fc8d9adc1615ec6a6f919626f1558d..76aa42a6e4869b6d08da55954ba209e4a22d0289 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
@@ -71,10 +71,10 @@ dynamicAlphaContactAngleFvPatchScalarField
)
:
alphaContactAngleFvPatchScalarField(p, iF, dict),
- theta0_(readScalar(dict.lookup("theta0"))),
- uTheta_(readScalar(dict.lookup("uTheta"))),
- thetaA_(readScalar(dict.lookup("thetaA"))),
- thetaR_(readScalar(dict.lookup("thetaR")))
+ theta0_(dict.get<scalar>("theta0")),
+ uTheta_(dict.get<scalar>("uTheta")),
+ thetaA_(dict.get<scalar>("thetaA")),
+ thetaR_(dict.get<scalar>("thetaR"))
{
evaluate();
}
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
index b02dc17c4bc327198286c87d40db55e19d8fd19d..14b373425cfdfe2a90aea1a8a1f04884b63f0d9d 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
@@ -72,10 +72,10 @@ timeVaryingAlphaContactAngleFvPatchScalarField
)
:
alphaContactAngleFvPatchScalarField(p, iF, dict),
- t0_(readScalar(dict.lookup("t0"))),
- thetaT0_(readScalar(dict.lookup("thetaT0"))),
- te_(readScalar(dict.lookup("te"))),
- thetaTe_(readScalar(dict.lookup("thetaTe")))
+ t0_(dict.get<scalar>("t0")),
+ thetaT0_(dict.get<scalar>("thetaT0")),
+ te_(dict.get<scalar>("te")),
+ thetaTe_(dict.get<scalar>("thetaTe"))
{
evaluate();
}