From 438a83a5d191c8199417bc03753c4e549740addd Mon Sep 17 00:00:00 2001
From: Michael Wild <themiwi@users.sourceforge.net>
Date: Mon, 4 Jul 2011 15:30:46 +0200
Subject: [PATCH] ENH: Merge all global controlDict's when reading

Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
---
 .../foamDebugSwitches/foamDebugSwitches.C          |    8 ++++-
 .../adiabaticFlameT/adiabaticFlameT.C              |    2 +-
 .../equilibriumFlameT/equilibriumFlameT.C          |    2 +-
 .../mixtureAdiabaticFlameT.C                       |    2 +-
 src/OSspecific/POSIX/POSIX.C                       |   39 +++++++++++---------
 .../db/dynamicLibrary/dynamicCode/dynamicCode.C    |    2 +-
 src/OpenFOAM/global/debug/debug.C                  |   11 ++++--
 src/OpenFOAM/include/OSspecific.H                  |    2 +-
 .../meshShapes/cellModeller/globalCellModeller.C   |    2 +-
 .../primitives/strings/stringOps/stringOps.C       |    2 +-
 10 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C b/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C
index 8f0e53f..69045a4 100644
--- a/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C
+++ b/applications/utilities/miscellaneous/foamDebugSwitches/foamDebugSwitches.C
@@ -61,7 +61,13 @@ int main(int argc, char *argv[])
 
     if (args.optionFound("old") || args.optionFound("new"))
     {
-        dictionary controlDict(IFstream(findEtcFile("controlDict", true))());
+        fileNameList controlDictFiles = findEtcFile("controlDict", true);
+        dictionary controlDict;
+        forAllReverse(controlDictFiles, cI)
+        {
+            IFstream fs(controlDictFiles[cI]);
+            controlDict.merge(dictionary(fs));
+        }
 
         wordHashSet oldDebug
         (
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
index ccf8e55..b23ef7a 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
+++ b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
@@ -76,7 +76,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "Reading Burcat data dictionary" << endl;
 
-    fileName BurcatCpDataFileName(findEtcFile("thermoData/BurcatCpData"));
+    fileName BurcatCpDataFileName(findEtcFile("thermoData/BurcatCpData")[0]);
 
     // Construct control dictionary
     IFstream BurcatCpDataFile(BurcatCpDataFileName);
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
index e46c644..0813d3a 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
+++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
@@ -77,7 +77,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "Reading Burcat data dictionary" << endl;
 
-    fileName BurcatCpDataFileName(findEtcFile("thermoData/BurcatCpData"));
+    fileName BurcatCpDataFileName(findEtcFile("thermoData/BurcatCpData")[0]);
 
     // Construct control dictionary
     IFstream BurcatCpDataFile(BurcatCpDataFileName);
diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
index 2c8b783..330edb3 100644
--- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
+++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
@@ -75,7 +75,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "Reading Burcat data dictionary" << endl;
 
-    fileName BurcatCpDataFileName(findEtcFile("thermoData/BurcatCpData"));
+    fileName BurcatCpDataFileName(findEtcFile("thermoData/BurcatCpData")[0]);
 
     // Construct control dictionary
     IFstream BurcatCpDataFile(BurcatCpDataFileName);
diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index 48e4b3a..60a2684 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -253,8 +253,9 @@ bool Foam::chDir(const fileName& dir)
 }
 
 
-Foam::fileName Foam::findEtcFile(const fileName& name, bool mandatory)
+Foam::fileNameList Foam::findEtcFile(const fileName& name, bool mandatory)
 {
+    fileNameList results;
     //
     // search for user files in
     // * ~/.OpenFOAM/VERSION
@@ -266,13 +267,13 @@ Foam::fileName Foam::findEtcFile(const fileName& name, bool mandatory)
         fileName fullName = searchDir/FOAMversion/name;
         if (isFile(fullName))
         {
-            return fullName;
+            results.append(fullName);
         }
 
         fullName = searchDir/name;
         if (isFile(fullName))
         {
-            return fullName;
+            results.append(fullName);
         }
     }
 
@@ -290,13 +291,13 @@ Foam::fileName Foam::findEtcFile(const fileName& name, bool mandatory)
             fileName fullName = searchDir/FOAMversion/name;
             if (isFile(fullName))
             {
-                return fullName;
+                results.append(fullName);
             }
 
             fullName = searchDir/name;
             if (isFile(fullName))
             {
-                return fullName;
+                results.append(fullName);
             }
         }
     }
@@ -313,13 +314,13 @@ Foam::fileName Foam::findEtcFile(const fileName& name, bool mandatory)
             fileName fullName = searchDir/"site"/FOAMversion/name;
             if (isFile(fullName))
             {
-                return fullName;
+                results.append(fullName);
             }
 
             fullName = searchDir/"site"/name;
             if (isFile(fullName))
             {
-                return fullName;
+                results.append(fullName);
             }
         }
     }
