Add -noFunctionObjects runtime option. Useful with mergeMeshes when problems with certain functionObjects

applications/utilities/mesh/manipulation/mergeMeshes/createTimes.H

@@ -4,12 +4,18 @@
     (
         Time::controlDictName,
         rootDirMaster,
-        caseDirMaster
+        caseDirMaster,
+        "system",
+        "constant",
+        !args.optionFound("noFunctionObjects")
     );
 
     Time runTimeToAdd
     (
         Time::controlDictName,
         rootDirToAdd,
-        caseDirToAdd
+        caseDirToAdd,
+        "system",
+        "constant",
+        !args.optionFound("noFunctionObjects")
     );

applications/utilities/mesh/manipulation/mergeMeshes/setRoots.H

@@ -7,6 +7,7 @@
     argList::validArgs.append("root to add");
     argList::validArgs.append("case to add");
     argList::validOptions.insert("addRegion", "name");
+    argList::validOptions.insert("noFunctionObjects", "");
 
     argList args(argc, argv);
 

src/OpenFOAM/db/Time/Time.C

@@ -191,7 +191,8 @@ Foam::Time::Time
     const fileName& rootPath,
     const fileName& caseName,
     const word& systemName,
-    const word& constantName
+    const word& constantName,
+    const bool enableFunctionObjects
 )
 :
     TimePaths
@@ -234,7 +235,7 @@ Foam::Time::Time
     runTimeModifiable_(true),
 
     readLibs_(controlDict_, "libs"),
-    functionObjects_(*this)
+    functionObjects_(*this, enableFunctionObjects)
 {
     setControls();
 }
@@ -246,7 +247,8 @@ Foam::Time::Time
     const fileName& rootPath,
     const fileName& caseName,
     const word& systemName,
-    const word& constantName
+    const word& constantName,
+    const bool enableFunctionObjects
 )
 :
     TimePaths
@@ -290,7 +292,7 @@ Foam::Time::Time
     runTimeModifiable_(true),
 
     readLibs_(controlDict_, "libs"),
-    functionObjects_(*this)
+    functionObjects_(*this, enableFunctionObjects)
 {
     setControls();
 }
@@ -301,7 +303,8 @@ Foam::Time::Time
     const fileName& rootPath,
     const fileName& caseName,
     const word& systemName,
-    const word& constantName
+    const word& constantName,
+    const bool enableFunctionObjects
 )
 :
     TimePaths
@@ -344,7 +347,7 @@ Foam::Time::Time
     runTimeModifiable_(true),
 
     readLibs_(controlDict_, "libs"),
-    functionObjects_(*this)
+    functionObjects_(*this, enableFunctionObjects)
 {}
 
 

src/OpenFOAM/db/Time/Time.H

@@ -187,7 +187,8 @@ public:
             const fileName& rootPath,
             const fileName& caseName,
             const word& systemName = "system",
-            const word& constantName = "constant"
+            const word& constantName = "constant",
+            const bool enableFunctionObjects = true
         );
 
         //- Construct given dictionary, rootPath and casePath
@@ -197,7 +198,8 @@ public:
             const fileName& rootPath,
             const fileName& caseName,
             const word& systemName = "system",
-            const word& constantName = "constant"
+            const word& constantName = "constant",
+            const bool enableFunctionObjects = true
         );
 
         //- Construct given endTime, rootPath and casePath
@@ -206,7 +208,8 @@ public:
             const fileName& rootPath,
             const fileName& caseName,
             const word& systemName = "system",
-            const word& constantName = "constant"
+            const word& constantName = "constant",
+            const bool enableFunctionObjects = true
         );
 
 

src/OpenFOAM/global/argList/argList.C

@@ -48,6 +48,7 @@ Foam::argList::initValidTables::initValidTables()
     validOptions.set("case", "dir");
     validOptions.set("parallel", "");
     validParOptions.set("parallel", "");
+    validOptions.set("noFunctionObjects", "");
 
     Pstream::addValidParOptions(validParOptions);
 }

src/OpenFOAM/include/createTime.H

@@ -8,5 +8,8 @@
     (
         Foam::Time::controlDictName,
         args.rootPath(),
-        args.caseName()
+        args.caseName(),
+        "system",
+        "constant",
+        !args.optionFound("noFunctionObjects")
     );