zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

STYLE: enforce dictionary read length for read UNames/epsilonNames entry

Browse Source
This commit is contained in:
Mark Olesen
2018-07-05 11:00:16 +02:00
parent 209884d39b
commit e8fcd1d351
3 changed files with 23 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
View File

@ -119,18 +119,10 @@ bool Foam::fv::explicitPorositySource::read(const dictionary& dict)
{
if (cellSetOption::read(dict))
{
if (coeffs_.found("UNames"))
if (!coeffs_.readIfPresent("UNames", fieldNames_))
{
coeffs_.lookup("UNames") >> fieldNames_;
}
else if (coeffs_.found("U"))
{
word UName(coeffs_.lookup("U"));
fieldNames_ = wordList(1, UName);
}
else
{
fieldNames_ = wordList(1, "U");
fieldNames_.resize(1);
fieldNames_.first() = coeffs_.lookupOrDefault<word>("U", "U");
}
applied_.setSize(fieldNames_.size(), false);

14
src/waveModels/fvOptions/multiphaseMangrovesSource/multiphaseMangrovesSource.C
View File

@ -207,18 +207,10 @@ bool Foam::fv::multiphaseMangrovesSource::read(const dictionary& dict)
{
if (option::read(dict))
{
if (coeffs_.found("UNames"))
if (!coeffs_.readIfPresent("UNames", fieldNames_))
{
coeffs_.lookup("UNames") >> fieldNames_;
}
else if (coeffs_.found("U"))
{
word UName(coeffs_.lookup("U"));
fieldNames_ = wordList(1, UName);
}
else
{
fieldNames_ = wordList(1, "U");
fieldNames_.resize(1);
fieldNames_.first() = coeffs_.lookupOrDefault<word>("U", "U");
}
applied_.setSize(fieldNames_.size(), false);

35
src/waveModels/fvOptions/multiphaseMangrovesTurbulenceModel/multiphaseMangrovesTurbulenceModel.C
View File

@ -205,19 +205,19 @@ void Foam::fv::multiphaseMangrovesTurbulenceModel::addSup
if (eqn.psi().name() == epsilonName_)
{
fvMatrix<scalar> epsilonEqn
(
fvMatrix<scalar> epsilonEqn
(
- fvm::Sp(rho*epsilonCoeff(U), eqn.psi())
);
eqn += epsilonEqn;
}
else if (eqn.psi().name() == kName_)
{
fvMatrix<scalar> kEqn
(
fvMatrix<scalar> kEqn
(
- fvm::Sp(rho*kCoeff(U), eqn.psi())
);
eqn += kEqn;
eqn += kEqn;
}
}
@ -226,20 +226,19 @@ bool Foam::fv::multiphaseMangrovesTurbulenceModel::read(const dictionary& dict)
{
if (option::read(dict))
{
if (coeffs_.found("epsilonNames"))
if (!coeffs_.readIfPresent("epsilonNames", fieldNames_))
{
coeffs_.lookup("epsilonNames") >> fieldNames_;
}
else if (coeffs_.found("epsilon"))
{
word UName(coeffs_.lookup("epsilon"));
fieldNames_ = wordList(1, UName);
}
else
{
fieldNames_.setSize(2);
fieldNames_[0] = "epsilon";
fieldNames_[1] = "k";
if (coeffs_.found("epsilon"))
{
fieldNames_.resize(1);
coeffs_.read("epsilon", fieldNames_.first());
}
else
{
fieldNames_.resize(2);
fieldNames_[0] = "epsilon";
fieldNames_[1] = "k";
}
}
applied_.setSize(fieldNames_.size(), false);