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: use readScalar(std::string) and readInt(std::string) wrappers

Browse Source
This commit is contained in:
Mark Olesen
2017-11-28 10:08:36 +01:00
parent c0e86940b0
commit fab9fb4332
4 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1201,7 +1201,7 @@ Foam::Time& Foam::Time::operator++()
// reinterpretation of the word // reinterpretation of the word
if if
( (
readScalar(dimensionedScalar::name().c_str(), timeNameValue) readScalar(dimensionedScalar::name(), timeNameValue)
&& (mag(timeNameValue - oldTimeValue - userDeltaT) > timeTol) && (mag(timeNameValue - oldTimeValue - userDeltaT) > timeTol)
) )
{ {
@ -1209,7 +1209,7 @@ Foam::Time& Foam::Time::operator++()
while while
( (
precision_ < maxPrecision_ precision_ < maxPrecision_
&& readScalar(dimensionedScalar::name().c_str(), timeNameValue) && readScalar(dimensionedScalar::name(), timeNameValue)
&& (mag(timeNameValue - oldTimeValue - userDeltaT) > timeTol) && (mag(timeNameValue - oldTimeValue - userDeltaT) > timeTol)
) )
{ {
@ -1242,7 +1242,7 @@ Foam::Time& Foam::Time::operator++()
scalar oldTimeNameValue = -VGREAT; scalar oldTimeNameValue = -VGREAT;
if if
( (
readScalar(oldTimeName.c_str(), oldTimeNameValue) readScalar(oldTimeName, oldTimeNameValue)
&& ( && (
sign(timeNameValue - oldTimeNameValue) sign(timeNameValue - oldTimeNameValue)
!= sign(deltaT_) != sign(deltaT_)

6
src/OpenFOAM/global/fileOperations/fileOperation/fileOperation.C
View File

@ -105,12 +105,8 @@ Foam::instantList Foam::fileOperation::sortTimes
// Read and parse all the entries in the directory // Read and parse all the entries in the directory
forAll(dirEntries, i) forAll(dirEntries, i)
{ {
//IStringStream timeStream(dirEntries[i]);
//token timeToken(timeStream);
//if (timeToken.isNumber() && timeStream.eof())
scalar timeValue; scalar timeValue;
if (readScalar(dirEntries[i].c_str(), timeValue)) if (readScalar(dirEntries[i], timeValue))
{ {
Times[nTimes].value() = timeValue; Times[nTimes].value() = timeValue;
Times[nTimes].name() = dirEntries[i]; Times[nTimes].name() = dirEntries[i];

11
src/OpenFOAM/global/fileOperations/masterUncollatedFileOperation/masterUncollatedFileOperation.C
View File

@ -291,25 +291,24 @@ Foam::fileOperations::masterUncollatedFileOperation::splitProcessorPath
local = objectPath.substr(pos+9); local = objectPath.substr(pos+9);
} }
label proci;
pos = local.find('/'); pos = local.find('/');
if (pos == string::npos) if (pos == string::npos)
{ {
// processorXXX without local // processorXXX without local
label proci; if (Foam::read(local, proci))
if (Foam::read(local.c_str(), proci))
{ {
local.clear(); local.clear();
return proci; return proci;
} }
return -1;
} }
string procName(local.substr(0, pos)); else if (Foam::read(local.substr(0, pos), proci))
label proci;
if (Foam::read(procName.c_str(), proci))
{ {
local = local.substr(pos+1); local = local.substr(pos+1);
return proci; return proci;
} }
return -1; return -1;
} }

2
src/Pstream/mpi/UPstream.C
View File

@ -176,7 +176,7 @@ bool Foam::UPstream::init(int& argc, char**& argv)
int bufSize = 0; int bufSize = 0;
const std::string str = Foam::getEnv("MPI_BUFFER_SIZE"); const std::string str = Foam::getEnv("MPI_BUFFER_SIZE");
if (str.empty() || !Foam::read(str.c_str(), bufSize) || bufSize <= 0) if (str.empty() || !Foam::read(str, bufSize) || bufSize <= 0)
{ {
bufSize = mpiBufferSize; bufSize = mpiBufferSize;
} }