@@ -335,24 +336,28 @@ Foam::fileName Foam::findEtcFile(const fileName& name, bool mandatory)
         fileName fullName = searchDir/"etc"/name;
         if (isFile(fullName))
         {
-            return fullName;
+            results.append(fullName);
         }
     }
 
     // Not found
     // abort if the file is mandatory, otherwise return null
-    if (mandatory)
+    if (results.empty())
     {
-        std::cerr
-            << "--> FOAM FATAL ERROR in Foam::findEtcFile() :"
-               " could not find mandatory file\n    '"
-            << name.c_str() << "'\n\n" << std::endl;
-        ::exit(1);
+        if (mandatory)
+        {
+            std::cerr
+                << "--> FOAM FATAL ERROR in Foam::findEtcFile() :"
+                   " could not find mandatory file\n    '"
+                << name.c_str() << "'\n\n" << std::endl;
+            ::exit(1);
+        }
+        // Return null-constructed fileName rather than fileName::null
+        // to avoid cyclic dependencies in the construction of globals
+        results.append(fileName());
     }
 
-    // Return null-constructed fileName rather than fileName::null
-    // to avoid cyclic dependencies in the construction of globals
-    return fileName();
+    return results;
 }
 
 
diff --git a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
index 327fd56..010c20f 100644
--- a/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
+++ b/src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C
@@ -177,7 +177,7 @@ bool Foam::dynamicCode::resolveTemplates
         // not found - fallback to ~OpenFOAM expansion
         if (file.empty())
         {
-            file = findEtcFile(codeTemplateDirName/templateName);
+            file = findEtcFile(codeTemplateDirName/templateName)[0];
         }
 
         if (file.empty())
diff --git a/src/OpenFOAM/global/debug/debug.C b/src/OpenFOAM/global/debug/debug.C
index b0c6969..f93bcc0 100644
--- a/src/OpenFOAM/global/debug/debug.C
+++ b/src/OpenFOAM/global/debug/debug.C
@@ -75,10 +75,13 @@ Foam::dictionary& Foam::debug::controlDict()
 {
     if (!controlDictPtr_)
     {
-        controlDictPtr_ = new dictionary
-        (
-            IFstream(findEtcFile("controlDict", true))()
-        );
+        fileNameList controlDictFiles = findEtcFile("controlDict", true);
+        controlDictPtr_ = new dictionary();
+        forAllReverse(controlDictFiles, cI)
+        {
+            IFstream fs(controlDictFiles[cI]);
+            controlDictPtr_->merge(dictionary(fs));
+        }
     }
 
     return *controlDictPtr_;
diff --git a/src/OpenFOAM/include/OSspecific.H b/src/OpenFOAM/include/OSspecific.H
index f01ad29..d9da89a 100644
--- a/src/OpenFOAM/include/OSspecific.H
+++ b/src/OpenFOAM/include/OSspecific.H
@@ -110,7 +110,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&, bool mandatory=false);
+fileNameList findEtcFile(const fileName&, bool mandatory=false);
 
 //- Make a directory and return an error if it could not be created
 //  and does not already exist
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModeller/globalCellModeller.C b/src/OpenFOAM/meshes/meshShapes/cellModeller/globalCellModeller.C
index c545e73..10b4ae2 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModeller/globalCellModeller.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellModeller/globalCellModeller.C
@@ -36,7 +36,7 @@ Description
 // PtrList of models
 Foam::PtrList<Foam::cellModel> Foam::cellModeller::models_
 (
-    IFstream(findEtcFile("cellModels", true))()
+    IFstream(findEtcFile("cellModels", true)[0])()
 );
 
 // List of model pointers
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
index ebbc47c..6b43895 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
@@ -562,7 +562,7 @@ Foam::string& Foam::stringOps::inplaceExpand
             // otherwise add extra test
             if (user == "OpenFOAM")
             {
-                s = findEtcFile(file);
+                s = findEtcFile(file)[0];
             }
             else
             {
-- 
1.7.4.1

From: https://github.com/wyldckat/OpenFOAM-2.0.x/commits/issue236

diff --git a/src/OpenFOAM/db/error/IOerror.C b/src/OpenFOAM/db/error/IOerror.C
index 150502a..5d7f9ac 100644
--- a/src/OpenFOAM/db/error/IOerror.C
+++ b/src/OpenFOAM/db/error/IOerror.C
@@ -31,6 +31,7 @@ License
 #include "Pstream.H"

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+bool Foam::FatalIOErrorIsInstantiated=false;

 Foam::IOerror::IOerror(const string& title)
 :
@@ -38,7 +39,9 @@ Foam::IOerror::IOerror(const string& title)
     ioFileName_("unknown"),
     ioStartLineNumber_(-1),
     ioEndLineNumber_(-1)
-{}
+{
+    FatalIOErrorIsInstantiated=true;
+}


 Foam::IOerror::IOerror(const dictionary& errDict)
@@ -47,11 +50,15 @@ Foam::IOerror::IOerror(const dictionary& errDict)
     ioFileName_(errDict.lookup("ioFileName")),
     ioStartLineNumber_(readLabel(errDict.lookup("ioStartLineNumber"))),
     ioEndLineNumber_(readLabel(errDict.lookup("ioEndLineNumber")))
-{}
+{
+    FatalIOErrorIsInstantiated=true;
+}


 Foam::IOerror::~IOerror() throw()
-{}
+{
+  FatalIOErrorIsInstantiated=false;
+}


 Foam::OSstream& Foam::IOerror::operator()
@@ -64,11 +71,28 @@ Foam::OSstream& Foam::IOerror::operator()
     const label ioEndLineNumber
 )
 {
-    error::operator()(functionName, sourceFileName, sourceFileLineNumber);
-    ioFileName_ = ioFileName;
-    ioStartLineNumber_ = ioStartLineNumber;
-    ioEndLineNumber_ = ioEndLineNumber;
-
+    if(FatalIOErrorIsInstantiated)
+    {
+        error::operator()(functionName, sourceFileName, sourceFileLineNumber);
+        ioFileName_ = ioFileName;
+        ioStartLineNumber_ = ioStartLineNumber;
+        ioEndLineNumber_ = ioEndLineNumber;
+    }
+    else
+    {
+        cerr<< "Foam::IOerror::operator():\n"
+            << "--- Emergency exit deployed ---\n"
+            << "Messages to be delivered:\n"
+            << "\t Function Name of the reporter: " << functionName << std::endl
+            << "\t Source Filename of the function: " << sourceFileName << std::endl
+            << "\t Source line number: " << sourceFileLineNumber << std::endl
+            << "\t Filename that triggered this error: " << ioFileName << std::endl
+            << "\t Start line number of the offense: " << ioStartLineNumber << std::endl
+            << "\t ending at: " << ioEndLineNumber << std::endl << std::endl
+            << "--- Next step will be a segfault. ---"
+            << std::endl << std::endl;
+        exit(1);
+    }
     return operator OSstream&();
 }

