src/OpenFOAM: Rationalised use of enumerations by using the C++11 sco…

…ped form for db/functionObjects/timeControl/timeControl.H: timeControls primitives/bools/Switch/Switch.H: class switchType primitives/strings/fileName/fileName.H: fileType primitives/strings/wordRe/wordRe.H: compOption
OpenFOAM · Aug 25, 2018 · 8ed92de · 8ed92de
1 parent 61c9bc2
commit 8ed92de
Show file tree

Hide file tree

Showing 33 changed files with 271 additions and 217 deletions.
diff --git a/...ications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cvControls/cvControls.C b/...ications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cvControls/cvControls.C
@@ -243,7 +243,7 @@ Foam::cvControls::cvControls
 
     if (filterFaces_)
     {
-        filterEdges_ = Switch::ON;
+        filterEdges_ = Switch::switchType::on;
     }
 
     writeTetDualMesh_ = Switch(filteringDict.lookup("writeTetDualMesh"));

diff --git a/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C b/applications/utilities/miscellaneous/foamFormatConvert/foamFormatConvert.C
@@ -408,7 +408,7 @@ int main(int argc, char *argv[])
                 fileHandler().readDir
                 (
                     lagrangianDirs[0],
-                    fileName::DIRECTORY
+                    fileType::directory
                 )
             );
 

diff --git a/applications/utilities/parallelProcessing/decomposePar/decomposePar.C b/applications/utilities/parallelProcessing/decomposePar/decomposePar.C
@@ -328,7 +328,7 @@ int main(int argc, char *argv[])
                 fileHandler().readDir
                 (
                     runTime.path(),
-                    fileName::Type::DIRECTORY
+                    fileType::directory
                 )
             );
             forAllReverse(dirs, diri)
@@ -661,7 +661,7 @@ int main(int argc, char *argv[])
                     fileHandler().readDir
                     (
                         runTime.timePath()/cloud::prefix,
-                        fileName::DIRECTORY
+                        fileType::directory
                     )
                 );
 

diff --git a/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C b/applications/utilities/parallelProcessing/reconstructPar/reconstructPar.C
@@ -520,7 +520,7 @@ int main(int argc, char *argv[])
                         cloudDirs = fileHandler().readDir
                         (
                             lagrangianDir,
-                            fileName::DIRECTORY
+                            fileType::directory
                         );
                     }
 

diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C b/applications/utilities/postProcessing/dataConversion/foamToEnsight/foamToEnsight.C
@@ -307,7 +307,7 @@ int main(int argc, char *argv[])
         fileNameList cloudDirs = readDir
         (
             runTime.timePath()/regionPrefix/cloud::prefix,
-            fileName::DIRECTORY
+            fileType::directory
         );
 
         forAll(cloudDirs, cloudI)
@@ -557,7 +557,7 @@ int main(int argc, char *argv[])
             fileNameList currentCloudDirs = readDir
             (
                 runTime.timePath()/regionPrefix/cloud::prefix,
-                fileName::DIRECTORY
+                fileType::directory
             );
 
             bool cloudExists = inFileNameList(currentCloudDirs, cloudName);

diff --git a/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H b/applications/utilities/postProcessing/dataConversion/foamToEnsightParts/findFields.H
@@ -37,7 +37,7 @@ if (timeDirs.size())
       / timeDirs.last().name()
       / regionPrefix
       / cloud::prefix,
-        fileName::DIRECTORY
+        fileType::directory
     );
 
     forAll(cloudDirs, cloudI)

diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/foamToTecplot360.C
@@ -1213,7 +1213,7 @@ int main(int argc, char *argv[])
             readDir
             (
                 runTime.timePath()/regionPrefix/cloud::prefix,
-                fileName::DIRECTORY
+                fileType::directory
             )
         );
 

diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C b/applications/utilities/postProcessing/dataConversion/foamToVTK/foamToVTK.C
@@ -446,7 +446,7 @@ int main(int argc, char *argv[])
             readDir
             (
                 runTime.timePath()/regionPrefix/cloud::prefix,
-                fileName::DIRECTORY
+                fileType::directory
             )
         );
         forAll(cloudDirs, i)
@@ -1210,14 +1210,14 @@ int main(int argc, char *argv[])
            /"VTK"
         );
 
