diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
index b6eaf392589828b6bbac197779f451a63ad6e1b0..a7328cb48737d06d58b992c8885033b7e1d903dc 100644
--- a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
+++ b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -105,7 +105,7 @@ int main(int argc, char *argv[])
// determine the existing processor count directly
label nProcs = 0;
- while (dir(runTime.path()/(word("processor") + name(nProcs))))
+ while (isDir(runTime.path()/(word("processor") + name(nProcs))))
{
++nProcs;
}
@@ -480,7 +480,7 @@ int main(int argc, char *argv[])
// Any uniform data to copy/link?
fileName uniformDir("uniform");
- if (dir(runTime.timePath()/uniformDir))
+ if (isDir(runTime.timePath()/uniformDir))
{
Info<< "Detected additional non-decomposed files in "
<< runTime.timePath()/uniformDir
diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
index ac08b176453c5b54f0824787ce08f58f61c0b599..20def06b9c9cae6f6b0f1b3d9d7b8c33ddf6a5da 100644
--- a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
+++ b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -63,7 +63,7 @@ int main(int argc, char *argv[])
// determine the processor count directly
label nProcs = 0;
- while (dir(args.path()/(word("processor") + name(nProcs))))
+ while (isDir(args.path()/(word("processor") + name(nProcs))))
{
++nProcs;
}
@@ -383,7 +383,7 @@ int main(int argc, char *argv[])
// the master processor.
fileName uniformDir0 = databases[0].timePath()/"uniform";
- if (dir(uniformDir0))
+ if (isDir(uniformDir0))
{
cp(uniformDir0, runTime.timePath());
}
diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
index 379dd70b9166c580c66786bc637a83cb0b39bcf2..c46a41b2738795d7335106179fdd9dd9c343b9e9 100644
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
+++ b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
@@ -503,7 +503,7 @@ int main(int argc, char *argv[])
# include "setRootCase.H"
// Create processor directory if non-existing
- if (!Pstream::master() && !dir(args.path()))
+ if (!Pstream::master() && !isDir(args.path()))
{
Pout<< "Creating case directory " << args.path() << endl;
mkDir(args.path());
@@ -525,7 +525,7 @@ int main(int argc, char *argv[])
const fileName meshDir = runTime.path()/masterInstDir/polyMesh::meshSubDir;
boolList haveMesh(Pstream::nProcs(), false);
- haveMesh[Pstream::myProcNo()] = dir(meshDir);
+ haveMesh[Pstream::myProcNo()] = isDir(meshDir);
Pstream::gatherList(haveMesh);
Pstream::scatterList(haveMesh);
Info<< "Per processor mesh availability : " << haveMesh << endl;
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
index 8fc7636f2a89376763533c6c720d1eff6694eaea..bb7c1880f00cc7a8fd9d5a304c84100ac8924b75 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -131,7 +131,7 @@ int main(int argc, char *argv[])
if (Pstream::master())
{
- if (dir(postProcPath))
+ if (isDir(postProcPath))
{
rmDir(postProcPath);
}
diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
index 1d31a4e31c6e292bc2a3dcd1e7fc956e90b03a6b..329dda87f9ebbbb4f3821ee6b93f2125e7c288f4 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/foamToEnsightParts.C
@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
// Ensight and Ensight/data directories must exist
// do not remove old data - we might wish to convert new results
// or a particular time interval
- if (dir(ensightDir))
+ if (isDir(ensightDir))
{
Info<<"Warning: reusing existing directory" << nl
<< " " << ensightDir << endl;
@@ -324,7 +324,7 @@ int main(int argc, char *argv[])
{
const word& cloudName = cloudIter.key();
- if (!dir(runTime.timePath()/regionPrefix/"lagrangian"/cloudName))
+ if (!isDir(runTime.timePath()/regionPrefix/"lagrangian"/cloudName))
{
continue;
}
diff --git a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
index 81ac4facac9209f06fe61ba8e5503c60f0764260..7fc54a8cf2f76293c0a0e528a3d9f21260771db2 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToFieldview9/foamToFieldview9.C
@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
// make a directory called FieldView in the case
fileName fvPath(runTime.path()/"Fieldview");
- if (dir(fvPath))
+ if (isDir(fvPath))
{
rmDir(fvPath);
}
@@ -346,7 +346,7 @@ int main(int argc, char *argv[])
// Output the magic number.
writeInt(fvFile, FV_MAGIC);
-
+
// Output file header and version number.
writeStr80(fvFile, "FIELDVIEW");
@@ -417,7 +417,7 @@ int main(int argc, char *argv[])
{
if (volFieldPtrs[fieldI] == NULL)
{
- Info<< " dummy field for "
+ Info<< " dummy field for "
<< volFieldNames[fieldI].c_str() << endl;
}
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
index 45c5f3799691e479e453dd664af447a2f45895bc..e03c76c05727a9f2ef596241372bb29c979e5eaa 100644
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -333,7 +333,7 @@ int main(int argc, char *argv[])
regionPrefix = regionName;
}
- if (dir(fvPath))
+ if (isDir(fvPath))
{
if
(
diff --git a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
index 779cddac39ba5c59282cdc093363755f11d63121..7a8fd89e9ed1529b86acfcf3c82f67a11dd474fd 100644
--- a/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
+++ b/applications/utilities/postProcessing/graphics/PV3FoamReader/vtkPV3Foam/vtkPV3Foam.C
@@ -228,7 +228,7 @@ Foam::vtkPV3Foam::vtkPV3Foam
// avoid argList and get rootPath/caseName directly from the file
fileName fullCasePath(fileName(FileName).path());
- if (!dir(fullCasePath))
+ if (!isDir(fullCasePath))
{
return;
}
@@ -518,7 +518,7 @@ double* Foam::vtkPV3Foam::findTimes(int& nTimeSteps)
if
(
- file(runTime.path()/timeName/meshDir_/"points")
+ isFile(runTime.path()/timeName/meshDir_/"points")
&& IOobject("points", timeName, meshDir_, runTime).headerOk()
)
{
diff --git a/applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/vtkFoam.C b/applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/vtkFoam.C
index 6d6eef9b5fbcd6c3c13f6f2bac0ec14e9cd01e60..6a1830b5d14dd60a851496247830f9a6942c983c 100644
--- a/applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/vtkFoam.C
+++ b/applications/utilities/postProcessing/graphics/PVFoamReader/vtkFoam/vtkFoam.C
@@ -194,7 +194,7 @@ void Foam::vtkFoam::updateSelectedRegions()
// Read the selected patches and add to the region list
for (int i=0; i<nRegions; i++)
{
- selectedRegions_[i] =
+ selectedRegions_[i] =
reader_->GetRegionSelection()->GetArraySetting(i);
}
}
@@ -282,7 +282,7 @@ void Foam::vtkFoam::convertMesh()
else
{
// A patch already existent in the list and which
- // continues to exist found
+ // continues to exist found
regioni++;
}
}
@@ -391,7 +391,7 @@ Foam::vtkFoam::vtkFoam(const char* const FileName, vtkFoamReader* reader)
{
fileName fullCasePath(fileName(FileName).path());
- if (!dir(fullCasePath))
+ if (!isDir(fullCasePath))
{
return;
}
@@ -572,7 +572,7 @@ void Foam::vtkFoam::Update()
{
Info<< "Reading Mesh" << endl;
}
- meshPtr_ =
+ meshPtr_ =
new fvMesh
(
IOobject
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
index f01839a9308d826bfe3fdb26c5bda279ee437e39..90f2d3f415ab396b48720e58f20c9bb4f9f2b7ac 100644
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/USERD_set_filenames.H
@@ -47,7 +47,7 @@ int USERD_set_filenames
}
caseDir = tmp;
- if (!dir(rootDir/caseDir))
+ if (!isDir(rootDir/caseDir))
{
Info<< rootDir/caseDir << " is not a valid directory."
<< endl;
@@ -144,7 +144,7 @@ int USERD_set_filenames
}
isTensor[n] = isitTensor;
}
-
+
bool lagrangianNamesFound = false;
label n = 0;
while (!lagrangianNamesFound && n < Num_time_steps)
@@ -176,7 +176,7 @@ int USERD_set_filenames
Info << "[Found lagrangian]" << endl;
delete sprayPtr;
-
+
sprayPtr = new Cloud<passiveParticle>(*meshPtr);
IOobjectList objects(*meshPtr, runTime.timeName(), "lagrangian");
diff --git a/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C b/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
index 10b29fc8b31d1814b1c2a461157f8465b408feb2..11fd038f16a5bab083da0b514d65b79d418bbc7a 100644
--- a/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
+++ b/applications/utilities/postProcessing/graphics/fieldview9Reader/fieldview9Reader.C
@@ -132,8 +132,8 @@ static void errorMsg(const string& msg)
// Simple check if directory is valid case directory.
static bool validCase(const fileName& rootAndCase)
{
- //if (dir(rootAndCase/"system") && dir(rootAndCase/"constant"))
- if (dir(rootAndCase/"constant"))
+ //if (isDir(rootAndCase/"system") && isDir(rootAndCase/"constant"))
+ if (isDir(rootAndCase/"constant"))
{
return true;
}
@@ -528,7 +528,7 @@ void user_query_file_function
return;
}
-
+
}
fileName rootDir(rootAndCase.path());
diff --git a/applications/utilities/postProcessing/velocityField/Mach/Mach.C b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
index 917a53668f25c7171fd12bd1c5ce6567a361ac00..02c69df34a07f8b44668dc2a69190ae62ad80101 100644
--- a/applications/utilities/postProcessing/velocityField/Mach/Mach.C
+++ b/applications/utilities/postProcessing/velocityField/Mach/Mach.C
@@ -63,7 +63,7 @@ void Foam::calc(const argList& args, const Time& runTime, const fvMesh& mesh)
volVectorField U(Uheader, mesh);
- if (file(runTime.constantPath()/"thermophysicalProperties"))
+ if (isFile(runTime.constantPath()/"thermophysicalProperties"))
{
// thermophysical Mach
autoPtr<basicThermo> thermo
diff --git a/src/OSspecific/Unix/Unix.C b/src/OSspecific/Unix/Unix.C
index c3479810d47e0c7061dbde9b69c2abf54dc6be41..ee6fa8188829a62f17f717028a6dea4c690abc3b 100644
--- a/src/OSspecific/Unix/Unix.C
+++ b/src/OSspecific/Unix/Unix.C
@@ -23,7 +23,7 @@ License
Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
Description
- UNIX versions of the functions declared in OSspecific.H.
+ UNIX versions of the functions declared in OSspecific.H
\*---------------------------------------------------------------------------*/
@@ -218,7 +218,7 @@ Foam::fileName Foam::findEtcFile(const fileName& name, bool mandatory)
// Search user files:
// ~~~~~~~~~~~~~~~~~~
fileName searchDir = home()/".OpenFOAM";
- if (dir(searchDir))
+ if (isDir(searchDir))
{
// Check for user file in ~/.OpenFOAM/VERSION
fileName fullName = searchDir/FOAMversion/name;
@@ -239,7 +239,7 @@ Foam::fileName Foam::findEtcFile(const fileName& name, bool mandatory)
// Search site files:
// ~~~~~~~~~~~~~~~~~~
searchDir = getEnv("WM_PROJECT_INST_DIR");
- if (dir(searchDir))
+ if (isDir(searchDir))
{
// Check for site file in $WM_PROJECT_INST_DIR/site/VERSION
fileName fullName = searchDir/"site"/FOAMversion/name;
@@ -259,7 +259,7 @@ Foam::fileName Foam::findEtcFile(const fileName& name, bool mandatory)
// Search installation files:
// ~~~~~~~~~~~~~~~~~~~~~~~~~~
searchDir = getEnv("WM_PROJECT_DIR");
- if (dir(searchDir))
+ if (isDir(searchDir))
{
// Check for shipped OpenFOAM file in $WM_PROJECT_DIR/etc
fileName fullName = searchDir/"etc"/name;
@@ -476,21 +476,21 @@ Foam::fileName::Type Foam::type(const fileName& name)
// Does the name exist in the filing system?
bool Foam::exists(const fileName& name)
{
- return mode(name) || file(name);
+ return mode(name) || isFile(name);
}
-// Does the file exist
-bool Foam::file(const fileName& name)
+// Does the directory exist
+bool Foam::isDir(const fileName& name)
{
- return S_ISREG(mode(name)) || S_ISREG(mode(name + ".gz"));
+ return S_ISDIR(mode(name));
}
-// Does the directory exist
-bool Foam::dir(const fileName& name)
+// Does the file exist
+bool Foam::isFile(const fileName& name)
{
- return S_ISDIR(mode(name));
+ return S_ISREG(mode(name)) || S_ISREG(mode(name + ".gz"));
}
@@ -641,7 +641,7 @@ bool Foam::cp(const fileName& src, const fileName& dest)
}
// Make sure the destination directory exists.
- if (!dir(destFile.path()) && !mkDir(destFile.path()))
+ if (!isDir(destFile.path()) && !mkDir(destFile.path()))
{
return false;
}
@@ -681,7 +681,7 @@ bool Foam::cp(const fileName& src, const fileName& dest)
}
// Make sure the destination directory exists.
- if (!dir(destFile) && !mkDir(destFile))
+ if (!isDir(destFile) && !mkDir(destFile))
{
return false;
}
@@ -806,7 +806,7 @@ bool Foam::rmDir(const fileName& directory)
{
if (Unix::debug)
{
- Info<< "rmdir(const fileName&) : "
+ Info<< "rmDir(const fileName&) : "
<< "removing directory " << directory << endl;
}
@@ -817,7 +817,7 @@ bool Foam::rmDir(const fileName& directory)
// Attempt to open directory and set the structure pointer
if ((source = opendir(directory.c_str())) == NULL)
{
- WarningIn("rmdir(const fileName&)")
+ WarningIn("rmDir(const fileName&)")
<< "cannot open directory " << directory << endl;
return false;
@@ -837,7 +837,7 @@ bool Foam::rmDir(const fileName& directory)
{
if (!rmDir(path))
{
- WarningIn("rmdir(const fileName&)")
+ WarningIn("rmDir(const fileName&)")
<< "failed to remove directory " << fName
<< " while removing directory " << directory
<< endl;
@@ -851,7 +851,7 @@ bool Foam::rmDir(const fileName& directory)
{
if (!rm(path))
{
- WarningIn("rmdir(const fileName&)")
+ WarningIn("rmDir(const fileName&)")
<< "failed to remove file " << fName
<< " while removing directory " << directory
<< endl;
@@ -867,7 +867,7 @@ bool Foam::rmDir(const fileName& directory)
if (!rm(directory))
{
- WarningIn("rmdir(const fileName&)")
+ WarningIn("rmDir(const fileName&)")
<< "failed to remove directory " << directory << endl;
closedir(source);
diff --git a/src/OpenFOAM/db/IOobject/IOobject.C b/src/OpenFOAM/db/IOobject/IOobject.C
index 1883f773b9c6e0b10dc1d4691ebe5af93db7d10f..dc800086335dde085433e2041c7bc34efaa983c2 100644
--- a/src/OpenFOAM/db/IOobject/IOobject.C
+++ b/src/OpenFOAM/db/IOobject/IOobject.C
@@ -61,7 +61,7 @@ bool Foam::IOobject::IOobject::fileNameComponents
name.clear();
// called with directory
- if (::Foam::dir(path))
+ if (::Foam::isDir(path))
{
WarningIn("IOobject::fileNameComponents(const fileName&, ...)")
<< " called with directory: " << path << "\n";
@@ -269,7 +269,7 @@ Foam::fileName Foam::IOobject::filePath() const
fileName path = this->path();
fileName objectPath = path/name();
- if (file(objectPath))
+ if (isFile(objectPath))
{
return objectPath;
}
@@ -288,13 +288,13 @@ Foam::fileName Foam::IOobject::filePath() const
rootPath()/caseName()
/".."/instance()/db_.dbDir()/local()/name();
- if (file(parentObjectPath))
+ if (isFile(parentObjectPath))
{
return parentObjectPath;
}
}
- if (!dir(path))
+ if (!isDir(path))
{
word newInstancePath = time().findInstancePath(instant(instance()));
@@ -306,7 +306,7 @@ Foam::fileName Foam::IOobject::filePath() const
/newInstancePath/db_.dbDir()/local()/name()
);
- if (file(fName))
+ if (isFile(fName))
{
return fName;
}
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.C b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
index 9f923d8fceaea82f8c7288c83ffe7068b61500b0..a55f68a42518df908f7cfd1ec746027b92188e39 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.C
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
@@ -48,7 +48,7 @@ Foam::IOobjectList::IOobjectList
{
word newInstance = instance;
- if (!dir(db.path(instance)))
+ if (!isDir(db.path(instance)))
{
newInstance = db.time().findInstancePath(instant(instance));
@@ -59,7 +59,7 @@ Foam::IOobjectList::IOobjectList
}
// Create list file names in directory
- fileNameList ObjectNames =
+ fileNameList ObjectNames =
readDir(db.path(newInstance, db.dbDir()/local), fileName::FILE);
forAll(ObjectNames, i)
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
index b4be5d37fe8f28b001877fd52fad71051ae27878..efeb7922679a909cffb745d4355e80751fb33467 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/IFstream.C
@@ -54,7 +54,7 @@ Foam::IFstreamAllocator::IFstreamAllocator(const fileName& pathname)
ifPtr_ = new ifstream(pathname.c_str());
// If the file is compressed, decompress it before reading.
- if (!ifPtr_->good() && file(pathname + ".gz"))
+ if (!ifPtr_->good() && isFile(pathname + ".gz"))
{
if (IFstream::debug)
{
@@ -159,7 +159,7 @@ Foam::IFstream& Foam::IFstream::operator()() const
{
if (!good())
{
- if (!file(pathname_) && !file(pathname_ + ".gz"))
+ if (!isFile(pathname_) && !isFile(pathname_ + ".gz"))
{
FatalIOErrorIn("IFstream::operator()", *this)
<< "file " << pathname_ << " does not exist"
diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
index bc6c2a03cc3bf085ecfd060bf485e417b1709dbb..2b5849d2e7fde4b8870c516974366f7ed6367b88 100644
--- a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
+++ b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
@@ -57,7 +57,7 @@ Foam::OFstreamAllocator::OFstreamAllocator
if (compression == IOstream::COMPRESSED)
{
- if (file(pathname))
+ if (isFile(pathname))
{
rm(pathname);
}
@@ -66,7 +66,7 @@ Foam::OFstreamAllocator::OFstreamAllocator
}
else
{
- if (file(pathname + ".gz"))
+ if (isFile(pathname + ".gz"))
{
rm(pathname + ".gz");
}
diff --git a/src/OpenFOAM/db/Time/findInstance.C b/src/OpenFOAM/db/Time/findInstance.C
index 348ad4ebe55536b0c732415c56a2f06749ba0ca0..d3d475cec31f311fd3265ae3785472bb91a374de 100644
--- a/src/OpenFOAM/db/Time/findInstance.C
+++ b/src/OpenFOAM/db/Time/findInstance.C
@@ -43,7 +43,7 @@ Foam::word Foam::Time::findInstance
// Is the mesh data in the current time directory ?
if
(
- file(path()/timeName()/dir/name)
+ isFile(path()/timeName()/dir/name)
&& IOobject(name, timeName(), dir, *this).headerOk()
)
{
@@ -81,7 +81,7 @@ Foam::word Foam::Time::findInstance
{
if
(
- file(path()/ts[j].name()/dir/name)
+ isFile(path()/ts[j].name()/dir/name)
&& IOobject(name, ts[j].name(), dir, *this).headerOk()
)
{
@@ -109,7 +109,7 @@ Foam::word Foam::Time::findInstance
if
(
- file(path()/constant()/dir/name)
+ isFile(path()/constant()/dir/name)
&& IOobject(name, constant(), dir, *this).headerOk()
)
{
diff --git a/src/OpenFOAM/global/JobInfo/JobInfo.C b/src/OpenFOAM/global/JobInfo/JobInfo.C
index f1e802160361c5b4d8a58d1423bba8138557f486..e07b6ab2717d08a1dbc4123f4259174044eac81f 100644
--- a/src/OpenFOAM/global/JobInfo/JobInfo.C
+++ b/src/OpenFOAM/global/JobInfo/JobInfo.C
@@ -65,14 +65,14 @@ Foam::JobInfo::JobInfo()
<< Foam::exit(FatalError);
}
- if (!dir(runningDir) && !mkDir(runningDir))
+ if (!isDir(runningDir) && !mkDir(runningDir))
{
FatalErrorIn("JobInfo::JobInfo()")
<< "Cannot make JobInfo directory " << runningDir
<< Foam::exit(FatalError);
}
- if (!dir(finishedDir) && !mkDir(finishedDir))
+ if (!isDir(finishedDir) && !mkDir(finishedDir))
{
FatalErrorIn("JobInfo::JobInfo()")
<< "Cannot make JobInfo directory " << finishedDir
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index a237c0256c2d00e80a065fa8d8f89f0003964e31..4384a7ea4183b79031033a9952ddd99046419311 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -409,7 +409,7 @@ Foam::argList::argList
label nProcDirs = 0;
while
(
- dir
+ isDir
(
rootPath_/globalCase_/"processor"
+ name(++nProcDirs)
@@ -697,7 +697,7 @@ bool Foam::argList::check(bool checkArgs, bool checkOpts) const
bool Foam::argList::checkRootCase() const
{
- if (!dir(rootPath()))
+ if (!isDir(rootPath()))
{
FatalError
<< executable_
@@ -707,7 +707,7 @@ bool Foam::argList::checkRootCase() const
return false;
}
- if (!dir(path()) && Pstream::master())
+ if (!isDir(path()) && Pstream::master())
{
// Allow slaves on non-existing processor directories, created later
FatalError
diff --git a/src/OpenFOAM/include/OSspecific.H b/src/OpenFOAM/include/OSspecific.H
index 4594f6eff879fdb2ad699da1acf2673e7d69496e..1b434670b8a4d290d93060bd9b0b398c9e5f1559 100644
--- a/src/OpenFOAM/include/OSspecific.H
+++ b/src/OpenFOAM/include/OSspecific.H
@@ -63,7 +63,7 @@ bool env(const word&);
//- Return environment variable of given name
// Return string() if the environment is undefined
-string getEnv(const word& name);
+string getEnv(const word&);
//- Set an environment variable
bool setEnv(const word& name, const string& value, const bool overwrite);
@@ -103,7 +103,7 @@ bool chDir(const fileName& dir);
//
// @return the full path name or fileName() if the name cannot be found
// Optionally abort if the file cannot be found
-fileName findEtcFile(const fileName& name, bool mandatory=false);
+fileName findEtcFile(const fileName&, bool mandatory=false);
//- Make a directory and return an error if it could not be created
// and does not already exist
@@ -119,13 +119,13 @@ mode_t mode(const fileName&);
fileName::Type type(const fileName&);
//- Does the name exist in the file system?
-bool exists(const fileName& name);
+bool exists(const fileName&);
-//- Does the file exist?
-bool file(const fileName&);
+//- Does the name exist as a FILE in the file system?
+bool isFile(const fileName&);
-//- Does the directory exist?
-bool dir(const fileName&);
+//- Does the name exist as a DIRECTORY in the file system?
+bool isDir(const fileName&);
//- Return size of file
off_t fileSize(const fileName&);
@@ -165,10 +165,10 @@ void fdClose(const int);
//- Check if machine is up by pinging given port
bool ping(const word&, const label port, const label timeOut);
-//- Check if machine is up by ping port 22 = ssh and 222 = rsh
+//- Check if machine is up by pinging port 22 (ssh) and 222 (rsh)
bool ping(const word&, const label timeOut=10);
-//- Executes a command specified in command
+//- Execute the specified command
int system(const string& command);
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/polyMesh/polyMesh.C b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
index c3a789e54dc091536f74bc351d7180ae239e7c3f..0428b252d7d173713c13b79510a4d5244e64dd39 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyMesh.C
@@ -1103,7 +1103,7 @@ void Foam::polyMesh::removeFiles(const fileName& instanceDir) const
rm(meshFilesPath/"parallelData");
// remove subdirectories
- if (dir(meshFilesPath/"sets"))
+ if (isDir(meshFilesPath/"sets"))
{
rmDir(meshFilesPath/"sets");
}
diff --git a/src/OpenFOAM/primitives/strings/fileName/fileName.C b/src/OpenFOAM/primitives/strings/fileName/fileName.C
index 50d8a299475eeb3801fe7ac21e380e701fbeab42..4e6c2c6423ecfd003293a14254e2b7e9059b7ace 100644
--- a/src/OpenFOAM/primitives/strings/fileName/fileName.C
+++ b/src/OpenFOAM/primitives/strings/fileName/fileName.C
@@ -63,13 +63,13 @@ bool Foam::fileName::exists() const
bool Foam::fileName::isDir() const
{
- return ::Foam::dir(*this);
+ return ::Foam::isDir(*this);
}
bool Foam::fileName::isFile() const
{
- return ::Foam::file(*this);
+ return ::Foam::isFile(*this);
}
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index d9c775a68ba3b93062e2bfb9fc301f3703fc35e4..aebecfefe9e22cf44914f8ff7b5a196a6b8f8207 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -162,7 +162,7 @@ Foam::fvMesh::fvMesh(const IOobject& io)
// Check the existance of the cell volumes and read if present
// and set the storage of V00
- if (file(time().timePath()/"V0"))
+ if (isFile(time().timePath()/"V0"))
{
V0Ptr_ = new DimensionedField<scalar, volMesh>
(
@@ -182,7 +182,7 @@ Foam::fvMesh::fvMesh(const IOobject& io)
// Check the existance of the mesh fluxes, read if present and set the
// mesh to be moving
- if (file(time().timePath()/"meshPhi"))
+ if (isFile(time().timePath()/"meshPhi"))
{
phiPtr_ = new surfaceScalarField
(
diff --git a/src/meshTools/searchableSurface/triSurfaceMesh.C b/src/meshTools/searchableSurface/triSurfaceMesh.C
index ad8ffc5927326f3c68171421bc171755f08fbc0a..b5e3e0f5727f8c80e5185b0e53d23362e2829614 100644
--- a/src/meshTools/searchableSurface/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurface/triSurfaceMesh.C
@@ -562,7 +562,7 @@ bool Foam::triSurfaceMesh::writeObject
triSurface::write(fullPath);
- if (!file(fullPath))
+ if (!isFile(fullPath))
{
return false;
}
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C
index afe81aebac385ac2796d20eeb9280b2cf9a146b8..af262c6c1dbab43a6f32c27810fcd12db4115961 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.C
@@ -25,6 +25,7 @@ License
\*---------------------------------------------------------------------------*/
#include "STLsurfaceFormatCore.H"
+#include "gzstream.h"
#include "OSspecific.H"
#include "Map.H"
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
index 56607fa0a04aad991b3e2852ecef46088e28a4e1..3bf0d7ba270c40636cd00912fce065c810628d54 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormatCore.H
@@ -39,7 +39,6 @@ SourceFiles
#include "STLtriangle.H"
#include "triFace.H"
-#include "gzstream.h"
#include "IFstream.H"
#include "Ostream.H"
#include "OFstream.H"
diff --git a/src/surfMesh/surfaceFormats/surfaceFormatsCore.C b/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
index 3552d4f4046308955a3833efd017f1f6b5a3b681..277ba8d4c4fe70a8dc59d3695b66f1f9348d20be 100644
--- a/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
+++ b/src/surfMesh/surfaceFormats/surfaceFormatsCore.C
@@ -91,7 +91,7 @@ Foam::fileFormats::surfaceFormatsCore::findMeshInstance
{
for (label i = instanceI; i >= 0; --i)
{
- if (file(d.path()/ts[i].name()/subdirName/foamName))
+ if (isFile(d.path()/ts[i].name()/subdirName/foamName))
{
return ts[i].name();
}
@@ -134,7 +134,7 @@ Foam::fileFormats::surfaceFormatsCore::findMeshName
{
fileName testName(d.path()/ts[i].name()/subdirName/foamName);
- if (file(testName))
+ if (isFile(testName))
{
return testName;
}
diff --git a/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C b/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
index 4c7c9e859a0f8fe8bab58ccceea07404dbead039..1bdc059a8000f82bc4684dcffdc2e9d6b6856801 100644
--- a/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
+++ b/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
@@ -48,7 +48,7 @@ bool triSurface::readSTLBINARY(const fileName& STLfileName)
new ifstream(STLfileName.c_str(), std::ios::binary)
);
// If the file is compressed, decompress it before reading.
- if (!STLfilePtr->good() && file(STLfileName + ".gz"))
+ if (!STLfilePtr->good() && isFile(STLfileName + ".gz"))
{
compressed = true;
STLfilePtr.reset(new igzstream((STLfileName + ".gz").c_str()));
diff --git a/src/triSurface/triSurface/triSurface.C b/src/triSurface/triSurface/triSurface.C
index e589ec61586a684e335d4135710414004e8960a1..2eee0bb858e88a1702c01cada04ad2a0bfa852ed 100644
--- a/src/triSurface/triSurface/triSurface.C
+++ b/src/triSurface/triSurface/triSurface.C
@@ -67,7 +67,7 @@ Foam::fileName Foam::triSurface::triSurfInstance(const Time& d)
{
for (label j=i; j>=0; j--)
{
- if (file(d.path()/ts[j].name()/typeName/foamName))
+ if (isFile(d.path()/ts[j].name()/typeName/foamName))
{
if (debug)
{