zhyang-dev/OpenFOAM-5.x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

masterUncollatedFileOperation: Updated to avoid warning from clang

Browse Source
This commit is contained in:
Henry Weller
2017-07-11 15:11:38 +01:00
parent 4e024cd274
commit b4e88f260b
4 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
applications/utilities/parallelProcessing/decomposePar/decomposePar.C
View File

@ -526,7 +526,8 @@ int main(int argc, char *argv[])
<< endl; << endl;
} }
fileOperations::collatedFileOperation::maxThreadFileBufferSize = bufSz; fileOperations::collatedFileOperation::maxThreadFileBufferSize =
bufSz;
} }

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

@ -459,7 +459,8 @@ masterUncollatedFileOperation
if (verbose) if (verbose)
{ {
Info<< "I/O : " << typeName Info<< "I/O : " << typeName
<< " (maxMasterFileBufferSize " << maxMasterFileBufferSize << ')' << endl; << " (maxMasterFileBufferSize " << maxMasterFileBufferSize << ')'
<< endl;
} }
if (regIOobject::fileModificationChecking == regIOobject::timeStampMaster) if (regIOobject::fileModificationChecking == regIOobject::timeStampMaster)
@ -703,8 +704,9 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::filePath
// Determine master filePath and scatter // Determine master filePath and scatter
fileName objPath; fileName objPath;
pathType searchType; pathType searchType = NOTFOUND;
word newInstancePath; word newInstancePath;
if (Pstream::master()) if (Pstream::master())
{ {
objPath = filePathInfo objPath = filePathInfo
@ -716,11 +718,13 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::filePath
newInstancePath newInstancePath
); );
} }
{ {
label masterType(searchType); label masterType(searchType);
Pstream::scatter(masterType); Pstream::scatter(masterType);
searchType = pathType(masterType); searchType = pathType(masterType);
} }
Pstream::scatter(newInstancePath); Pstream::scatter(newInstancePath);
@ -780,8 +784,9 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::dirPath
// Determine master dirPath and scatter // Determine master dirPath and scatter
fileName objPath; fileName objPath;
pathType searchType; pathType searchType = NOTFOUND;
word newInstancePath; word newInstancePath;
if (Pstream::master()) if (Pstream::master())
{ {
objPath = filePathInfo objPath = filePathInfo
@ -793,6 +798,7 @@ Foam::fileName Foam::fileOperations::masterUncollatedFileOperation::dirPath
newInstancePath newInstancePath
); );
} }
{ {
label masterType(searchType); label masterType(searchType);
Pstream::scatter(masterType); Pstream::scatter(masterType);

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

@ -46,7 +46,7 @@ namespace fileOperations
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
Foam::fileName Foam::fileOperations::uncollatedFileOperation::doFilePath Foam::fileName Foam::fileOperations::uncollatedFileOperation::filePathInfo
( (
const bool checkGlobal, const bool checkGlobal,
const bool isFile, const bool isFile,
@ -357,7 +357,7 @@ Foam::fileName Foam::fileOperations::uncollatedFileOperation::filePath
<< " checkGlobal:" << checkGlobal << endl; << " checkGlobal:" << checkGlobal << endl;
} }
fileName objPath(doFilePath(checkGlobal, true, io)); fileName objPath(filePathInfo(checkGlobal, true, io));
if (debug) if (debug)
{ {
@ -383,7 +383,7 @@ Foam::fileName Foam::fileOperations::uncollatedFileOperation::dirPath
<< " checkGlobal:" << checkGlobal << endl; << " checkGlobal:" << checkGlobal << endl;
} }
fileName objPath(doFilePath(checkGlobal, false, io)); fileName objPath(filePathInfo(checkGlobal, false, io));
if (debug) if (debug)
{ {

2
src/OpenFOAM/global/fileOperations/uncollatedFileOperation/uncollatedFileOperation.H
View File

@ -55,7 +55,7 @@ class uncollatedFileOperation
//- Search for an object. //- Search for an object.
// checkGlobal : also check undecomposed case // checkGlobal : also check undecomposed case
// isFile : true:check for file false:check for directory // isFile : true:check for file false:check for directory
fileName doFilePath fileName filePathInfo
( (
const bool checkGlobal, const bool checkGlobal,
const bool isFile, const bool isFile,