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

COMP: rename dictionary::read<T> to dictionary::readEntry<T>

Browse Source 
- avoids compiler ambiguity when virtual methods such as
  IOdictionary::read() exist.

- the method was introduced in 1806, and was thus not yet widely used
This commit is contained in:
Mark Olesen
2018-07-30 15:52:40 +02:00
parent 215570915e
commit f00c7a655c
49 changed files with 125 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/PDRDragModel/PDRDragModel.C
View File

@ -81,7 +81,7 @@ bool Foam::PDRDragModel::read(const dictionary& PDRProperties)
{
PDRDragModelCoeffs_ = PDRProperties.optionalSubDict(type() + "Coeffs");
PDRDragModelCoeffs_.read("drag", on_);
PDRDragModelCoeffs_.readEntry("drag", on_);
return true;
}

4
applications/solvers/combustion/PDRFoam/PDRModels/dragModels/basic/basic.C
View File

@ -165,8 +165,8 @@ bool Foam::PDRDragModels::basic::read(const dictionary& PDRProperties)
{
PDRDragModel::read(PDRProperties);
PDRDragModelCoeffs_.read("Csu", Csu.value());
PDRDragModelCoeffs_.read("Csk", Csk.value());
PDRDragModelCoeffs_.readEntry("Csu", Csu.value());
PDRDragModelCoeffs_.readEntry("Csk", Csk.value());
return true;
}

4
applications/solvers/combustion/chemFoam/readControls.H
View File

@ -1,3 +1,3 @@
runTime.controlDict().read("adjustTimeStep", adjustTimeStep);
runTime.controlDict().readEntry("adjustTimeStep", adjustTimeStep);
runTime.controlDict().read("maxDeltaT", maxDeltaT);
runTime.controlDict().readEntry("maxDeltaT", maxDeltaT);

2
applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/readControls.H
View File

@ -1,4 +1,4 @@
#include "readDyMControls.H"
correctPhi = pimple.dict().lookupOrDefault("correctPhi", true);
maxAcousticCo = readScalar(runTime.controlDict().lookup("maxAcousticCo"));
maxAcousticCo = runTime.controlDict().get<scalar>("maxAcousticCo");

2
applications/solvers/multiphase/cavitatingFoam/readControls.H
View File

@ -1,3 +1,3 @@
#include "readTimeControls.H"
maxAcousticCo = readScalar(runTime.controlDict().lookup("maxAcousticCo"));
maxAcousticCo = runTime.controlDict().get<scalar>("maxAcousticCo");

2
applications/utilities/preProcessing/createZeroDirectory/boundaryInfo.C
View File

