From 50baac3c45ddd28c6acfb3baa291c8b1ff1997cc Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Sat, 3 Nov 2018 20:24:34 +0100
Subject: [PATCH] ENH: construct string types from Istream now explicit (#1033)
- this helps for trapping unguarded dictionary lookups.
---
.../liquidPropertiesSurfaceTension.C | 8 +---
.../liquidPropertiesSurfaceTension.H | 2 +-
.../phaseModel/phaseModel.H | 2 +-
.../MultiComponentPhaseModel.C | 3 +-
.../phaseModel/phaseModel/phaseModel.C | 2 +-
.../dataConversion/smapToFoam/smapToFoam.C | 43 ++++++-------------
src/OpenFOAM/db/dictionary/dictionary.H | 1 +
.../fixedNormalSlipPointPatchField.C | 2 +-
.../LduMatrix/Solvers/PBiCCCG/PBiCCCG.C | 2 +-
.../LduMatrix/Solvers/PBiCICG/PBiCICG.C | 2 +-
.../matrices/LduMatrix/Solvers/PCICG/PCICG.C | 2 +-
.../GAMGAgglomeration/GAMGAgglomeration.C | 2 +-
src/OpenFOAM/primitives/Pair/Pair.H | 2 +-
src/OpenFOAM/primitives/Tuple2/Tuple2.H | 4 +-
src/OpenFOAM/primitives/bools/Switch/Switch.H | 2 +-
.../primitives/strings/fileName/fileName.H | 3 +-
.../primitives/strings/keyType/keyType.H | 2 +-
.../primitives/strings/parsing/parsing.H | 2 -
.../primitives/strings/string/string.H | 2 +-
src/OpenFOAM/primitives/strings/word/word.H | 2 +-
.../primitives/strings/wordRe/wordRe.H | 2 +-
...tletMachNumberPressureFvPatchScalarField.C | 2 +-
...ppedUniformInletHeatAdditionFvPatchField.C | 2 +-
...tureCoupledBaffleMixedFvPatchScalarField.C | 2 +-
.../turbulenceModels/LES/LESModel/LESModel.C | 2 +-
.../turbulenceModels/LES/LESModel/LESModel.H | 8 +---
.../turbulenceModels/RAS/RASModel/RASModel.C | 2 +-
.../turbulenceModels/RAS/RASModel/RASModel.H | 8 +---
.../TurbulenceModel/TurbulenceModel.C | 2 +-
.../TurbulenceModel/TurbulenceModel.H | 7 +--
...UTabulatedWallFunctionFvPatchScalarField.C | 2 +-
.../laminar/laminarModel/laminarModel.C | 2 +-
.../laminar/laminarModel/laminarModel.H | 8 +---
.../velocityDisplacementMotionSolver.C | 2 +-
.../codedFunctionObject/codedFunctionObject.C | 22 ++++++----
.../codedFunctionObject/codedFunctionObject.H | 2 -
...lacementComponentLaplacianFvMotionSolver.C | 16 +++----
.../displacementLaplacianFvMotionSolver.C | 10 ++++-
...dBodyDisplacementLaplacianFvMotionSolver.C | 10 ++++-
...surfaceDisplacementPointPatchVectorField.C | 4 +-
...surfaceDisplacementPointPatchVectorField.H | 2 +-
...aceSlipDisplacementPointPatchVectorField.C | 2 +-
.../sources/general/codedSource/CodedSource.C | 32 ++++++--------
.../general/codedSource/CodedSourceIO.C | 9 ++--
.../FieldActivatedInjection.C | 13 +++---
.../PatchFlowRateInjection.C | 2 +-
.../PatchInjection/PatchInjection.C | 2 +-
.../PatchInjection/patchInjectionBase.C | 6 ---
.../PatchInjection/patchInjectionBase.H | 4 +-
.../Drag/ErgunWenYuDrag/ErgunWenYuDragForce.C | 4 +-
.../PlessisMasliyahDragForce.C | 4 +-
.../Drag/WenYuDrag/WenYuDragForce.C | 4 +-
.../PhaseChangeModel/PhaseChangeModel.C | 9 +---
.../PhaseChangeModel/PhaseChangeModel.H | 6 +--
.../ThermoSurfaceFilm/ThermoSurfaceFilm.C | 2 +-
.../displacementMotionSolverMeshMover.C | 2 +-
.../restraints/restraint/rigidBodyRestraint.C | 2 +-
.../restraints/restraint/rigidBodyRestraint.H | 2 +-
.../rigidBodyModel/rigidBodyModel.C | 4 +-
.../basicChemistryModelTemplates.C | 21 +++++----
.../greyMeanAbsorptionEmission.C | 42 +++++++++---------
.../wideBandAbsorptionEmission.C | 42 +++++++++---------
.../singleStepReactingMixture.C | 12 +++---
.../Reactions/solidReaction/solidReaction.C | 2 +-
.../reaction/Reactions/Reaction/Reaction.C | 2 +-
65 files changed, 191 insertions(+), 246 deletions(-)
diff --git a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C
index 7888ec23473..67b142151d2 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.C
@@ -53,13 +53,7 @@ Foam::surfaceTensionModels::liquidProperties::liquidProperties
)
:
surfaceTensionModel(mesh),
- phaseName_(dict.lookup("phase"))
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-Foam::surfaceTensionModels::liquidProperties::~liquidProperties()
+ phaseName_(dict.get<word>("phase"))
{}
diff --git a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.H b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.H
index 7c1e4940acf..511797f7330 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/surfaceTensionModels/liquidProperties/liquidPropertiesSurfaceTension.H
@@ -95,7 +95,7 @@ public:
//- Destructor
- virtual ~liquidProperties();
+ virtual ~liquidProperties() = default;
// Member Functions
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.H
index 53a429f7ca8..e7bfc144b1e 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.H
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/multiphaseMixtureThermo/phaseModel/phaseModel.H
@@ -98,7 +98,7 @@ public:
autoPtr<phaseModel> operator()(Istream& is) const
{
- return autoPtr<phaseModel>::New(is, p_, T_);
+ return autoPtr<phaseModel>::New(word(is), p_, T_);
}
};
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
index c22527c60bf..f07ecf7ba5c 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/MultiComponentPhaseModel/MultiComponentPhaseModel.C
@@ -72,7 +72,7 @@ MultiComponentPhaseModel
species_ = thermoPtr_->composition().species();
- inertIndex_ = species_[thermoPtr_().lookup("inertSpecie")];
+ inertIndex_ = species_[thermoPtr_->getWord("inertSpecie")];
X_.setSize(thermoPtr_->composition().species().size());
@@ -104,7 +104,6 @@ MultiComponentPhaseModel
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
template<class BasePhaseModel, class phaseThermo>
void Foam::MultiComponentPhaseModel<BasePhaseModel, phaseThermo>
::calculateVolumeFractions()
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/phaseModel.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/phaseModel.C
index 359cf3b0aa1..f19e3419dad 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/phaseModel.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseModel/phaseModel/phaseModel.C
@@ -53,7 +53,7 @@ Foam::phaseModel::phaseModel
IOobject::AUTO_WRITE
),
fluid.mesh(),
- dimensionedScalar("alpha", dimless, 0)
+ dimensionedScalar(dimless, Zero)
),
fluid_(fluid),
name_(phaseName)
diff --git a/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C b/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
index af9ea391875..76af6283ef0 100644
--- a/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
+++ b/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
@@ -122,46 +122,29 @@ int main(int argc, char *argv[])
{
if (nameMap.found(starFieldNames[i]))
{
+ IOobject io
+ (
+ nameMap.get<word>(starFieldNames[i]),
+ runTime.timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ );
+
if (starFieldNames[i] == "SU")
{
- vFields[i] =
- new volVectorField
- (
- IOobject
- (
- nameMap.lookup(starFieldNames[i]),
- runTime.timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
- );
-
+ vFields[i] = new volVectorField(io, mesh);
i += 3;
}
else
{
- sFields[i] =
- new volScalarField
- (
- IOobject
- (
- nameMap.lookup(starFieldNames[i]),
- runTime.timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
- );
-
- i++;
+ sFields[i] = new volScalarField(io, mesh);
+ ++i;
}
}
else
{
- i++;
+ ++i;
}
}
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index b031835b00b..700b32a827c 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -1297,6 +1297,7 @@ public:
defineDictionaryGetter(getBool, bool);
defineDictionaryGetter(getLabel, label);
defineDictionaryGetter(getScalar, scalar);
+ defineDictionaryGetter(getString, string);
defineDictionaryGetter(getWord, word);
defineDictionaryGetter(getFileName, fileName);
diff --git a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C
index c5941fade46..eac103d0692 100644
--- a/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C
+++ b/src/OpenFOAM/fields/pointPatchFields/derived/fixedNormalSlip/fixedNormalSlipPointPatchField.C
@@ -48,7 +48,7 @@ Foam::fixedNormalSlipPointPatchField<Type>::fixedNormalSlipPointPatchField
)
:
slipPointPatchField<Type>(p, iF, dict),
- n_(dict.lookup("n"))
+ n_(dict.get<vector>("n"))
{}
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C
index ad61ed9cc05..a79e230ced9 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCCCG/PBiCCCG.C
@@ -53,7 +53,7 @@ Foam::PBiCCCG<Type, DType, LUType>::solve
Field<Type>& psi
) const
{
- word preconditionerName(this->controlDict_.lookup("preconditioner"));
+ const word preconditionerName(this->controlDict_.getWord("preconditioner"));
// --- Setup class containing solver performance data
SolverPerformance<Type> solverPerf
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C
index ff437a850ab..9f232e65233 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PBiCICG/PBiCICG.C
@@ -50,7 +50,7 @@ template<class Type, class DType, class LUType>
Foam::SolverPerformance<Type>
Foam::PBiCICG<Type, DType, LUType>::solve(Field<Type>& psi) const
{
- word preconditionerName(this->controlDict_.lookup("preconditioner"));
+ const word preconditionerName(this->controlDict_.getWord("preconditioner"));
// --- Setup class containing solver performance data
SolverPerformance<Type> solverPerf
diff --git a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.C b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.C
index 5e97b21b76d..e947e2cbc35 100644
--- a/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.C
+++ b/src/OpenFOAM/matrices/LduMatrix/Solvers/PCICG/PCICG.C
@@ -50,7 +50,7 @@ template<class Type, class DType, class LUType>
typename Foam::SolverPerformance<Type>
Foam::PCICG<Type, DType, LUType>::solve(Field<Type>& psi) const
{
- word preconditionerName(this->controlDict_.lookup("preconditioner"));
+ const word preconditionerName(this->controlDict_.getWord("preconditioner"));
// --- Setup class containing solver performance data
SolverPerformance<Type> solverPerf
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
index b507253a199..c993cf13788 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGAgglomerations/GAMGAgglomeration/GAMGAgglomeration.C
@@ -248,7 +248,7 @@ Foam::GAMGAgglomeration::GAMGAgglomeration
)
? GAMGProcAgglomeration::New
(
- controlDict.lookup("processorAgglomerator"),
+ controlDict.get<word>("processorAgglomerator"),
*this,
controlDict
)
diff --git a/src/OpenFOAM/primitives/Pair/Pair.H b/src/OpenFOAM/primitives/Pair/Pair.H
index 123347fb8fc..07020574b4c 100644
--- a/src/OpenFOAM/primitives/Pair/Pair.H
+++ b/src/OpenFOAM/primitives/Pair/Pair.H
@@ -77,7 +77,7 @@ public:
inline Pair(const FixedList<T, 2>& lst, const bool doSort);
//- Construct from Istream
- inline Pair(Istream& is);
+ inline explicit Pair(Istream& is);
// Member Functions
diff --git a/src/OpenFOAM/primitives/Tuple2/Tuple2.H b/src/OpenFOAM/primitives/Tuple2/Tuple2.H
index 195f74044ce..5f7744cc4f6 100644
--- a/src/OpenFOAM/primitives/Tuple2/Tuple2.H
+++ b/src/OpenFOAM/primitives/Tuple2/Tuple2.H
@@ -44,7 +44,7 @@ See also
namespace Foam
{
-// Forward declaration of friend functions and operators
+// Forward declarations
template<class Type1, class Type2>
class Tuple2;
@@ -93,7 +93,7 @@ public:
{}
//- Construct from Istream
- inline Tuple2(Istream& is)
+ inline explicit Tuple2(Istream& is)
{
is >> *this;
}
diff --git a/src/OpenFOAM/primitives/bools/Switch/Switch.H b/src/OpenFOAM/primitives/bools/Switch/Switch.H
index d755b2dc268..2a164124fc1 100644
--- a/src/OpenFOAM/primitives/bools/Switch/Switch.H
+++ b/src/OpenFOAM/primitives/bools/Switch/Switch.H
@@ -153,7 +153,7 @@ public:
{}
//- Construct from Istream
- Switch(Istream& is);
+ explicit Switch(Istream& is);
// Helpers
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.H b/src/OpenFOAM/primitives/strings/fileName/fileName.H
index 78892c584bb..b5dfae58385 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileName.H
+++ b/src/OpenFOAM/primitives/strings/fileName/fileName.H
@@ -137,9 +137,8 @@ public:
//- Construct by concatenating words separated by '/'
explicit fileName(std::initializer_list<word> list);
-
//- Construct from Istream
- fileName(Istream& is);
+ explicit fileName(Istream& is);
// Member Functions
diff --git a/src/OpenFOAM/primitives/strings/keyType/keyType.H b/src/OpenFOAM/primitives/strings/keyType/keyType.H
index cf9db5128f9..6655db7473c 100644
--- a/src/OpenFOAM/primitives/strings/keyType/keyType.H
+++ b/src/OpenFOAM/primitives/strings/keyType/keyType.H
@@ -130,7 +130,7 @@ public:
//- Construct from Istream
// Treat as regular expression if surrounded by quotation marks.
- keyType(Istream& is);
+ explicit keyType(Istream& is);
// Member Functions
diff --git a/src/OpenFOAM/primitives/strings/parsing/parsing.H b/src/OpenFOAM/primitives/strings/parsing/parsing.H
index 925de3ccdba..ee069c5d017 100644
--- a/src/OpenFOAM/primitives/strings/parsing/parsing.H
+++ b/src/OpenFOAM/primitives/strings/parsing/parsing.H
@@ -49,8 +49,6 @@ namespace Foam
namespace parsing
{
- // Enumerations
-
//- Enumeration for possible parsing error
enum class errorType
{
diff --git a/src/OpenFOAM/primitives/strings/string/string.H b/src/OpenFOAM/primitives/strings/string/string.H
index 17fce9c3858..e306bfba65c 100644
--- a/src/OpenFOAM/primitives/strings/string/string.H
+++ b/src/OpenFOAM/primitives/strings/string/string.H
@@ -182,7 +182,7 @@ public:
inline string(const size_type len, const char c);
//- Construct from Istream
- string(Istream& is);
+ explicit string(Istream& is);
// Member Functions
diff --git a/src/OpenFOAM/primitives/strings/word/word.H b/src/OpenFOAM/primitives/strings/word/word.H
index 7f07140e355..34e3b9375a6 100644
--- a/src/OpenFOAM/primitives/strings/word/word.H
+++ b/src/OpenFOAM/primitives/strings/word/word.H
@@ -109,7 +109,7 @@ public:
inline word(const char* s, size_type len, bool doStrip);
//- Construct from Istream
- word(Istream& is);
+ explicit word(Istream& is);
// Member Functions
diff --git a/src/OpenFOAM/primitives/strings/wordRe/wordRe.H b/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
index 5b83bda346e..01f8fd88855 100644
--- a/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
+++ b/src/OpenFOAM/primitives/strings/wordRe/wordRe.H
@@ -162,7 +162,7 @@ public:
//- Construct from Istream
// Words are treated as literals, strings with an auto-test
- wordRe(Istream& is);
+ explicit wordRe(Istream& is);
// Member Functions
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
index a870da6462d..21cf6dddf64 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
@@ -69,7 +69,7 @@ outletMachNumberPressureFvPatchScalarField
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
UName_(dict.lookupOrDefault<word>("U", "U")),
- choked_(dict.lookup("choked")),
+ choked_(dict.get<Switch>("choked")),
relax_(dict.lookupOrDefault<scalar>("relax", 0))
{}
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
index 28b3f220f1a..8a25315086c 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMappedUniformInletHeatAddition/outletMappedUniformInletHeatAdditionFvPatchField.C
@@ -74,7 +74,7 @@ outletMappedUniformInletHeatAdditionFvPatchField
)
:
fixedValueFvPatchScalarField(p, iF, dict),
- outletPatchName_(dict.lookup("outletPatch")),
+ outletPatchName_(dict.get<word>("outletPatch")),
phiName_(dict.lookupOrDefault<word>("phi", "phi")),
Q_(dict.get<scalar>("Q")),
TMin_(dict.lookupOrDefault<scalar>("TMin", 0)),
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
index e3b6a880154..e48bdf7f42a 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -86,7 +86,7 @@ turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
:
mixedFvPatchScalarField(p, iF),
temperatureCoupledBase(patch(), dict),
- TnbrName_(dict.lookup("Tnbr")),
+ TnbrName_(dict.get<word>("Tnbr")),
thicknessLayers_(0),
kappaLayers_(0),
contactRes_(0.0)
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
index 1d69b010a2d..1edc0a97500 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.C
@@ -65,7 +65,7 @@ Foam::LESModel<BasicTurbulenceModel>::LESModel
),
LESDict_(this->subOrEmptyDict("LES")),
- turbulence_(LESDict_.lookup("turbulence")),
+ turbulence_(LESDict_.get<Switch>("turbulence")),
printCoeffs_(LESDict_.lookupOrDefault<Switch>("printCoeffs", false)),
coeffDict_(LESDict_.optionalSubDict(type + "Coeffs")),
diff --git a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H
index cc6f7353d0f..ba29c6ba9dd 100644
--- a/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H
+++ b/src/TurbulenceModels/turbulenceModels/LES/LESModel/LESModel.H
@@ -93,11 +93,6 @@ protected:
//- Print model coefficients
virtual void printCoeffs(const word& type);
-
-private:
-
- // Private Member Functions
-
//- No copy construct
LESModel(const LESModel&) = delete;
@@ -168,8 +163,7 @@ public:
//- Destructor
- virtual ~LESModel()
- {}
+ virtual ~LESModel() = default;
// Member Functions
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
index 928b99aa813..f094d989b8e 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.C
@@ -65,7 +65,7 @@ Foam::RASModel<BasicTurbulenceModel>::RASModel
),
RASDict_(this->subOrEmptyDict("RAS")),
- turbulence_(RASDict_.lookup("turbulence")),
+ turbulence_(RASDict_.get<Switch>("turbulence")),
printCoeffs_(RASDict_.lookupOrDefault<Switch>("printCoeffs", false)),
coeffDict_(RASDict_.optionalSubDict(type + "Coeffs")),
diff --git a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H
index 4b6d908cd52..36bf9a97e3b 100644
--- a/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H
+++ b/src/TurbulenceModels/turbulenceModels/RAS/RASModel/RASModel.H
@@ -83,11 +83,6 @@ protected:
//- Print model coefficients
virtual void printCoeffs(const word& type);
-
-private:
-
- // Private Member Functions
-
//- No copy construct
RASModel(const RASModel&) = delete;
@@ -158,8 +153,7 @@ public:
//- Destructor
- virtual ~RASModel()
- {}
+ virtual ~RASModel() = default;
// Member Functions
diff --git a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C
index b48b35099e7..45967c085c2 100644
--- a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C
+++ b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.C
@@ -100,7 +100,7 @@ Foam::TurbulenceModel<Alpha, Rho, BasicTurbulenceModel, TransportModel>::New
IOobject::NO_WRITE,
false
)
- ).lookup("simulationType")
+ ).get<word>("simulationType")
);
Info<< "Selecting turbulence model type " << modelType << endl;
diff --git a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H
index 8a820626e2c..83c609a756c 100644
--- a/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H
+++ b/src/TurbulenceModels/turbulenceModels/TurbulenceModel/TurbulenceModel.H
@@ -75,9 +75,7 @@ protected:
const transportModel& transport_;
-private:
-
- // Private Member Functions
+ // Protected Member Functions
//- No copy construct
TurbulenceModel(const TurbulenceModel&) = delete;
@@ -139,8 +137,7 @@ public:
//- Destructor
- virtual ~TurbulenceModel()
- {}
+ virtual ~TurbulenceModel() = default;
// Member Functions
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
index b40581055c0..72a133198e1 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutUTabulatedWallFunction/nutUTabulatedWallFunctionFvPatchScalarField.C
@@ -134,7 +134,7 @@ nutUTabulatedWallFunctionFvPatchScalarField
)
:
nutWallFunctionFvPatchScalarField(p, iF, dict),
- uPlusTableName_(dict.lookup("uPlusTable")),
+ uPlusTableName_(dict.get<word>("uPlusTable")),
uPlusTable_
(
IOobject
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C
index b6bbdbaf050..4900c690213 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C
+++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.C
@@ -109,7 +109,7 @@ Foam::laminarModel<BasicTurbulenceModel>::New
// otherwise it is registered in the database twice
const word modelType
(
- modelDict.subDict("laminar").lookup("laminarModel")
+ modelDict.subDict("laminar").get<word>("laminarModel")
);
Info<< "Selecting laminar stress model " << modelType << endl;
diff --git a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H
index dbfb440c228..6674f105848 100644
--- a/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H
+++ b/src/TurbulenceModels/turbulenceModels/laminar/laminarModel/laminarModel.H
@@ -71,11 +71,6 @@ protected:
//- Print model coefficients
virtual void printCoeffs(const word& type);
-
-private:
-
- // Private Member Functions
-
//- No copy construct
laminarModel(const laminarModel&) = delete;
@@ -146,8 +141,7 @@ public:
//- Destructor
- virtual ~laminarModel()
- {}
+ virtual ~laminarModel() = default;
// Member Functions
diff --git a/src/dynamicMesh/motionSolvers/velocity/velocityDisplacement/velocityDisplacementMotionSolver.C b/src/dynamicMesh/motionSolvers/velocity/velocityDisplacement/velocityDisplacementMotionSolver.C
index ca8f2b1c816..1e3d293b6cc 100644
--- a/src/dynamicMesh/motionSolvers/velocity/velocityDisplacement/velocityDisplacementMotionSolver.C
+++ b/src/dynamicMesh/motionSolvers/velocity/velocityDisplacement/velocityDisplacementMotionSolver.C
@@ -98,7 +98,7 @@ Foam::velocityDisplacementMotionSolver::velocityDisplacementMotionSolver
(
displacementMotionSolver::New
(
- coeffDict().lookup("solver"),
+ coeffDict().get<word>("solver"),
mesh,
IOdictionary
(
diff --git a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
index 6b4136d3848..688bcd27587 100644
--- a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
+++ b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.C
@@ -50,6 +50,7 @@ namespace functionObjects
}
}
+
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
void Foam::functionObjects::codedFunctionObject::prepare
@@ -194,9 +195,10 @@ bool Foam::functionObjects::codedFunctionObject::read(const dictionary& dict)
dict.readCompat<word>("name", {{"redirectType", 1706}}, name_);
const entry* dataPtr = dict.findEntry("codeData", keyType::LITERAL);
+
if (dataPtr)
{
- codeData_ = stringOps::trim(dataPtr->stream());
+ dataPtr->readEntry(codeData_);
stringOps::inplaceExpand(codeData_, dict);
dynamicCodeContext::addLineDirective
(
@@ -207,9 +209,10 @@ bool Foam::functionObjects::codedFunctionObject::read(const dictionary& dict)
}
const entry* readPtr = dict.findEntry("codeRead", keyType::LITERAL);
+
if (readPtr)
{
- codeRead_ = stringOps::trim(readPtr->stream());
+ readPtr->readEntry(codeRead_);
stringOps::inplaceExpand(codeRead_, dict);
dynamicCodeContext::addLineDirective
(
@@ -220,9 +223,10 @@ bool Foam::functionObjects::codedFunctionObject::read(const dictionary& dict)
}
const entry* execPtr = dict.findEntry("codeExecute", keyType::LITERAL);
+
if (execPtr)
{
- codeExecute_ = stringOps::trim(execPtr->stream());
+ execPtr->readEntry(codeExecute_);
stringOps::inplaceExpand(codeExecute_, dict);
dynamicCodeContext::addLineDirective
(
@@ -233,9 +237,10 @@ bool Foam::functionObjects::codedFunctionObject::read(const dictionary& dict)
}
const entry* writePtr = dict.findEntry("codeWrite", keyType::LITERAL);
+
if (writePtr)
{
- codeWrite_ = stringOps::trim(writePtr->stream());
+ writePtr->readEntry(codeWrite_);
stringOps::inplaceExpand(codeWrite_, dict);
dynamicCodeContext::addLineDirective
(
@@ -246,9 +251,10 @@ bool Foam::functionObjects::codedFunctionObject::read(const dictionary& dict)
}
const entry* endPtr = dict.findEntry("codeEnd", keyType::LITERAL);
+
if (endPtr)
{
- codeEnd_ = stringOps::trim(endPtr->stream());
+ endPtr->readEntry(codeEnd_);
stringOps::inplaceExpand(codeEnd_, dict);
dynamicCodeContext::addLineDirective
(
@@ -260,10 +266,8 @@ bool Foam::functionObjects::codedFunctionObject::read(const dictionary& dict)
if (!dataPtr && !readPtr && !execPtr && !writePtr && !endPtr)
{
- IOWarningInFunction
- (
- dict
- ) << "No critical \"code\" prefixed keywords were found."
+ IOWarningInFunction(dict)
+ << "No critical \"code\" prefixed keywords were found."
<< " Please check the code documentation for more details."
<< nl << endl;
}
diff --git a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
index 9a909f26133..522e940c426 100644
--- a/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
+++ b/src/functionObjects/utilities/codedFunctionObject/codedFunctionObject.H
@@ -134,8 +134,6 @@ protected:
virtual const dictionary& codeDict() const;
-private:
-
//- No copy construct
codedFunctionObject(const codedFunctionObject&) = delete;
diff --git a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
index 859ce93389f..7a30aa30274 100644
--- a/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/componentDisplacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
@@ -85,20 +85,14 @@ displacementComponentLaplacianFvMotionSolver
frozenPointsZone_
(
coeffDict().found("frozenPointsZone")
- ? fvMesh_.pointZones().findZoneID(coeffDict().lookup("frozenPointsZone"))
+ ? fvMesh_.pointZones().findZoneID
+ (
+ coeffDict().get<word>("frozenPointsZone")
+ )
: -1
)
{
- Switch applyPointLocation
- (
- coeffDict().lookupOrDefault
- (
- "applyPointLocation",
- true
- )
- );
-
- if (applyPointLocation)
+ if (coeffDict().lookupOrDefault("applyPointLocation", true))
{
pointLocation_.reset
(
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
index 59e83177a1d..9f47f72b9b7 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
@@ -93,7 +93,10 @@ Foam::displacementLaplacianFvMotionSolver::displacementLaplacianFvMotionSolver
frozenPointsZone_
(
coeffDict().found("frozenPointsZone")
- ? fvMesh_.pointZones().findZoneID(coeffDict().lookup("frozenPointsZone"))
+ ? fvMesh_.pointZones().findZoneID
+ (
+ coeffDict().get<word>("frozenPointsZone")
+ )
: -1
)
{
@@ -178,7 +181,10 @@ displacementLaplacianFvMotionSolver
frozenPointsZone_
(
coeffDict().found("frozenPointsZone")
- ? fvMesh_.pointZones().findZoneID(coeffDict().lookup("frozenPointsZone"))
+ ? fvMesh_.pointZones().findZoneID
+ (
+ coeffDict().get<word>("frozenPointsZone")
+ )
: -1
)
{
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.C
index df0a060c00a..e208f539595 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/solidBodyDisplacementLaplacian/solidBodyDisplacementLaplacianFvMotionSolver.C
@@ -97,7 +97,10 @@ solidBodyDisplacementLaplacianFvMotionSolver
frozenPointsZone_
(
coeffDict().found("frozenPointsZone")
- ? fvMesh_.pointZones().findZoneID(coeffDict().lookup("frozenPointsZone"))
+ ? fvMesh_.pointZones().findZoneID
+ (
+ coeffDict().get<word>("frozenPointsZone")
+ )
: -1
)
{
@@ -183,7 +186,10 @@ solidBodyDisplacementLaplacianFvMotionSolver
frozenPointsZone_
(
coeffDict().found("frozenPointsZone")
- ? fvMesh_.pointZones().findZoneID(coeffDict().lookup("frozenPointsZone"))
+ ? fvMesh_.pointZones().findZoneID
+ (
+ coeffDict().get<word>("frozenPointsZone")
+ )
: -1
)
{
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
index 1eb531470ee..8924c5b5efb 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
@@ -316,10 +316,10 @@ surfaceDisplacementPointPatchVectorField
)
:
fixedValuePointPatchVectorField(p, iF, dict),
- velocity_(dict.lookup("velocity")),
+ velocity_(dict.get<vector>("velocity")),
surfacesDict_(dict.subDict("geometry")),
projectMode_(projectModeNames_.get("projectMode", dict)),
- projectDir_(dict.lookup("projectDirection")),
+ projectDir_(dict.get<vector>("projectDirection")),
wedgePlane_(dict.lookupOrDefault("wedgePlane", -1)),
frozenPointsZone_(dict.lookupOrDefault("frozenPointsZone", word::null))
{
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
index 5ea535a8e5e..469e2c3f56b 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
@@ -110,7 +110,7 @@ private:
//- Plane for 2D wedge case or -1.
const label wedgePlane_;
- //- pointZone with frozen points
+ //- Name of pointZone with frozen points
const word frozenPointsZone_;
//- Demand driven: surface to project
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
index 0be591f508c..89100524c35 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
@@ -317,7 +317,7 @@ surfaceSlipDisplacementPointPatchVectorField
pointPatchVectorField(p, iF, dict),
surfacesDict_(dict.subDict("geometry")),
projectMode_(projectModeNames_.get("projectMode", dict)),
- projectDir_(dict.lookup("projectDirection")),
+ projectDir_(dict.get<vector>("projectDirection")),
wedgePlane_(dict.lookupOrDefault("wedgePlane", -1)),
frozenPointsZone_(dict.lookupOrDefault("frozenPointsZone", word::null))
{}
diff --git a/src/fvOptions/sources/general/codedSource/CodedSource.C b/src/fvOptions/sources/general/codedSource/CodedSource.C
index 618bb30f65b..cde6b2d3694 100644
--- a/src/fvOptions/sources/general/codedSource/CodedSource.C
+++ b/src/fvOptions/sources/general/codedSource/CodedSource.C
@@ -153,11 +153,9 @@ void Foam::fv::CodedSource<Type>::correct
GeometricField<Type, fvPatchField, volMesh>& field
)
{
- if (debug)
- {
- Info<< "CodedSource<"<< pTraits<Type>::typeName
- << ">::correct for source " << name_ << endl;
- }
+ DebugInfo
+ << "CodedSource<" << pTraits<Type>::typeName
+ << ">::correct for source " << name_ << endl;
updateLibrary(name_);
redirectFvOption().correct(field);
@@ -171,11 +169,9 @@ void Foam::fv::CodedSource<Type>::addSup
const label fieldi
)
{
- if (debug)
- {
- Info<< "CodedSource<"<< pTraits<Type>::typeName
- << ">::addSup for source " << name_ << endl;
- }
+ DebugInfo
+ << "CodedSource<" << pTraits<Type>::typeName
+ << ">::addSup for source " << name_ << endl;
updateLibrary(name_);
redirectFvOption().addSup(eqn, fieldi);
@@ -190,11 +186,9 @@ void Foam::fv::CodedSource<Type>::addSup
const label fieldi
)
{
- if (debug)
- {
- Info<< "CodedSource<"<< pTraits<Type>::typeName
- << ">::addSup for source " << name_ << endl;
- }
+ DebugInfo
+ << "CodedSource<" << pTraits<Type>::typeName
+ << ">::addSup for source " << name_ << endl;
updateLibrary(name_);
redirectFvOption().addSup(rho, eqn, fieldi);
@@ -208,11 +202,9 @@ void Foam::fv::CodedSource<Type>::constrain
const label fieldi
)
{
- if (debug)
- {
- Info<< "CodedSource<"<< pTraits<Type>::typeName
- << ">::constrain for source " << name_ << endl;
- }
+ DebugInfo
+ << "CodedSource<" << pTraits<Type>::typeName
+ << ">::constrain for source " << name_ << endl;
updateLibrary(name_);
redirectFvOption().constrain(eqn, fieldi);
diff --git a/src/fvOptions/sources/general/codedSource/CodedSourceIO.C b/src/fvOptions/sources/general/codedSource/CodedSourceIO.C
index 8cbeeecda21..f577dc7d6e1 100644
--- a/src/fvOptions/sources/general/codedSource/CodedSourceIO.C
+++ b/src/fvOptions/sources/general/codedSource/CodedSourceIO.C
@@ -43,7 +43,8 @@ bool Foam::fv::CodedSource<Type>::read(const dictionary& dict)
const entry& e =
coeffs_.lookupEntry("codeCorrect", keyType::LITERAL);
- codeCorrect_ = stringOps::trim(e.stream());
+ e.readEntry(codeCorrect_);
+ stringOps::inplaceTrim(codeCorrect_);
stringOps::inplaceExpand(codeCorrect_, coeffs_);
dynamicCodeContext::addLineDirective
(
@@ -57,7 +58,8 @@ bool Foam::fv::CodedSource<Type>::read(const dictionary& dict)
const entry& e =
coeffs_.lookupEntry("codeAddSup", keyType::LITERAL);
- codeAddSup_ = stringOps::trim(e.stream());
+ e.readEntry(codeAddSup_);
+ stringOps::inplaceTrim(codeAddSup_);
stringOps::inplaceExpand(codeAddSup_, coeffs_);
dynamicCodeContext::addLineDirective
(
@@ -71,7 +73,8 @@ bool Foam::fv::CodedSource<Type>::read(const dictionary& dict)
const entry& e =
coeffs_.lookupEntry("codeSetValue", keyType::LITERAL);
- codeSetValue_ = stringOps::trim(e.stream());
+ e.readEntry(codeSetValue_);
+ stringOps::inplaceTrim(codeSetValue_);
stringOps::inplaceExpand(codeSetValue_, coeffs_);
dynamicCodeContext::addLineDirective
(
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
index 6b0c5f099a8..ecce1a6a72b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
@@ -45,17 +45,17 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
(
owner.db().objectRegistry::template lookupObject<volScalarField>
(
- this->coeffDict().lookup("referenceField")
+ this->coeffDict().getWord("referenceField")
)
),
thresholdField_
(
owner.db().objectRegistry::template lookupObject<volScalarField>
(
- this->coeffDict().lookup("thresholdField")
+ this->coeffDict().getWord("thresholdField")
)
),
- positionsFile_(this->coeffDict().lookup("positionsFile")),
+ positionsFile_(this->coeffDict().getWord("positionsFile")),
positions_
(
IOobject
@@ -74,8 +74,11 @@ Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
(
this->coeffDict().getLabel("parcelsPerInjector")
),
- nParcelsInjected_(positions_.size(), 0),
- U0_(this->coeffDict().lookup("U0")),
+ nParcelsInjected_(positions_.size(), Zero),
+ U0_
+ (
+ this->coeffDict().template get<vector>("U0")
+ ),
diameters_(positions_.size()),
sizeDistribution_
(
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index e6d35f98945..17e23eacf14 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
@@ -40,7 +40,7 @@ Foam::PatchFlowRateInjection<CloudType>::PatchFlowRateInjection
)
:
InjectionModel<CloudType>(dict, owner, modelName,typeName),
- patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patch")),
+ patchInjectionBase(owner.mesh(), this->coeffDict().getWord("patch")),
phiName_(this->coeffDict().template lookupOrDefault<word>("phi", "phi")),
rhoName_(this->coeffDict().template lookupOrDefault<word>("rho", "rho")),
duration_(this->coeffDict().getScalar("duration")),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index 3c5563532c1..bc685f92c78 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -38,7 +38,7 @@ Foam::PatchInjection<CloudType>::PatchInjection
)
:
InjectionModel<CloudType>(dict, owner, modelName, typeName),
- patchInjectionBase(owner.mesh(), this->coeffDict().lookup("patch")),
+ patchInjectionBase(owner.mesh(), this->coeffDict().getWord("patch")),
duration_(this->coeffDict().getScalar("duration")),
parcelsPerSecond_
(
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C
index a0c01270434..8a8a1ab11f9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C
@@ -75,12 +75,6 @@ Foam::patchInjectionBase::patchInjectionBase(const patchInjectionBase& pib)
{}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-Foam::patchInjectionBase::~patchInjectionBase()
-{}
-
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
void Foam::patchInjectionBase::updateMesh(const polyMesh& mesh)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.H
index 29b1107055d..15dd03f6105 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.H
@@ -51,7 +51,7 @@ SourceFiles
namespace Foam
{
-// Forward class declarations
+// Forward declarations
class polyMesh;
class fvMesh;
class Random;
@@ -106,7 +106,7 @@ public:
//- Destructor
- virtual ~patchInjectionBase();
+ virtual ~patchInjectionBase() = default;
// Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.C
index de17e609660..3e8e7f82f16 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/ErgunWenYuDrag/ErgunWenYuDragForce.C
@@ -60,7 +60,7 @@ Foam::ErgunWenYuDragForce<CloudType>::ErgunWenYuDragForce
(
this->mesh().template lookupObject<volScalarField>
(
- this->coeffs().lookup("alphac")
+ this->coeffs().getWord("alphac")
)
)
{}
@@ -77,7 +77,7 @@ Foam::ErgunWenYuDragForce<CloudType>::ErgunWenYuDragForce
(
this->mesh().template lookupObject<volScalarField>
(
- this->coeffs().lookup("alphac")
+ this->coeffs().getWord("alphac")
)
)
{}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.C
index 632d9b42625..bce388480b1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/PlessisMasliyahDrag/PlessisMasliyahDragForce.C
@@ -60,7 +60,7 @@ Foam::PlessisMasliyahDragForce<CloudType>::PlessisMasliyahDragForce
(
this->mesh().template lookupObject<volScalarField>
(
- this->coeffs().lookup("alphac")
+ this->coeffs().getWord("alphac")
)
)
{}
@@ -77,7 +77,7 @@ Foam::PlessisMasliyahDragForce<CloudType>::PlessisMasliyahDragForce
(
this->mesh().template lookupObject<volScalarField>
(
- this->coeffs().lookup("alphac")
+ this->coeffs().getWord("alphac")
)
)
{}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.C
index 7fe9d28e2bd..c507dde82a8 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Drag/WenYuDrag/WenYuDragForce.C
@@ -57,7 +57,7 @@ Foam::WenYuDragForce<CloudType>::WenYuDragForce
(
this->mesh().template lookupObject<volScalarField>
(
- this->coeffs().lookup("alphac")
+ this->coeffs().getWord("alphac")
)
)
{}
@@ -74,7 +74,7 @@ Foam::WenYuDragForce<CloudType>::WenYuDragForce
(
this->mesh().template lookupObject<volScalarField>
(
- this->coeffs().lookup("alphac")
+ this->coeffs().getWord("alphac")
)
)
{}
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
index 1a037fe3c7e..96de521470a 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
@@ -95,19 +95,12 @@ Foam::PhaseChangeModel<CloudType>::PhaseChangeModel
CloudSubModelBase<CloudType>(owner, dict, typeName, type),
enthalpyTransfer_
(
- wordToEnthalpyTransfer(this->coeffDict().lookup("enthalpyTransfer"))
+ wordToEnthalpyTransfer(this->coeffDict().getWord("enthalpyTransfer"))
),
dMass_(0.0)
{}
-// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
-
-template<class CloudType>
-Foam::PhaseChangeModel<CloudType>::~PhaseChangeModel()
-{}
-
-
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
template<class CloudType>
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
index e04c3cf53ba..1ac0fbc383d 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -60,7 +60,7 @@ class PhaseChangeModel
{
public:
- // Public enumerations
+ // Public Enumerations
//- Enthalpy transfer type
enum enthalpyTransferType
@@ -70,7 +70,7 @@ public:
};
//- Name representations of enthalpy transfer types
- static const Foam::wordList enthalpyTransferTypeNames;
+ static const wordList enthalpyTransferTypeNames;
protected:
@@ -136,7 +136,7 @@ public:
//- Destructor
- virtual ~PhaseChangeModel();
+ virtual ~PhaseChangeModel() = default;
//- Selector
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
index dd7627397b4..ff3872f766d 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.C
@@ -489,7 +489,7 @@ Foam::ThermoSurfaceFilm<CloudType>::ThermoSurfaceFilm
CpFilmPatch_(0),
interactionType_
(
- interactionTypeEnum(this->coeffDict().lookup("interactionType"))
+ interactionTypeEnum(this->coeffDict().getWord("interactionType"))
),
deltaWet_(0.0),
splashParcelType_(0),
diff --git a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C
index 4b2e868af6b..5fd4aa2af6f 100644
--- a/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C
+++ b/src/mesh/snappyHexMesh/externalDisplacementMeshMover/displacementMotionSolverMeshMover.C
@@ -118,7 +118,7 @@ Foam::displacementMotionSolverMeshMover::displacementMotionSolverMeshMover
(
displacementMotionSolver::New
(
- dict.lookup("solver"),
+ dict.get<word>("solver"),
pointDisplacement.mesh()(),
IOdictionary
(
diff --git a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
index 229e64ae3f5..e334fc4b97f 100644
--- a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
+++ b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.C
@@ -48,7 +48,7 @@ Foam::RBD::restraint::restraint
)
:
name_(name),
- bodyID_(model.bodyID(dict.lookup("body"))),
+ bodyID_(model.bodyID(dict.get<word>("body"))),
bodyIndex_(model.master(bodyID_)),
coeffs_(dict),
model_(model)
diff --git a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H
index b9533c050c7..bc53dfd1369 100644
--- a/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H
+++ b/src/rigidBodyDynamics/restraints/restraint/rigidBodyRestraint.H
@@ -60,7 +60,7 @@ namespace RBD
class rigidBodyModel;
/*---------------------------------------------------------------------------*\
- Class restraint Declaration
+ Class restraint Declaration
\*---------------------------------------------------------------------------*/
class restraint
diff --git a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
index c20ad255eb9..84ff1d0af6a 100644
--- a/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
+++ b/src/rigidBodyDynamics/rigidBodyModel/rigidBodyModel.C
@@ -194,7 +194,7 @@ Foam::RBD::rigidBodyModel::rigidBodyModel
{
merge
(
- bodyID(bodyDict.lookup("mergeWith")),
+ bodyID(bodyDict.get<word>("mergeWith")),
bodyDict.lookup("transform"),
rigidBody::New(key, bodyDict)
);
@@ -203,7 +203,7 @@ Foam::RBD::rigidBodyModel::rigidBodyModel
{
join
(
- bodyID(bodyDict.lookup("parent")),
+ bodyID(bodyDict.get<word>("parent")),
bodyDict.lookup("transform"),
joint::New(bodyDict.subDict("joint")),
rigidBody::New(key, bodyDict)
diff --git a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
index f3d9424e2bd..f79a4342b14 100644
--- a/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
+++ b/src/thermophysicalModels/chemistryModel/chemistryModel/basicChemistryModel/basicChemistryModelTemplates.C
@@ -64,16 +64,16 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
const dictionary& chemistryTypeDict =
chemistryDict.subDict("chemistryType");
- const word& solverName
+ const word solverName
(
- chemistryTypeDict.found("solver")
- ? chemistryTypeDict.lookup("solver")
- : chemistryTypeDict.found("chemistrySolver")
- ? chemistryTypeDict.lookup("chemistrySolver")
- : chemistryTypeDict.lookup("solver") // error if neither entry is found
+ chemistryTypeDict.getCompat<word>
+ (
+ "solver",
+ {{"chemistrySolver", -1712}}
+ )
);
- const word& methodName
+ const word methodName
(
chemistryTypeDict.lookupOrDefault<word>
(
@@ -90,8 +90,7 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
Info<< "Selecting chemistry solver " << chemistryTypeDictNew << endl;
- typedef typename ChemistryModel::thermoConstructorTable cstrTableType;
- cstrTableType* cstrTable = ChemistryModel::thermoConstructorTablePtr_;
+ auto* cstrTable = ChemistryModel::thermoConstructorTablePtr_;
const word chemSolverCompThermoName =
solverName + '<' + methodName + '<'
@@ -106,7 +105,7 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
<< "Unknown " << typeName_() << " type " << solverName << endl
<< endl;
- const wordList names(cstrTable->toc());
+ const wordList names(cstrTable->sortedToc());
wordList thisCmpts;
thisCmpts.append(word::null);
@@ -123,7 +122,7 @@ Foam::autoPtr<ChemistryModel> Foam::basicChemistryModel::New
const wordList cmpts(basicThermo::splitThermoName(names[i], 8));
bool isValid = true;
- for (label i = 2; i < cmpts.size() && isValid; ++ i)
+ for (label i = 2; i < cmpts.size() && isValid; ++i)
{
isValid = isValid && cmpts[i] == thisCmpts[i];
}
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index 5068caa1875..7a305c4d53e 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -91,28 +91,28 @@ Foam::radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission
nFunc++;
}
- if (coeffsDict_.found("lookUpTableFileName"))
+ if
+ (
+ coeffsDict_.found("lookUpTableFileName")
+ && "none" != coeffsDict_.get<word>("lookUpTableFileName")
+ )
{
- const word name = coeffsDict_.lookup("lookUpTableFileName");
- if (name != "none")
- {
- lookUpTablePtr_.reset
+ lookUpTablePtr_.reset
+ (
+ new interpolationLookUpTable<scalar>
(
- new interpolationLookUpTable<scalar>
- (
- fileName(coeffsDict_.lookup("lookUpTableFileName")),
- mesh.time().constant(),
- mesh
- )
- );
-
- if (!mesh.foundObject<volScalarField>("ft"))
- {
- FatalErrorInFunction
- << "specie ft is not present to use with "
- << "lookUpTableFileName " << nl
- << exit(FatalError);
- }
+ coeffsDict_.get<fileName>("lookUpTableFileName"),
+ mesh.time().constant(),
+ mesh
+ )
+ );
+
+ if (!mesh.foundObject<volScalarField>("ft"))
+ {
+ FatalErrorInFunction
+ << "specie ft is not present to use with "
+ << "lookUpTableFileName " << nl
+ << exit(FatalError);
}
}
@@ -213,7 +213,7 @@ Foam::radiation::greyMeanAbsorptionEmission::aCont(const label bandI) const
forAll(a, celli)
{
- forAllConstIter(HashTable<label>, speciesNames_, iter)
+ forAllConstIters(speciesNames_, iter)
{
label n = iter();
scalar Xipi = 0.0;
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
index f8990de1374..a9e1768f258 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
@@ -102,28 +102,28 @@ Foam::radiation::wideBandAbsorptionEmission::wideBandAbsorptionEmission
}
nBands_ = nBand;
- if (coeffsDict_.found("lookUpTableFileName"))
+ if
+ (
+ coeffsDict_.found("lookUpTableFileName")
+ && "none" != coeffsDict_.get<word>("lookUpTableFileName")
+ )
{
- const word name = coeffsDict_.lookup("lookUpTableFileName");
- if (name != "none")
- {
- lookUpTablePtr_.set
+ lookUpTablePtr_.set
+ (
+ new interpolationLookUpTable<scalar>
(
- new interpolationLookUpTable<scalar>
- (
- fileName(coeffsDict_.lookup("lookUpTableFileName")),
- mesh.time().constant(),
- mesh
- )
- );
-
- if (!mesh.foundObject<volScalarField>("ft"))
- {
- FatalErrorInFunction
- << "specie ft is not present to use with "
- << "lookUpTableFileName " << nl
- << exit(FatalError);
- }
+ coeffsDict_.get<fileName>("lookUpTableFileName"),
+ mesh.time().constant(),
+ mesh
+ )
+ );
+
+ if (!mesh.foundObject<volScalarField>("ft"))
+ {
+ FatalErrorInFunction
+ << "specie ft is not present to use with "
+ << "lookUpTableFileName " << nl
+ << exit(FatalError);
}
}
@@ -224,7 +224,7 @@ Foam::radiation::wideBandAbsorptionEmission::aCont(const label bandi) const
forAll(a, celli)
{
- forAllConstIter(HashTable<label>, speciesNames_, iter)
+ forAllConstIters(speciesNames_, iter)
{
const label n = iter();
scalar Xipi = 0;
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C
index 4a4219882b6..01b48e5dbdc 100644
--- a/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/singleStepReactingMixture/singleStepReactingMixture.C
@@ -51,7 +51,7 @@ void Foam::singleStepReactingMixture<ThermoType>::calculateqFuel()
specieProd_[speciei] = -1;
}
- Info << "Fuel heat of combustion :" << qFuel_.value() << endl;
+ Info<< "Fuel heat of combustion :" << qFuel_.value() << endl;
}
@@ -73,9 +73,9 @@ void Foam::singleStepReactingMixture<ThermoType>::massAndAirStoichRatios()
* mag(specieStoichCoeffs_[O2Index]))
/ (Wu*mag(specieStoichCoeffs_[fuelIndex_]));
- Info << "stoichiometric air-fuel ratio :" << stoicRatio_.value() << endl;
+ Info<< "stoichiometric air-fuel ratio :" << stoicRatio_.value() << endl;
- Info << "stoichiometric oxygen-fuel ratio :" << s_.value() << endl;
+ Info<< "stoichiometric oxygen-fuel ratio :" << s_.value() << endl;
}
@@ -108,7 +108,7 @@ void Foam::singleStepReactingMixture<ThermoType>::calculateMaxProducts()
Yprod0_[speciei] = this->speciesData()[speciei].W()/Wm*Xi[i];
}
- Info << "Maximum products mass concentrations:" << nl;
+ Info<< "Maximum products mass concentrations:" << nl;
forAll(Yprod0_, i)
{
if (Yprod0_[i] > 0)
@@ -202,8 +202,8 @@ Foam::singleStepReactingMixture<ThermoType>::singleStepReactingMixture
specieStoichCoeffs_(this->species_.size(), Zero),
Yprod0_(this->species_.size(), Zero),
fres_(Yprod0_.size()),
- inertIndex_(this->species()[thermoDict.lookup("inertSpecie")]),
- fuelIndex_(this->species()[thermoDict.lookup("fuel")]),
+ inertIndex_(this->species()[thermoDict.get<word>("inertSpecie")]),
+ fuelIndex_(this->species()[thermoDict.get<word>("fuel")]),
specieProd_(Yprod0_.size(), 1)
{
if (this->size() == 1)
diff --git a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C
index da945226ce3..e476dd3b23a 100644
--- a/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C
+++ b/src/thermophysicalModels/solidSpecie/reaction/Reactions/solidReaction/solidReaction.C
@@ -74,7 +74,7 @@ Foam::solidReaction<ReactionThermo>::solidReaction
{
this->setLRhs
(
- IStringStream(dict.lookup("reaction"))(),
+ IStringStream(dict.getString("reaction"))(),
pyrolisisGases_,
glhs_,
grhs_
diff --git a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
index 66c944a8eb9..2b6778f3f51 100644
--- a/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
+++ b/src/thermophysicalModels/specie/reaction/Reactions/Reaction/Reaction.C
@@ -335,7 +335,7 @@ Foam::Reaction<ReactionThermo>::Reaction
{
setLRhs
(
- IStringStream(dict.lookup("reaction"))(),
+ IStringStream(dict.getString("reaction"))(),
species_,
lhs_,
rhs_
--
GitLab