-        fileNameList dirs(readDir(procVTK, fileName::DIRECTORY));
+        fileNameList dirs(readDir(procVTK, fileType::directory));
         label sz = dirs.size();
         dirs.setSize(sz+1);
         dirs[sz] = ".";
 
         forAll(dirs, i)
         {
-            fileNameList subFiles(readDir(procVTK/dirs[i], fileName::FILE));
+            fileNameList subFiles(readDir(procVTK/dirs[i], fileType::file));
 
             forAll(subFiles, j)
             {

diff --git a/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C b/applications/utilities/postProcessing/dataConversion/smapToFoam/smapToFoam.C
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
 
     #include "createTime.H"
 
-    fileNameList fieldNames = readDir(runTime.timePath(), fileName::FILE);
+    fileNameList fieldNames = readDir(runTime.timePath(), fileType::file);
     dictionary fieldNameDict;
     forAll(fieldNames, i)
     {

diff --git a/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PVReaders/vtkPVFoam/vtkPVFoamUpdateInfo.C
@@ -202,7 +202,7 @@ void Foam::vtkPVFoam::updateInfoLagrangian
             readDir
             (
                 dbPtr_->path()/times[timei].name()/lagrangianPrefix,
-                fileName::DIRECTORY
+                fileType::directory
             );
     }
 

diff --git a/applications/utilities/preProcessing/mapFields/mapLagrangian.C b/applications/utilities/preProcessing/mapFields/mapLagrangian.C
@@ -105,7 +105,7 @@ void mapLagrangian(const meshToMesh0& meshToMesh0Interp)
         readDir
         (
             meshSource.time().timePath()/cloud::prefix,
-            fileName::DIRECTORY
+            fileType::directory
         )
     );
 

diff --git a/applications/utilities/preProcessing/mapFieldsPar/mapLagrangian.C b/applications/utilities/preProcessing/mapFieldsPar/mapLagrangian.C
@@ -94,7 +94,7 @@ void mapLagrangian(const meshToMesh& interp)
         readDir
         (
             meshSource.time().timePath()/cloud::prefix,
-            fileName::DIRECTORY
+            fileType::directory
         )
     );
 

diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
@@ -483,7 +483,7 @@ mode_t Foam::mode
 }
 
 
-Foam::fileName::Type Foam::type
+Foam::fileType Foam::type
 (
     const fileName& name,
     const bool checkVariants,
@@ -498,19 +498,19 @@ Foam::fileName::Type Foam::type
 
     if (S_ISREG(m))
     {
-        return fileName::FILE;
+        return fileType::file;
     }
     else if (S_ISLNK(m))
     {
-        return fileName::LINK;
+        return fileType::link;
     }
     else if (S_ISDIR(m))
     {
-        return fileName::DIRECTORY;
+        return fileType::directory;
     }
     else
     {
-        return fileName::UNDEFINED;
+        return fileType::undefined;
     }
 }
 
@@ -660,7 +660,7 @@ double Foam::highResLastModified
 Foam::fileNameList Foam::readDir
 (
     const fileName& directory,
-    const fileName::Type type,
+    const fileType type,
     const bool filterVariants,
     const bool followLink
 )
@@ -714,10 +714,10 @@ Foam::fileNameList Foam::readDir
 
                 if
                 (
-                    (type == fileName::DIRECTORY)
+                    (type == fileType::directory)
                  ||
                     (
-                        type == fileName::FILE
+                        type == fileType::file
                      && fName[fName.size()-1] != '~'
                      && fExt != "bak"
                      && fExt != "BAK"
@@ -777,15 +777,15 @@ bool Foam::cp(const fileName& src, const fileName& dest, const bool followLink)
         return false;
     }
 
-    const fileName::Type srcType = src.type(false, followLink);
+    const fileType srcType = src.type(false, followLink);
 
     fileName destFile(dest);
 
     // Check type of source file.
-    if (srcType == fileName::FILE)
+    if (srcType == fileType::file)
     {
         // If dest is a directory, create the destination file name.
-        if (destFile.type() == fileName::DIRECTORY)
+        if (destFile.type() == fileType::directory)
         {
             destFile = destFile/src.name();
         }
@@ -822,10 +822,10 @@ bool Foam::cp(const fileName& src, const fileName& dest, const bool followLink)
             return false;
         }
     }