@ -112,7 +112,7 @@ Foam::boundaryInfo::boundaryInfo(const Time& runTime, const word& regionName)
const dictionary& dict = boundaryDict_[patchI].dict();
names_[patchI] = dict.dictName();
dict.read("type", types_[patchI]);
dict.readEntry("type", types_[patchI]);
if (polyPatch::constraintType(types_[patchI]))
{
constraint_[patchI] = true;

4
applications/utilities/preProcessing/createZeroDirectory/solverTemplate.C
View File

@ -120,12 +120,12 @@ Foam::dictionary Foam::solverTemplate::readFluidFieldTemplates
else if (modelType == "RAS")
{
turbPropDict.subDict(modelType)
.read("RASModel", turbulenceModel);
.readEntry("RASModel", turbulenceModel);
}
else if (modelType == "LES")
{
turbPropDict.subDict(modelType)
.read("LESModel", turbulenceModel);
.readEntry("LESModel", turbulenceModel);
}
else
{

2
modules/catalyst

Submodule modules/catalyst updated: 2ac2c5ec6e...4575b54c6f

14
src/OpenFOAM/db/IOobject/IOobjectReadHeader.C
View File

@ -67,11 +67,17 @@ bool Foam::IOobject::readHeader(Istream& is)
{
const dictionary headerDict(is);
is.version(headerDict.lookup("version"));
is.format(headerDict.lookup("format"));
headerClassName_ = word(headerDict.lookup("class"));
is.version
(
IOstreamOption::versionNumber
(
headerDict.get<float>("version")
)
);
is.format(headerDict.get<word>("format"));
headerClassName_ = headerDict.get<word>("class");
const word headerObject(headerDict.lookup("object"));
const word headerObject(headerDict.get<word>("object"));
if (IOobject::debug && headerObject != name())
{
IOWarningInFunction(is)

10
src/OpenFOAM/db/IOobjects/decomposedBlockData/decomposedBlockData.C
View File

@ -1166,8 +1166,14 @@ Foam::label Foam::decomposedBlockData::numBlocks(const fileName& fName)
)
{
dictionary headerDict(is);
is.version(headerDict.lookup("version"));
is.format(headerDict.lookup("format"));
is.version
(
IOstreamOption::versionNumber
(
headerDict.get<float>("version")
)
);
is.format(headerDict.get<word>("format"));
// Obtain number of blocks directly
if (headerDict.readIfPresent("blocks", nBlocks))

4
src/OpenFOAM/db/Time/Time.C
View File

@ -149,7 +149,7 @@ void Foam::Time::setControls()
if (startFrom == "startTime")
{
controlDict_.lookup("startTime") >> startTime_;
controlDict_.readEntry("startTime", startTime_);
}
else
{
@ -938,7 +938,7 @@ bool Foam::Time::stopAt(const stopAtControls stopCtrl) const
// Adjust endTime
if (stopCtrl == stopAtControls::saEndTime)
{
controlDict_.lookup("endTime") >> endTime_;
controlDict_.readEntry("endTime", endTime_);
}
return changed;

14
src/OpenFOAM/db/Time/TimeIO.C
View File

@ -344,7 +344,7 @@ void Foam::Time::readDict()
if (!deltaTchanged_)
{
deltaT_ = readScalar(controlDict_.lookup("deltaT"));
controlDict_.readEntry("deltaT", deltaT_);
}
if (controlDict_.found("writeControl"))
@ -369,7 +369,7 @@ void Foam::Time::readDict()
}
else
{
controlDict_.lookup("writeFrequency") >> writeInterval_;
controlDict_.readEntry("writeFrequency", writeInterval_);
}
@ -409,7 +409,7 @@ void Foam::Time::readDict()
if (controlDict_.found("timeFormat"))
{
const word formatName(controlDict_.lookup("timeFormat"));
const word formatName(controlDict_.get<word>("timeFormat"));
if (formatName == "general")
{
@ -441,7 +441,7 @@ void Foam::Time::readDict()
if (stopAt_ == saEndTime)
{
controlDict_.lookup("endTime") >> endTime_;
controlDict_.readEntry("endTime", endTime_);
}
else
{
@ -468,14 +468,14 @@ void Foam::Time::readDict()
if (controlDict_.found("writeFormat"))
{
writeStreamOption_.format(word(controlDict_.lookup("writeFormat")));
writeStreamOption_.format(controlDict_.get<word>("writeFormat"));
}
if (controlDict_.found("writePrecision"))
{
IOstream::defaultPrecision
(
readUint(controlDict_.lookup("writePrecision"))
controlDict_.get<unsigned int>("writePrecision")
);
Sout.precision(IOstream::defaultPrecision());
@ -495,7 +495,7 @@ void Foam::Time::readDict()
{
writeStreamOption_.compression
(
word(controlDict_.lookup("writeCompression"))
controlDict_.get<word>("writeCompression")
);
if

4
src/OpenFOAM/db/dictionary/dictionary.C
View File

@ -477,7 +477,7 @@ Foam::dictionary& Foam::dictionary::subDict(const word& keyword)
Foam::dictionary Foam::dictionary::subOrEmptyDict
(
const word& keyword,
const bool mustRead
const bool mandatory
) const
{
// Find non-recursive with patterns
@ -489,7 +489,7 @@ Foam::dictionary Foam::dictionary::subOrEmptyDict
return finder.dict();
}
if (mustRead)
if (mandatory)
{
FatalIOErrorInFunction(*this)
<< "'" << keyword

10
src/OpenFOAM/db/dictionary/dictionary.H
View File

@ -405,7 +405,7 @@ public:
explicit dictionary(const fileName& name);
//- Construct given the entry name, parent dictionary and Istream,
// reading entries until EOF
//- reading entries until EOF
dictionary
(
const fileName& name,
@ -414,11 +414,11 @@ public:
);
//- Construct top-level dictionary from Istream,
// reading entries until EOF
//- reading entries until EOF
dictionary(Istream& is);
//- Construct top-level dictionary from Istream,
// reading entries until EOF, optionally keeping the header
//- reading entries until EOF, optionally keeping the header
dictionary(Istream& is, bool keepHeader);
//- Copy construct given the parent dictionary
@ -604,7 +604,7 @@ public:
//
// \return true if the entry was found.
template<class T>
bool read
bool readEntry
(
const word& keyword,
T& val,
@ -682,7 +682,7 @@ public:
dictionary subOrEmptyDict
(
const word& keyword,
const bool mustRead = false
const bool mandatory = false
) const;
//- Find and return a sub-dictionary, otherwise return this dictionary.

6
src/OpenFOAM/db/dictionary/dictionaryTemplates.C
View File

@ -58,7 +58,7 @@ T Foam::dictionary::get
) const
{
T val;
read<T>(keyword, val, recursive, patternMatch);
readEntry<T>(keyword, val, recursive, patternMatch);
return val;
}
@ -196,7 +196,7 @@ T Foam::dictionary::lookupOrAddDefault
template<class T>
bool Foam::dictionary::read
bool Foam::dictionary::readEntry
(
const word& keyword,
T& val,
@ -238,7 +238,7 @@ bool Foam::dictionary::readIfPresent
) const
{
// Read is non-mandatory
return read<T>(keyword, val, recursive, patternMatch, false);
return readEntry<T>(keyword, val, recursive, patternMatch, false);
}

6
src/OpenFOAM/db/error/IOerror.C
View File

@ -44,9 +44,9 @@ Foam::IOerror::IOerror(const string& title)
Foam::IOerror::IOerror(const dictionary& errDict)
:
error(errDict),
ioFileName_(errDict.lookup("ioFileName")),
ioStartLineNumber_(readLabel(errDict.lookup("ioStartLineNumber"))),
ioEndLineNumber_(readLabel(errDict.lookup("ioEndLineNumber")))
ioFileName_(errDict.get<string>("ioFileName")),
ioStartLineNumber_(errDict.get<label>("ioStartLineNumber")),
ioEndLineNumber_(errDict.get<label>("ioEndLineNumber"))
{}

6
src/OpenFOAM/db/error/error.C
View File

@ -92,9 +92,9 @@ Foam::error::error(const dictionary& errDict)
:
std::exception(),
messageStream(errDict),
functionName_(errDict.lookup("functionName")),
sourceFileName_(errDict.lookup("sourceFileName")),
sourceFileLineNumber_(readLabel(errDict.lookup("sourceFileLineNumber"))),
functionName_(errDict.get<string>("functionName")),
sourceFileName_(errDict.get<string>("sourceFileName")),
sourceFileLineNumber_(errDict.get<label>("sourceFileLineNumber")),
throwExceptions_(false),
messageStreamPtr_(new OStringStream())
{

2
src/OpenFOAM/db/error/messageStream.C
View File

@ -54,7 +54,7 @@ Foam::messageStream::messageStream
Foam::messageStream::messageStream(const dictionary& dict)
:
title_(dict.lookup("title")),
title_(dict.get<string>("title")),
severity_(FATAL),
maxErrors_(0),
errorCount_(0)

2
src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
View File

@ -66,7 +66,7 @@ Foam::autoPtr<Foam::functionObject> Foam::functionObject::New
const dictionary& dict
)
{
const word functionType(dict.lookup("type"));
const word functionType(dict.get<word>("type"));
if (debug)
{

4
src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
View File

@ -309,11 +309,11 @@ bool Foam::functionObjectList::readFunctionObject
}
else if (funcDict.found("field"))
{
requiredFields.insert(wordRe(funcDict.lookup("field")));
requiredFields.insert(funcDict.get<wordRe>("field"));
}
else if (funcDict.found("fields"))
{
requiredFields.insert(wordReList(funcDict.lookup("fields")));
requiredFields.insert(funcDict.get<wordRes>("fields"));
}
// Insert named arguments

2
src/OpenFOAM/db/functionObjects/timeControl/timeControl.C
View File

@ -139,7 +139,7 @@ void Foam::timeControl::read(const dictionary& dict)
case ocCpuTime:
case ocAdjustableRunTime:
{
const scalar userTime = readScalar(dict.lookup(intervalName));
const scalar userTime = dict.get<scalar>(intervalName);
interval_ = time_.userTimeToTime(userTime);
break;
}

2
src/OpenFOAM/dimensionedTypes/dimensionedType/dimensionedType.C
View File

@ -316,7 +316,7 @@ void Foam::dimensioned<Type>::replace
template<class Type>
void Foam::dimensioned<Type>::read(const dictionary& dict)
{
dict.read(name_, value_);
dict.readEntry(name_, value_);
}

4
src/OpenFOAM/global/argList/argList.C
View File

@ -1187,7 +1187,7 @@ void Foam::argList::parse
if (decompDict.lookupOrDefault("distributed", false))
{
distributed_ = true;
decompDict.read("roots", roots);
decompDict.readEntry("roots", roots);
}
}
@ -1758,7 +1758,7 @@ void Foam::argList::displayDoc(bool source) const
string docBrowser = getEnv("FOAM_DOC_BROWSER");
if (docBrowser.empty())
{
docDict.read("docBrowser", docBrowser);
docDict.readEntry("docBrowser", docBrowser);
}
// Can use FOAM_DOC_BROWSER='application file://%f' if required

6
src/conversion/ccm/reader/ccmReaderMesh.C
View File

@ -1041,7 +1041,7 @@ void Foam::ccm::reader::readMonitoring
word zoneName;
if (iter.found())
{
iter().read("Label", zoneName);
iter().readEntry("Label", zoneName);
}
else
{
@ -2425,8 +2425,8 @@ void Foam::ccm::reader::addPatches
if (citer.found())
{
citer().read("Label", patchName);
citer().read("BoundaryType", patchType);
citer().readEntry("Label", patchName);
citer().readEntry("BoundaryType", patchType);
}
else
{

2
src/conversion/ccm/writer/ccmWriter.C
View File

@ -226,7 +226,7 @@ void Foam::ccm::writer::writeCellTable
// Tags containing 'Id' are integers
if (pos > 0)
{
dict.read(keyword, intVal);
dict.readEntry(keyword, intVal);
CCMIOWriteOpti
(

2
src/finiteVolume/fields/fvPatchFields/derived/mappedField/mappedPatchFieldBase.C
View File

@ -91,7 +91,7 @@ Foam::mappedPatchFieldBase<Type>::mappedPatchFieldBase
{
if (mapper_.mode() == mappedPatchBase::NEARESTCELL)
{
dict.read("interpolationScheme", interpolationScheme_);
dict.readEntry("interpolationScheme", interpolationScheme_);
}
}

18
src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
View File

@ -85,7 +85,7 @@ void Foam::fv::rotorDiskSource::checkData()
{
case ifFixed:
{
coeffs_.read("inletVelocity", inletVelocity_);
coeffs_.readEntry("inletVelocity", inletVelocity_);
break;
}
case ifSurfaceNormal:
@ -331,7 +331,7 @@ void Foam::fv::rotorDiskSource::createCoordinateSystem()
}
}
coeffs_.read("refDirection", refDir);
coeffs_.readEntry("refDirection", refDir);
cylindrical_.reset
(
@ -352,9 +352,9 @@ void Foam::fv::rotorDiskSource::createCoordinateSystem()
}
case gmSpecified:
{
coeffs_.read("origin", origin);
coeffs_.read("axis", axis);
coeffs_.read("refDirection", refDir);
coeffs_.readEntry("origin", origin);
coeffs_.readEntry("axis", axis);
coeffs_.readEntry("refDirection", refDir);
cylindrical_.reset
(
@ -521,7 +521,7 @@ void Foam::fv::rotorDiskSource::addSup
);
// Read the reference density for incompressible flow
coeffs_.read("rhoRef", rhoRef_);
coeffs_.readEntry("rhoRef", rhoRef_);
const vectorField Uin(inflowVelocity(eqn.psi()));
trim_->correct(Uin, force);
@ -574,17 +574,17 @@ bool Foam::fv::rotorDiskSource::read(const dictionary& dict)
{
if (cellSetOption::read(dict))
{
coeffs_.read("fields", fieldNames_);
coeffs_.readEntry("fields", fieldNames_);
applied_.setSize(fieldNames_.size(), false);
// Read coordinate system/geometry invariant properties
omega_ = rpmToRads(coeffs_.get<scalar>("rpm"));
coeffs_.read("nBlades", nBlades_);
coeffs_.readEntry("nBlades", nBlades_);
inletFlow_ = inletFlowTypeNames_.lookup("inletFlowType", coeffs_);
coeffs_.read("tipEffect", tipEffect_);
coeffs_.readEntry("tipEffect", tipEffect_);
const dictionary& flapCoeffs(coeffs_.subDict("flapCoeffs"));
flap_.beta0 = degToRad(flapCoeffs.get<scalar>("beta0"));

8
src/lumpedPointMotion/lumpedPointMovement.C
View File

@ -266,7 +266,7 @@ void Foam::lumpedPointMovement::readDict(const dictionary& dict)
// assume the worst
deleteDemandDrivenData(thresholdPtr_);
dict.read("axis", axis_);
dict.readEntry("axis", axis_);
division_ = 0;
if (dict.readIfPresent("division", division_))
@ -283,7 +283,7 @@ void Foam::lumpedPointMovement::readDict(const dictionary& dict)
dict.readIfPresent("relax", relax_);
dict.read("locations", locations_);
dict.readEntry("locations", locations_);
if (dict.readIfPresent("interpolationScheme", interpolationScheme_))
{
@ -304,8 +304,8 @@ void Foam::lumpedPointMovement::readDict(const dictionary& dict)
// TODO: calcFrequency_ = dict.lookupOrDefault("calcFrequency", 1);
commDict.read("inputName", inputName_);
commDict.read("outputName", outputName_);
commDict.readEntry("inputName", inputName_);
commDict.readEntry("outputName", outputName_);
commDict.readIfPresent("logName", logName_);
inputFormat_ = lumpedPointState::formatNames.lookup

4
src/lumpedPointMotion/lumpedPointState.C
View File

@ -83,8 +83,8 @@ void Foam::lumpedPointState::calcRotations() const
void Foam::lumpedPointState::readDict(const dictionary& dict)
{
dict.read("points", points_);
dict.read("angles", angles_);
dict.readEntry("points", points_);
dict.readEntry("angles", angles_);
degrees_ = dict.lookupOrDefault("degrees", false);
deleteDemandDrivenData(rotationPtr_);
}

2
src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
View File

@ -195,7 +195,7 @@ Foam::searchableSurfaceCollection::searchableSurfaceCollection
const dictionary& subDict = dict.subDict(instance_[surfI]);
subDict.read("scale", scale_[surfI]);
subDict.readEntry("scale", scale_[surfI]);
transform_.set
(
surfI,

4
src/meshTools/sets/cellSources/boxToCell/boxToCell.C
View File

@ -90,11 +90,11 @@ Foam::boxToCell::boxToCell
if (dict.found("box"))
{
bbs_.resize(1);
dict.read("box", bbs_.first());
dict.readEntry("box", bbs_.first());
}
else
{
dict.read("boxes", bbs_);
dict.readEntry("boxes", bbs_);
}
}

4
src/meshTools/sets/faceSources/boxToFace/boxToFace.C
View File

@ -90,11 +90,11 @@ Foam::boxToFace::boxToFace
if (dict.found("box"))
{
bbs_.resize(1);
dict.read("box", bbs_.first());
dict.readEntry("box", bbs_.first());
}
else
{
dict.read("boxes", bbs_);
dict.readEntry("boxes", bbs_);
}
}

4
src/meshTools/sets/pointSources/boxToPoint/boxToPoint.C
View File

@ -90,11 +90,11 @@ Foam::boxToPoint::boxToPoint
if (dict.found("box"))
{
bbs_.resize(1);
dict.read("box", bbs_.first());
dict.readEntry("box", bbs_.first());
}
else
{
dict.read("boxes", bbs_);
dict.readEntry("boxes", bbs_);
}
}

2
src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C
View File

@ -260,7 +260,7 @@ bool pointNoise::read(const dictionary& dict)
inputFileNames_.resize(1);
// Note: lookup uses same keyword as used by the CSV constructor
dict.read("file", inputFileNames_.first());
dict.readEntry("file", inputFileNames_.first());
}
return true;

5
src/randomProcesses/noise/noiseModels/surfaceNoise/surfaceNoise.C
View File

@ -431,15 +431,16 @@ bool surfaceNoise::read(const dictionary& dict)
if (!dict.readIfPresent("files", inputFileNames_))
{
inputFileNames_.resize(1);
dict.read("file", inputFileNames_.first());
dict.readEntry("file", inputFileNames_.first());
}
dict.readIfPresent("fftWriteInterval", fftWriteInterval_);
dict.readIfPresent("p", pName_);
dict.read("reader", readerType_);
readerType_ = dict.get<word>("reader");
const word writerType(dict.get<word>("writer"));
dictionary optDict
(
dict.subOrEmptyDict("writeOptions").subOrEmptyDict(writerType)

4
src/sampling/probes/probes.C
View File

@ -315,8 +315,8 @@ Foam::probes::probes
bool Foam::probes::read(const dictionary& dict)
{
dict.read("probeLocations", static_cast<pointField&>(*this));
dict.read("fields", fieldSelection_);
dict.readEntry("probeLocations", static_cast<pointField&>(*this));
dict.readEntry("fields", fieldSelection_);
dict.readIfPresent("fixedLocations", fixedLocations_);
if (dict.readIfPresent("interpolationScheme", interpolationScheme_))

6
src/sampling/sampledSet/sampledSets/sampledSets.C
View File

@ -226,11 +226,11 @@ bool Foam::sampledSets::read(const dictionary& dict)
if (dict_.found("sets"))
{
dict_.read("fields", fieldSelection_);
dict_.readEntry("fields", fieldSelection_);
clearFieldGroups();
dict.read("interpolationScheme", interpolationScheme_);
dict.read("setFormat", writeFormat_);
dict.readEntry("interpolationScheme", interpolationScheme_);
dict.readEntry("setFormat", writeFormat_);
PtrList<sampledSet> newList
(

2
src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
View File

@ -493,7 +493,7 @@ Foam::sampledIsoSurface::sampledIsoSurface
if (zoneID_.index() != -1)
{
dict.read("exposedPatchName", exposedPatchName_);
dict.readEntry("exposedPatchName", exposedPatchName_);
if (mesh.boundaryMesh().findPatchID(exposedPatchName_) == -1)
{

2
src/sampling/sampledSurface/sampledCuttingPlane/sampledCuttingPlane.C
View File

@ -312,7 +312,7 @@ Foam::sampledCuttingPlane::sampledCuttingPlane
{
if (zoneID_.index() != -1)
{
dict.read("exposedPatchName", exposedPatchName_);
dict.readEntry("exposedPatchName", exposedPatchName_);
if (mesh.boundaryMesh().findPatchID(exposedPatchName_) == -1)
{

5
src/sampling/sampledSurface/sampledSurfaces/sampledSurfaces.C
View File

@ -259,9 +259,8 @@ bool Foam::sampledSurfaces::read(const dictionary& dict)
{
sampleFaceScheme_ = dict.lookupOrDefault<word>("sampleScheme", "cell");
dict.read("interpolationScheme", sampleNodeScheme_);
dict.read("fields", fieldSelection_);
dict.readEntry("interpolationScheme", sampleNodeScheme_);
dict.readEntry("fields", fieldSelection_);
const word writeType(dict.get<word>("surfaceFormat"));

2
src/sampling/sampledSurface/writers/ensight/ensightSurfaceWriter.C
View File

@ -159,7 +159,7 @@ void Foam::ensightSurfaceWriter::updateMesh
IFstream is(baseDir/"fieldsDict");
if (is.good() && dict.read(is))
{
dict.read(is);
// ... any futher actions
}
}

2
src/sampling/sampledSurface/writers/nastran/nastranSurfaceWriter.C
View File

@ -343,7 +343,7 @@ Foam::nastranSurfaceWriter::nastranSurfaceWriter(const dictionary& options)
}
List<Pair<word>> fieldPairs;
options.read("fields", fieldPairs);
options.readEntry("fields", fieldPairs);
for (const Pair<word>& item : fieldPairs)
{

2
src/sampling/surfMeshSample/surfMeshSamplers/surfMeshSamplers.C
View File

@ -348,7 +348,7 @@ bool Foam::surfMeshSamplers::read(const dictionary& dict)
{
sampleScheme_ = dict.lookupOrDefault<word>("sampleScheme", "cell");
dict.read("fields", fieldSelection_);
dict.readEntry("fields", fieldSelection_);
fieldSelection_.uniq();
Info<< type() << " fields: " << flatOutput(fieldSelection_) << nl;

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

@ -237,10 +237,10 @@ bool Foam::fv::multiphaseMangrovesSource::read(const dictionary& dict)
<< exit(FatalError);
}
modelDict.read("a", aZone_[i]);
modelDict.read("N", NZone_[i]);
modelDict.read("Cm", CmZone_[i]);
modelDict.read("Cd", CdZone_[i]);
modelDict.readEntry("a", aZone_[i]);
modelDict.readEntry("N", NZone_[i]);
modelDict.readEntry("Cm", CmZone_[i]);
modelDict.readEntry("Cd", CdZone_[i]);
}
return true;

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

@ -231,7 +231,7 @@ bool Foam::fv::multiphaseMangrovesTurbulenceModel::read(const dictionary& dict)
if (coeffs_.found("epsilon"))
{
fieldNames_.resize(1);
coeffs_.read("epsilon", fieldNames_.first());
coeffs_.readEntry("epsilon", fieldNames_.first());
}
else
{
@ -269,11 +269,11 @@ bool Foam::fv::multiphaseMangrovesTurbulenceModel::read(const dictionary& dict)
<< exit(FatalError);
}
modelDict.read("a", aZone_[i]);
modelDict.read("N", NZone_[i]);
modelDict.read("Ckp", CkpZone_[i]);
modelDict.read("Cep", CepZone_[i]);
modelDict.read("Cd", CdZone_[i]);
modelDict.readEntry("a", aZone_[i]);
modelDict.readEntry("N", NZone_[i]);
modelDict.readEntry("Ckp", CkpZone_[i]);
modelDict.readEntry("Cep", CepZone_[i]);
modelDict.readEntry("Cd", CdZone_[i]);
}
return true;

8
src/waveModels/waveGenerationModels/derived/irregularMultiDirectional/irregularMultiDirectionalWaveModel.C
View File

@ -262,10 +262,10 @@ bool Foam::waveModels::irregularMultiDirectional::readDict
{
if (irregularWaveModel::readDict(overrideDict))
{
dictionary::read("wavePeriods", irregWavePeriods_);
dictionary::read("waveHeights", irregWaveHeights_);
dictionary::read("wavePhases", irregWavePhases_);
dictionary::read("waveDirs", irregWaveDirs_);
readEntry("wavePeriods", irregWavePeriods_);
readEntry("waveHeights", irregWaveHeights_);
readEntry("wavePhases", irregWavePhases_);
readEntry("waveDirs", irregWaveDirs_);
irregWaveLengths_ = irregWaveHeights_;

8
src/waveModels/waveGenerationModels/derived/streamFunction/streamFunctionWaveModel.C
View File

@ -223,10 +223,10 @@ bool Foam::waveModels::streamFunction::readDict(const dictionary& overrideDict)
{
if (regularWaveModel::readDict(overrideDict))
{
overrideDict.read("uMean", uMean_);
overrideDict.read("waveLength", waveLength_);
overrideDict.read("Bjs", Bjs_);
overrideDict.read("Ejs", Ejs_);
overrideDict.readEntry("uMean", uMean_);
overrideDict.readEntry("waveLength", waveLength_);
overrideDict.readEntry("Bjs", Bjs_);
overrideDict.readEntry("Ejs", Ejs_);
return true;
}

2
src/waveModels/waveModel/waveModelNew.C
View File

@ -51,7 +51,7 @@ Foam::autoPtr<Foam::waveModel> Foam::waveModel::New
if (waveDict.found(patch.name()))
{
patchDict = waveDict.subDict(patch.name());
patchDict.read("waveModel", modelType);
modelType = patchDict.get<word>("waveModel");
}
else
{

2
wmake/rules/General/general
View File

@ -1,5 +1,5 @@
#-------------------------------*- makefile -*---------------------------------
WM_VERSION = OPENFOAM=1806
WM_VERSION = OPENFOAM=1807
AR = ar
ARFLAGS = cr