Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
openfoam
Commits
4e04c196
Commit
4e04c196
authored
Oct 19, 2018
by
Mark OLESEN
Browse files
ENH: use dictionary::get<word>() instead of lookup() in a few places
parent
4ad73873
Changes
183
Hide whitespace changes
Inline
Side-by-side
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModel.C
View file @
4e04c196
...
...
@@ -48,7 +48,7 @@ Foam::XiEqModel::XiEqModel
(
XiEqProperties
.
subDict
(
word
(
XiEqProperties
.
lookup
(
"XiEqModel"
)
)
+
"Coeffs"
XiEqProperties
.
get
<
word
>
(
"XiEqModel"
)
+
"Coeffs"
)
),
thermo_
(
thermo
),
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C
View file @
4e04c196
...
...
@@ -35,7 +35,7 @@ Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
const
volScalarField
&
Su
)
{
const
word
modelType
(
propDict
.
lookup
(
"XiEqModel"
));
const
word
modelType
(
propDict
.
get
<
word
>
(
"XiEqModel"
));
Info
<<
"Selecting flame-wrinkling model "
<<
modelType
<<
endl
;
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModel.C
View file @
4e04c196
...
...
@@ -48,7 +48,7 @@ Foam::XiGModel::XiGModel
(
XiGProperties
.
subDict
(
word
(
XiGProperties
.
lookup
(
"XiGModel"
)
)
+
"Coeffs"
XiGProperties
.
get
<
word
>
(
"XiGModel"
)
+
"Coeffs"
)
),
thermo_
(
thermo
),
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C
View file @
4e04c196
...
...
@@ -35,7 +35,7 @@ Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
const
volScalarField
&
Su
)
{
const
word
modelType
(
propDict
.
lookup
(
"XiGModel"
));
const
word
modelType
(
propDict
.
get
<
word
>
(
"XiGModel"
));
Info
<<
"Selecting flame-wrinkling model "
<<
modelType
<<
endl
;
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModel.C
View file @
4e04c196
...
...
@@ -51,7 +51,7 @@ Foam::XiModel::XiModel
(
XiProperties
.
subDict
(
word
(
XiProperties
.
lookup
(
"XiModel"
)
)
+
"Coeffs"
XiProperties
.
get
<
word
>
(
"XiModel"
)
+
"Coeffs"
)
),
thermo_
(
thermo
),
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C
View file @
4e04c196
...
...
@@ -38,7 +38,7 @@ Foam::autoPtr<Foam::XiModel> Foam::XiModel::New
const
surfaceScalarField
&
phi
)
{
const
word
modelType
(
propDict
.
lookup
(
"XiModel"
));
const
word
modelType
(
propDict
.
get
<
word
>
(
"XiModel"
));
Info
<<
"Selecting flame-wrinkling model "
<<
modelType
<<
endl
;
...
...
applications/solvers/combustion/chemFoam/readInitialConditions.H
View file @
4e04c196
word
constProp
(
initialConditions
.
lookup
(
"constantProperty"
));
if
(
(
constProp
!=
"pressure"
)
&&
(
constProp
!=
"volume"
)
)
word
constProp
(
initialConditions
.
get
<
word
>
(
"constantProperty"
));
if
(
constProp
!=
"pressure"
&&
constProp
!=
"volume"
)
{
FatalError
<<
"in initialConditions, unknown constantProperty type "
<<
constProp
<<
nl
<<
" Valid types are: pressure volume."
<<
abort
(
FatalError
);
}
word
fractionBasis
(
initialConditions
.
lookup
(
"fractionBasis"
));
if
(
(
fractionBasis
!=
"mass"
)
&&
(
fractionBasis
!=
"mole"
)
)
word
fractionBasis
(
initialConditions
.
get
<
word
>
(
"fractionBasis"
));
if
(
fractionBasis
!=
"mass"
&&
fractionBasis
!=
"mole"
)
{
FatalError
<<
"in initialConditions, unknown fractionBasis type "
<<
nl
<<
"Valid types are: mass or mole."
...
...
applications/solvers/combustion/fireFoam/createFields.H
View file @
4e04c196
...
...
@@ -8,7 +8,7 @@ SLGThermo slgThermo(mesh, thermo);
basicSpecieMixture
&
composition
=
thermo
.
composition
();
PtrList
<
volScalarField
>&
Y
=
composition
.
Y
();
const
word
inertSpecie
(
thermo
.
lookup
(
"inertSpecie"
));
const
word
inertSpecie
(
thermo
.
get
<
word
>
(
"inertSpecie"
));
if
(
!
composition
.
species
().
found
(
inertSpecie
))
{
FatalIOErrorIn
(
args
.
executable
().
c_str
(),
thermo
)
...
...
applications/solvers/combustion/reactingFoam/createFields.H
View file @
4e04c196
...
...
@@ -8,7 +8,7 @@ thermo.validate(args.executable(), "h", "e");
basicSpecieMixture
&
composition
=
thermo
.
composition
();
PtrList
<
volScalarField
>&
Y
=
composition
.
Y
();
const
word
inertSpecie
(
thermo
.
lookup
(
"inertSpecie"
));
const
word
inertSpecie
(
thermo
.
get
<
word
>
(
"inertSpecie"
));
if
(
!
composition
.
species
().
found
(
inertSpecie
))
{
FatalIOErrorIn
(
args
.
executable
().
c_str
(),
thermo
)
...
...
applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H
View file @
4e04c196
...
...
@@ -8,7 +8,7 @@ thermo.validate(args.executable(), "h", "e");
basicSpecieMixture
&
composition
=
thermo
.
composition
();
PtrList
<
volScalarField
>&
Y
=
composition
.
Y
();
const
word
inertSpecie
(
thermo
.
lookup
(
"inertSpecie"
));
const
word
inertSpecie
(
thermo
.
get
<
word
>
(
"inertSpecie"
));
if
(
!
composition
.
species
().
found
(
inertSpecie
))
{
FatalIOErrorIn
(
args
.
executable
().
c_str
(),
thermo
)
...
...
applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H
View file @
4e04c196
...
...
@@ -8,7 +8,7 @@ thermo.validate(args.executable(), "h", "e");
basicSpecieMixture
&
composition
=
thermo
.
composition
();
PtrList
<
volScalarField
>&
Y
=
composition
.
Y
();
const
word
inertSpecie
(
thermo
.
lookup
(
"inertSpecie"
));
const
word
inertSpecie
(
thermo
.
get
<
word
>
(
"inertSpecie"
));
if
(
!
composition
.
species
().
found
(
inertSpecie
))
{
FatalIOErrorIn
(
args
.
executable
().
c_str
(),
thermo
)
...
...
applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H
View file @
4e04c196
...
...
@@ -11,7 +11,7 @@
label
inertIndex
=
-
1
;
if
(
Y
.
size
())
{
const
word
inertSpecie
(
thermo
.
lookup
(
"inertSpecie"
));
const
word
inertSpecie
(
thermo
.
get
<
word
>
(
"inertSpecie"
));
if
(
!
composition
.
species
().
found
(
inertSpecie
))
{
FatalIOErrorIn
(
args
.
executable
().
c_str
(),
thermo
)
...
...
applications/solvers/lagrangian/coalChemistryFoam/createFields.H
View file @
4e04c196
...
...
@@ -12,7 +12,7 @@ SLGThermo slgThermo(mesh, thermo);
basicSpecieMixture
&
composition
=
thermo
.
composition
();
PtrList
<
volScalarField
>&
Y
=
composition
.
Y
();
const
word
inertSpecie
(
thermo
.
lookup
(
"inertSpecie"
));
const
word
inertSpecie
(
thermo
.
get
<
word
>
(
"inertSpecie"
));
if
(
!
composition
.
species
().
found
(
inertSpecie
))
{
FatalIOErrorIn
(
args
.
executable
().
c_str
(),
thermo
)
...
...
applications/solvers/lagrangian/reactingParcelFoam/createFields.H
View file @
4e04c196
...
...
@@ -10,7 +10,7 @@ SLGThermo slgThermo(mesh, thermo);
basicSpecieMixture
&
composition
=
thermo
.
composition
();
PtrList
<
volScalarField
>&
Y
=
composition
.
Y
();
const
word
inertSpecie
(
thermo
.
lookup
(
"inertSpecie"
));
const
word
inertSpecie
(
thermo
.
get
<
word
>
(
"inertSpecie"
));
if
(
!
composition
.
species
().
found
(
inertSpecie
))
{
FatalIOErrorIn
(
args
.
executable
().
c_str
(),
thermo
)
...
...
applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H
View file @
4e04c196
...
...
@@ -10,7 +10,7 @@ SLGThermo slgThermo(mesh, thermo);
basicSpecieMixture
&
composition
=
thermo
.
composition
();
PtrList
<
volScalarField
>&
Y
=
composition
.
Y
();
const
word
inertSpecie
(
thermo
.
lookup
(
"inertSpecie"
));
const
word
inertSpecie
(
thermo
.
get
<
word
>
(
"inertSpecie"
));
if
(
!
composition
.
species
().
found
(
inertSpecie
))
{
FatalIOErrorIn
(
args
.
executable
().
c_str
(),
thermo
)
...
...
applications/solvers/lagrangian/simpleCoalParcelFoam/createFields.H
View file @
4e04c196
...
...
@@ -11,7 +11,7 @@ SLGThermo slgThermo(mesh, thermo);
basicSpecieMixture
&
composition
=
thermo
.
composition
();
PtrList
<
volScalarField
>&
Y
=
composition
.
Y
();
const
word
inertSpecie
(
thermo
.
lookup
(
"inertSpecie"
));
const
word
inertSpecie
(
thermo
.
get
<
word
>
(
"inertSpecie"
));
if
(
!
composition
.
species
().
found
(
inertSpecie
))
{
FatalIOErrorIn
(
args
.
executable
().
c_str
(),
thermo
)
...
...
applications/solvers/lagrangian/sprayFoam/createFields.H
View file @
4e04c196
...
...
@@ -10,7 +10,7 @@ SLGThermo slgThermo(mesh, thermo);
basicSpecieMixture
&
composition
=
thermo
.
composition
();
PtrList
<
volScalarField
>&
Y
=
composition
.
Y
();
const
word
inertSpecie
(
thermo
.
lookup
(
"inertSpecie"
));
const
word
inertSpecie
(
thermo
.
get
<
word
>
(
"inertSpecie"
));
if
(
!
composition
.
species
().
found
(
inertSpecie
))
{
FatalIOErrorIn
(
args
.
executable
().
c_str
(),
thermo
)
...
...
applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C
View file @
4e04c196
...
...
@@ -37,7 +37,7 @@ Foam::autoPtr<Foam::mixtureViscosityModel> Foam::mixtureViscosityModel::New
const
surfaceScalarField
&
phi
)
{
const
word
modelType
(
viscosityProperties
.
lookup
(
"transportModel"
));
const
word
modelType
(
viscosityProperties
.
get
<
word
>
(
"transportModel"
));
Info
<<
"Selecting incompressible transport model "
<<
modelType
<<
endl
;
...
...
applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
View file @
4e04c196
...
...
@@ -104,7 +104,7 @@ Foam::autoPtr<Foam::relativeVelocityModel> Foam::relativeVelocityModel::New
const
incompressibleTwoPhaseInteractingMixture
&
mixture
)
{
const
word
modelType
(
dict
.
lookup
(
typeName
));
const
word
modelType
(
dict
.
get
<
word
>
(
typeName
));
Info
<<
"Selecting relative velocity model "
<<
modelType
<<
endl
;
...
...
applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/interfaceCompositionModel/interfaceCompositionModelNew.C
View file @
4e04c196
...
...
@@ -38,7 +38,7 @@ Foam::interfaceCompositionModel::New
{
word
interfaceCompositionModelType
(
word
(
dict
.
lookup
(
"type"
)
)
dict
.
get
<
word
>
(
"type"
)
+
"<"
+
pair
.
phase1
().
thermo
().
type
()
+
","
...
...
Prev
1
2
3
4
5
…
10
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment