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
bc1f2fa9
Commit
bc1f2fa9
authored
Jul 03, 2017
by
Mark OLESEN
Browse files
STYLE: use auto and cfind to simplify selector usage (issue
#512
)
parent
a09815fa
Changes
246
Hide whitespace changes
Inline
Side-by-side
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModelNew.C
View file @
bc1f2fa9
...
...
@@ -40,15 +40,14 @@ Foam::autoPtr<Foam::PDRDragModel> Foam::PDRDragModel::New
Info
<<
"Selecting flame-wrinkling model "
<<
modelType
<<
endl
;
dictionaryConstructorTable
::
iterator
cstrIter
=
dictionaryConstructorTablePtr_
->
find
(
modelType
);
auto
cstrIter
=
dictionaryConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown PDRDragModel type "
<<
modelType
<<
nl
<<
nl
<<
"Valid
PDRDragModel
s are
:
"
<<
endl
<<
"Valid PDRDragModel
types
:"
<<
endl
<<
dictionaryConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiEqModels/XiEqModel/XiEqModelNew.C
View file @
bc1f2fa9
...
...
@@ -39,15 +39,14 @@ Foam::autoPtr<Foam::XiEqModel> Foam::XiEqModel::New
Info
<<
"Selecting flame-wrinkling model "
<<
modelType
<<
endl
;
dictionaryConstructorTable
::
iterator
cstrIter
=
dictionaryConstructorTablePtr_
->
find
(
modelType
);
auto
cstrIter
=
dictionaryConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown XiEqModel type "
<<
modelType
<<
nl
<<
nl
<<
"Valid XiEqModel
s are
:
"
<<
endl
<<
"Valid XiEqModel
types
:"
<<
endl
<<
dictionaryConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiGModels/XiGModel/XiGModelNew.C
View file @
bc1f2fa9
...
...
@@ -39,15 +39,14 @@ Foam::autoPtr<Foam::XiGModel> Foam::XiGModel::New
Info
<<
"Selecting flame-wrinkling model "
<<
modelType
<<
endl
;
dictionaryConstructorTable
::
iterator
cstrIter
=
dictionaryConstructorTablePtr_
->
find
(
modelType
);
auto
cstrIter
=
dictionaryConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown XiGModel type "
<<
modelType
<<
nl
<<
nl
<<
"Valid XiGModel
s are
:
"
<<
endl
<<
"Valid XiGModel
types
:"
<<
endl
<<
dictionaryConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
...
...
applications/solvers/combustion/PDRFoam/XiModels/XiModel/XiModelNew.C
View file @
bc1f2fa9
...
...
@@ -42,15 +42,14 @@ Foam::autoPtr<Foam::XiModel> Foam::XiModel::New
Info
<<
"Selecting flame-wrinkling model "
<<
modelType
<<
endl
;
dictionaryConstructorTable
::
iterator
cstrIter
=
dictionaryConstructorTablePtr_
->
find
(
modelType
);
auto
cstrIter
=
dictionaryConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown XiModel type "
<<
modelType
<<
nl
<<
nl
<<
"Valid XiModel
s are
:
"
<<
endl
<<
"Valid XiModel
types
:"
<<
endl
<<
dictionaryConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
...
...
applications/solvers/multiphase/driftFluxFoam/mixtureViscosityModels/mixtureViscosityModel/mixtureViscosityModelNew.C
View file @
bc1f2fa9
...
...
@@ -41,15 +41,14 @@ Foam::autoPtr<Foam::mixtureViscosityModel> Foam::mixtureViscosityModel::New
Info
<<
"Selecting incompressible transport model "
<<
modelType
<<
endl
;
dictionaryConstructorTable
::
iterator
cstrIter
=
dictionaryConstructorTablePtr_
->
find
(
modelType
);
auto
cstrIter
=
dictionaryConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown mixtureViscosityModel type "
<<
modelType
<<
nl
<<
nl
<<
"Valid mixtureViscosityModel
s are
:
"
<<
endl
<<
"Valid mixtureViscosityModel
types
:"
<<
endl
<<
dictionaryConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
...
...
applications/solvers/multiphase/driftFluxFoam/relativeVelocityModels/relativeVelocityModel/relativeVelocityModel.C
View file @
bc1f2fa9
...
...
@@ -104,19 +104,18 @@ Foam::autoPtr<Foam::relativeVelocityModel> Foam::relativeVelocityModel::New
const
incompressibleTwoPhaseInteractingMixture
&
mixture
)
{
word
modelType
(
dict
.
lookup
(
typeName
));
const
word
modelType
(
dict
.
lookup
(
typeName
));
Info
<<
"Selecting relative velocity model "
<<
modelType
<<
endl
;
dictionaryConstructorTable
::
iterator
cstrIter
=
dictionaryConstructorTablePtr_
->
find
(
modelType
);
auto
cstrIter
=
dictionaryConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown time scale model type "
<<
modelType
<<
", constructor not in hash table"
<<
nl
<<
nl
<<
"
Valid time scale model types
are
:"
<<
n
l
<<
"Unknown time scale model type "
<<
modelType
<<
nl
<<
nl
<<
"Valid time scale model types :"
<<
end
l
<<
dictionaryConstructorTablePtr_
->
sortedToc
()
<<
abort
(
FatalError
);
}
...
...
@@ -141,13 +140,13 @@ Foam::relativeVelocityModel::~relativeVelocityModel()
// * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * * //
tmp
<
volScalarField
>
Foam
::
relativeVelocityModel
::
rho
()
const
Foam
::
tmp
<
Foam
::
volScalarField
>
Foam
::
relativeVelocityModel
::
rho
()
const
{
return
alphac_
*
rhoc_
+
alphad_
*
rhod_
;
}
tmp
<
volSymmTensorField
>
Foam
::
relativeVelocityModel
::
tauDm
()
const
Foam
::
tmp
<
Foam
::
volSymmTensorField
>
Foam
::
relativeVelocityModel
::
tauDm
()
const
{
volScalarField
betac
(
alphac_
*
rhoc_
);
volScalarField
betad
(
alphad_
*
rhod_
);
...
...
applications/solvers/multiphase/interCondensingEvaporatingFoam/temperaturePhaseChangeTwoPhaseMixtures/temperaturePhaseChangeTwoPhaseMixtures/newtemperaturePhaseChangeTwoPhaseMixture.C
View file @
bc1f2fa9
...
...
@@ -48,7 +48,7 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::New
)
);
word
temperaturePhaseChangeTwoPhaseMixtureTypeNam
e
const
word
modelTyp
e
(
phaseChangePropertiesDict
.
lookup
(
...
...
@@ -56,19 +56,16 @@ Foam::temperaturePhaseChangeTwoPhaseMixture::New
)
);
Info
<<
"Selecting phaseChange model "
<<
temperaturePhaseChangeTwoPhaseMixtureTypeName
<<
endl
;
Info
<<
"Selecting phaseChange model "
<<
modelType
<<
endl
;
componentsConstructorTable
::
iterator
cstrIter
=
componentsConstructorTablePtr_
->
find
(
temperaturePhaseChangeTwoPhaseMixtureTypeName
);
auto
cstrIter
=
componentsConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown temperaturePhaseChangeTwoPhaseMixture type "
<<
temperaturePhaseChangeTwoPhaseMixtureTypeNam
e
<<
end
l
<<
end
l
<<
"Valid
temperaturePhaseChangeTwoPhaseMixture
s are
:
"
<<
endl
<<
modelTyp
e
<<
n
l
<<
n
l
<<
"Valid temperaturePhaseChangeTwoPhaseMixture
types
:"
<<
endl
<<
componentsConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
...
...
applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/phaseChangeTwoPhaseMixture/newPhaseChangeTwoPhaseMixture.C
View file @
bc1f2fa9
...
...
@@ -48,24 +48,21 @@ Foam::phaseChangeTwoPhaseMixture::New
)
);
word
phaseChangeTwoPhaseMixtureTypeNam
e
const
word
modelTyp
e
(
transportPropertiesDict
.
lookup
(
"phaseChangeTwoPhaseMixture"
)
);
Info
<<
"Selecting phaseChange model "
<<
phaseChangeTwoPhaseMixtureTypeName
<<
endl
;
Info
<<
"Selecting phaseChange model "
<<
modelType
<<
endl
;
componentsConstructorTable
::
iterator
cstrIter
=
componentsConstructorTablePtr_
->
find
(
phaseChangeTwoPhaseMixtureTypeName
);
auto
cstrIter
=
componentsConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown phaseChangeTwoPhaseMixture type "
<<
phaseChangeTwoPhaseMixtureTypeNam
e
<<
end
l
<<
end
l
<<
"Valid
phaseChangeTwoPhaseMixture
s are
:
"
<<
endl
<<
modelTyp
e
<<
n
l
<<
n
l
<<
"Valid phaseChangeTwoPhaseMixture
types
:"
<<
endl
<<
componentsConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
...
...
applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
View file @
bc1f2fa9
...
...
@@ -34,22 +34,21 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
const
phaseModel
&
phase2
)
{
word
dragM
odelType
(
interfaceDict
.
lookup
(
"type"
));
const
word
m
odelType
(
interfaceDict
.
lookup
(
"type"
));
Info
<<
"Selecting dragModel for phase "
<<
phase1
.
name
()
<<
": "
<<
dragM
odelType
<<
endl
;
<<
m
odelType
<<
endl
;
dictionaryConstructorTable
::
iterator
cstrIter
=
dictionaryConstructorTablePtr_
->
find
(
dragModelType
);
auto
cstrIter
=
dictionaryConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown dragModel
Type
type "
<<
dragM
odelType
<<
end
l
<<
end
l
<<
"Valid dragModel types
are :
"
<<
endl
<<
"Unknown dragModel type "
<<
m
odelType
<<
n
l
<<
n
l
<<
"Valid dragModel types
:
"
<<
endl
<<
dictionaryConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
...
...
applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
View file @
bc1f2fa9
...
...
@@ -35,7 +35,7 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
const
phaseModel
&
phase2
)
{
word
heatTransferM
odelType
const
word
m
odelType
(
interfaceDict
.
lookup
(
"heatTransferModel"
+
phase1
.
name
())
);
...
...
@@ -43,17 +43,16 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
Info
<<
"Selecting heatTransferModel for phase "
<<
phase1
.
name
()
<<
": "
<<
heatTransferM
odelType
<<
endl
;
<<
m
odelType
<<
endl
;
dictionaryConstructorTable
::
iterator
cstrIter
=
dictionaryConstructorTablePtr_
->
find
(
heatTransferModelType
);
auto
cstrIter
=
dictionaryConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown heatTransferModel
Type
type "
<<
heatTransferM
odelType
<<
end
l
<<
end
l
<<
"Valid heatTransferModel types
are :
"
<<
endl
<<
"Unknown heatTransferModel type "
<<
m
odelType
<<
n
l
<<
n
l
<<
"Valid heatTransferModel types
:
"
<<
endl
<<
dictionaryConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
...
...
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseSystem/diameterModels/diameterModel/newDiameterModel.C
View file @
bc1f2fa9
...
...
@@ -33,32 +33,28 @@ Foam::autoPtr<Foam::diameterModel> Foam::diameterModel::New
const
phaseModel
&
phase
)
{
word
diameterModelType
(
dict
.
lookup
(
"diameterModel"
)
);
const
word
modelType
(
dict
.
lookup
(
"diameterModel"
));
Info
<<
"Selecting diameterModel for phase "
<<
phase
.
name
()
<<
": "
<<
diameterM
odelType
<<
endl
;
<<
m
odelType
<<
endl
;
dictionaryConstructorTable
::
iterator
cstrIter
=
dictionaryConstructorTablePtr_
->
find
(
diameterModelType
);
auto
cstrIter
=
dictionaryConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown diameterModel
Type
type "
<<
diameterM
odelType
<<
end
l
<<
end
l
<<
"Valid diameterModel types
are :
"
<<
endl
<<
"Unknown diameterModel type "
<<
m
odelType
<<
n
l
<<
n
l
<<
"Valid diameterModel types
:
"
<<
endl
<<
dictionaryConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
return
cstrIter
()
(
dict
.
optionalSubDict
(
diameterM
odelType
+
"Coeffs"
),
dict
.
optionalSubDict
(
m
odelType
+
"Coeffs"
),
phase
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/interfaceCompositionModels/interfaceCompositionModel/newInterfaceCompositionModel.C
View file @
bc1f2fa9
...
...
@@ -36,7 +36,7 @@ Foam::interfaceCompositionModel::New
const
phasePair
&
pair
)
{
word
interfaceCompositionM
odelType
const
word
m
odelType
(
word
(
dict
.
lookup
(
"type"
))
+
"<"
...
...
@@ -47,17 +47,16 @@ Foam::interfaceCompositionModel::New
);
Info
<<
"Selecting interfaceCompositionModel for "
<<
pair
<<
": "
<<
interfaceCompositionM
odelType
<<
endl
;
<<
pair
<<
": "
<<
m
odelType
<<
endl
;
dictionaryConstructorTable
::
iterator
cstrIter
=
dictionaryConstructorTablePtr_
->
find
(
interfaceCompositionModelType
);
auto
cstrIter
=
dictionaryConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown interfaceCompositionModel
Type
type "
<<
interfaceCompositionM
odelType
<<
end
l
<<
end
l
<<
"Valid interfaceCompositionModel types
are :
"
<<
endl
<<
"Unknown interfaceCompositionModel type "
<<
m
odelType
<<
n
l
<<
n
l
<<
"Valid interfaceCompositionModel types
:
"
<<
endl
<<
dictionaryConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/massTransferModels/massTransferModel/newMassTransferModel.C
View file @
bc1f2fa9
...
...
@@ -34,20 +34,19 @@ Foam::autoPtr<Foam::massTransferModel> Foam::massTransferModel::New
const
phasePair
&
pair
)
{
word
m
assTransferM
odelType
(
dict
.
lookup
(
"type"
));
const
word
modelType
(
dict
.
lookup
(
"type"
));
Info
<<
"Selecting massTransferModel for "
<<
pair
<<
": "
<<
m
assTransferM
odelType
<<
endl
;
<<
pair
<<
": "
<<
modelType
<<
endl
;
dictionaryConstructorTable
::
iterator
cstrIter
=
dictionaryConstructorTablePtr_
->
find
(
massTransferModelType
);
auto
cstrIter
=
dictionaryConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown massTransferModel
Type
type "
<<
m
assTransferM
odelType
<<
end
l
<<
end
l
<<
"Valid massTransferModel types
are :
"
<<
endl
<<
"Unknown massTransferModel type "
<<
modelType
<<
n
l
<<
n
l
<<
"Valid massTransferModel types
:
"
<<
endl
<<
dictionaryConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/saturationModels/saturationModel/newSaturationModel.C
View file @
bc1f2fa9
...
...
@@ -32,20 +32,18 @@ Foam::autoPtr<Foam::saturationModel> Foam::saturationModel::New
const
dictionary
&
dict
)
{
word
saturationM
odelType
(
dict
.
lookup
(
"type"
));
const
word
m
odelType
(
dict
.
lookup
(
"type"
));
Info
<<
"Selecting saturationModel: "
<<
saturationModelType
<<
endl
;
Info
<<
"Selecting saturationModel: "
<<
modelType
<<
endl
;
dictionaryConstructorTable
::
iterator
cstrIter
=
dictionaryConstructorTablePtr_
->
find
(
saturationModelType
);
auto
cstrIter
=
dictionaryConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown saturationModel
Type
type "
<<
saturationM
odelType
<<
end
l
<<
end
l
<<
"Valid saturationModel types
are :
"
<<
endl
<<
"Unknown saturationModel type "
<<
m
odelType
<<
n
l
<<
n
l
<<
"Valid saturationModel types
:
"
<<
endl
<<
dictionaryConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/surfaceTensionModels/surfaceTensionModel/newSurfaceTensionModel.C
View file @
bc1f2fa9
...
...
@@ -35,20 +35,19 @@ Foam::surfaceTensionModel::New
const
phasePair
&
pair
)
{
word
surfaceTensionM
odelType
(
dict
.
lookup
(
"type"
));
const
word
m
odelType
(
dict
.
lookup
(
"type"
));
Info
<<
"Selecting surfaceTensionModel for "
<<
pair
<<
": "
<<
surfaceTensionM
odelType
<<
endl
;
<<
pair
<<
": "
<<
m
odelType
<<
endl
;
multiphaseConstructorTable
::
iterator
cstrIter
=
multiphaseConstructorTablePtr_
->
find
(
surfaceTensionModelType
);
auto
cstrIter
=
multiphaseConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown surfaceTensionModel
Type
type "
<<
surfaceTensionM
odelType
<<
end
l
<<
end
l
<<
"Valid surfaceTensionModel types
are :
"
<<
endl
<<
"Unknown surfaceTensionModel type "
<<
m
odelType
<<
n
l
<<
n
l
<<
"Valid surfaceTensionModel types
:
"
<<
endl
<<
multiphaseConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/aspectRatioModels/aspectRatioModel/newAspectRatioModel.C
View file @
bc1f2fa9
...
...
@@ -35,20 +35,19 @@ Foam::aspectRatioModel::New
const
phasePair
&
pair
)
{
word
aspectRatioM
odelType
(
dict
.
lookup
(
"type"
));
const
word
m
odelType
(
dict
.
lookup
(
"type"
));
Info
<<
"Selecting aspectRatioModel for "
<<
pair
<<
": "
<<
aspectRatioM
odelType
<<
endl
;
<<
pair
<<
": "
<<
m
odelType
<<
endl
;
dictionaryConstructorTable
::
iterator
cstrIter
=
dictionaryConstructorTablePtr_
->
find
(
aspectRatioModelType
);
auto
cstrIter
=
dictionaryConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown aspectRatioModel
Type
type "
<<
aspectRatioM
odelType
<<
end
l
<<
end
l
<<
"Valid aspectRatioModel types
are :
"
<<
endl
<<
"Unknown aspectRatioModel type "
<<
m
odelType
<<
n
l
<<
n
l
<<
"Valid aspectRatioModel types
:
"
<<
endl
<<
dictionaryConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/dragModels/dragModel/newDragModel.C
View file @
bc1f2fa9
...
...
@@ -34,20 +34,19 @@ Foam::autoPtr<Foam::dragModel> Foam::dragModel::New
const
phasePair
&
pair
)
{
word
dragM
odelType
(
dict
.
lookup
(
"type"
));
const
word
m
odelType
(
dict
.
lookup
(
"type"
));
Info
<<
"Selecting dragModel for "
<<
pair
<<
": "
<<
dragM
odelType
<<
endl
;
<<
pair
<<
": "
<<
m
odelType
<<
endl
;
dictionaryConstructorTable
::
iterator
cstrIter
=
dictionaryConstructorTablePtr_
->
find
(
dragModelType
);
auto
cstrIter
=
dictionaryConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown dragModel
Type
type "
<<
dragM
odelType
<<
end
l
<<
end
l
<<
"Valid dragModel types
are :
"
<<
endl
<<
"Unknown dragModel type "
<<
m
odelType
<<
n
l
<<
n
l
<<
"Valid dragModel types
:
"
<<
endl
<<
dictionaryConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/newHeatTransferModel.C
View file @
bc1f2fa9
...
...
@@ -34,20 +34,19 @@ Foam::autoPtr<Foam::heatTransferModel> Foam::heatTransferModel::New
const
phasePair
&
pair
)
{
word
heatTransferM
odelType
(
dict
.
lookup
(
"type"
));
const
word
m
odelType
(
dict
.
lookup
(
"type"
));
Info
<<
"Selecting heatTransferModel for "
<<
pair
<<
": "
<<
heatTransferM
odelType
<<
endl
;
<<
pair
<<
": "
<<
m
odelType
<<
endl
;
dictionaryConstructorTable
::
iterator
cstrIter
=
dictionaryConstructorTablePtr_
->
find
(
heatTransferModelType
);
auto
cstrIter
=
dictionaryConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown heatTransferModel
Type
type "
<<
heatTransferM
odelType
<<
end
l
<<
end
l
<<
"Valid heatTransferModel types
are :
"
<<
endl
<<
"Unknown heatTransferModel type "
<<
m
odelType
<<
n
l
<<
n
l
<<
"Valid heatTransferModel types
:
"
<<
endl
<<
dictionaryConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/liftModels/liftModel/newLiftModel.C
View file @
bc1f2fa9
...
...
@@ -34,20 +34,19 @@ Foam::autoPtr<Foam::liftModel> Foam::liftModel::New
const
phasePair
&
pair
)
{
word
liftM
odelType
(
dict
.
lookup
(
"type"
));
const
word
m
odelType
(
dict
.
lookup
(
"type"
));
Info
<<
"Selecting liftModel for "
<<
pair
<<
": "
<<
liftM
odelType
<<
endl
;
<<
pair
<<
": "
<<
m
odelType
<<
endl
;
dictionaryConstructorTable
::
iterator
cstrIter
=
dictionaryConstructorTablePtr_
->
find
(
liftModelType
);
auto
cstrIter
=
dictionaryConstructorTablePtr_
->
cfind
(
modelType
);
if
(
!
cstrIter
.
found
())
{
FatalErrorInFunction
<<
"Unknown liftModel
Type
type "
<<
liftM
odelType
<<
end
l
<<
end
l
<<
"Valid liftModel types
are :
"
<<
endl
<<
"Unknown liftModel type "
<<
m
odelType
<<
n
l
<<
n
l
<<
"Valid liftModel types
:
"
<<
endl
<<
dictionaryConstructorTablePtr_
->
sortedToc
()
<<
exit
(
FatalError
);
}
...
...
applications/solvers/multiphase/reactingEulerFoam/interfacialModels/swarmCorrections/swarmCorrection/newSwarmCorrection.C
View file @
bc1f2fa9
...
...
@@ -35,20 +35,19 @@ Foam::swarmCorrection::New
const
phasePair
&
pair
)
{
word
swarmC
orrectionType
(
dict
.
lookup
(
"type"
));
const
word
c
orrectionType
(
dict
.
lookup
(
"type"
));
Info
<<
"Selecting swarmCorrection for "
<<
pair
<<
": "
<<
swarmC
orrectionType
<<
endl
;
<<
pair
<<
": "
<<
c
orrectionType
<<
endl
;