diff --git a/src/OpenFOAM/db/error/error.C b/src/OpenFOAM/db/error/error.C
index 56a617c..fa91761 100644
--- a/src/OpenFOAM/db/error/error.C
+++ b/src/OpenFOAM/db/error/error.C
@@ -33,6 +33,8 @@ License

 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

+bool Foam::FatalErrorIsInstantiated=false;
+
 Foam::error::error(const string& title)
 :
     std::exception(),
@@ -51,6 +53,7 @@ Foam::error::error(const string& title)
             << endl;
         exit(1);
     }
+    FatalErrorIsInstantiated=true;
 }


@@ -73,6 +76,7 @@ Foam::error::error(const dictionary& errDict)
             << endl;
         exit(1);
     }
+    FatalErrorIsInstantiated=true;
 }


@@ -88,12 +92,14 @@ Foam::error::error(const error& err)
     messageStreamPtr_(new OStringStream(*err.messageStreamPtr_))
 {
     //*messageStreamPtr_ << err.message();
+    FatalErrorIsInstantiated=true;
 }


 Foam::error::~error() throw()
 {
     delete messageStreamPtr_;
+    FatalErrorIsInstantiated=false;
 }


@@ -104,9 +110,24 @@ Foam::OSstream& Foam::error::operator()
     const int sourceFileLineNumber
 )
 {
-    functionName_ = functionName;
-    sourceFileName_ = sourceFileName;
-    sourceFileLineNumber_ = sourceFileLineNumber;
+    if(FatalErrorIsInstantiated)
+    {
+      functionName_ = functionName;
+      sourceFileName_ = sourceFileName;
+      sourceFileLineNumber_ = sourceFileLineNumber;
+    }
+    else
+    {
+        cerr<< "Foam::error::operator():\n"
+            << "--- Emergency exit deployed ---\n"
+            << "Messages to be delivered:\n"
+            << "\t Function Name of the reporter: " << functionName << std::endl
+            << "\t Source Filename of the function: " << sourceFileName << std::endl
+            << "\t Source line number: " << sourceFileLineNumber << std::endl
+            << "--- Next step will be a segfault. ---"
+            << std::endl << std::endl;
+        exit(1);
+    }

     return operator OSstream&();
 }
diff --git a/src/OpenFOAM/db/error/error.H b/src/OpenFOAM/db/error/error.H
index 2105930..a582ebb 100644
--- a/src/OpenFOAM/db/error/error.H
+++ b/src/OpenFOAM/db/error/error.H
@@ -55,6 +55,10 @@ SourceFiles
 namespace Foam
 {

+// These two must be set when the respective classes have been instantiated
+extern bool FatalErrorIsInstantiated;
+extern bool FatalIOErrorIsInstantiated;
+
 // Forward declaration of friend functions and operators
 class error;
 Ostream& operator<<(Ostream&, const error&);