-    else if (srcType == fileName::LINK)
+    else if (srcType == fileType::link)
     {
         // If dest is a directory, create the destination file name.
-        if (destFile.type() == fileName::DIRECTORY)
+        if (destFile.type() == fileType::directory)
         {
             destFile = destFile/src.name();
         }
@@ -838,10 +838,10 @@ bool Foam::cp(const fileName& src, const fileName& dest, const bool followLink)
 
         ln(src, destFile);
     }
-    else if (srcType == fileName::DIRECTORY)
+    else if (srcType == fileType::directory)
     {
         // If dest is a directory, create the destination file name.
-        if (destFile.type() == fileName::DIRECTORY)
+        if (destFile.type() == fileType::directory)
         {
             destFile = destFile/src.component(src.components().size() -1);
         }
@@ -879,7 +879,7 @@ bool Foam::cp(const fileName& src, const fileName& dest, const bool followLink)
         }
 
         // Copy files
-        fileNameList contents = readDir(src, fileName::FILE, false, followLink);
+        fileNameList contents = readDir(src, fileType::file, false, followLink);
         forAll(contents, i)
         {
             if (POSIX::debug)
@@ -897,7 +897,7 @@ bool Foam::cp(const fileName& src, const fileName& dest, const bool followLink)
         fileNameList subdirs = readDir
         (
             src,
-            fileName::DIRECTORY,
+            fileType::directory,
             false,
             followLink
         );
@@ -975,8 +975,8 @@ bool Foam::mv(const fileName& src, const fileName& dst, const bool followLink)
 
     if
     (
-        dst.type() == fileName::DIRECTORY
-     && src.type(false, followLink) != fileName::DIRECTORY
+        dst.type() == fileType::directory
+     && src.type(false, followLink) != fileType::directory
     )
     {
         const fileName dstName(dst/src.name());
@@ -1098,7 +1098,7 @@ bool Foam::rmDir(const fileName& directory)
             {
                 fileName path = directory/fName;
 
-                if (path.type(false, false) == fileName::DIRECTORY)
+                if (path.type(false, false) == fileType::directory)
                 {
                     if (!rmDir(path))
                     {

diff --git a/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C b/src/OpenFOAM/db/IOstreams/Fstreams/OFstream.C
@@ -62,14 +62,14 @@ Foam::OFstreamAllocator::OFstreamAllocator
     if (compression == IOstream::COMPRESSED)
     {
         // Get identically named uncompressed version out of the way
-        fileName::Type pathType = Foam::type(pathname, false, false);
-        if (pathType == fileName::FILE || pathType == fileName::LINK)
+        fileType pathType = Foam::type(pathname, false, false);
+        if (pathType == fileType::file || pathType == fileType::link)
         {
             rm(pathname);
         }
         fileName gzPathName(pathname + ".gz");
 
-        if (!append && Foam::type(gzPathName) == fileName::LINK)
+        if (!append && Foam::type(gzPathName) == fileType::link)
         {
             // Disallow writing into softlink to avoid any problems with
             // e.g. softlinked initial fields
@@ -82,15 +82,15 @@ Foam::OFstreamAllocator::OFstreamAllocator
     {
         // get identically named compressed version out of the way
         fileName gzPathName(pathname + ".gz");
-        fileName::Type gzType = Foam::type(gzPathName, false, false);
-        if (gzType == fileName::FILE || gzType == fileName::LINK)
+        fileType gzType = Foam::type(gzPathName, false, false);
+        if (gzType == fileType::file || gzType == fileType::link)
         {
             rm(gzPathName);
         }
         if
         (
             !append
-         && Foam::type(pathname, false, false) == fileName::LINK
+         && Foam::type(pathname, false, false) == fileType::link
         )
         {
             // Disallow writing into softlink to avoid any problems with

diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -92,7 +92,7 @@ void Foam::functionObjectList::listDir
 
     // Recurse into sub-directories
     {
-        fileNameList foDirs(fileHandler().readDir(dir, fileName::DIRECTORY));
+        fileNameList foDirs(fileHandler().readDir(dir, fileType::directory));
         forAll(foDirs, fd)
         {
             listDir(dir/foDirs[fd], foMap);