diff --git a/applications/solvers/basic/laplacianFoam/laplacianFoam.C b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
index a59f2ec0c882ab7d8af02f6f642358c1f0bbab07..9bffe121d4e9e5ddf8fbba153bf34e9e1d39b651 100644
--- a/applications/solvers/basic/laplacianFoam/laplacianFoam.C
+++ b/applications/solvers/basic/laplacianFoam/laplacianFoam.C
@@ -59,6 +59,7 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
 
     #include "createTime.H"
diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C
index 3c0408717ea68d6e12a1bb333365ecf7ae484f64..ca54ea1c865463b0dffd59fc5a3b9b8186014ee9 100644
--- a/applications/solvers/basic/potentialFoam/potentialFoam.C
+++ b/applications/solvers/basic/potentialFoam/potentialFoam.C
@@ -125,6 +125,7 @@ int main(int argc, char *argv[])
         "execute functionObjects"
     );
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
index 07a99141cb4932a8042fa2cb540657f51ab31053..6c2d703b937c5ff406787160164bc8cb011f544f 100644
--- a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
+++ b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C
@@ -61,6 +61,7 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C
index 409989b6f36e358d35cd22f81e88552eff9b74c9..4e6173894678eeefc30f436ccbada9ba4ffaf0c8 100644
--- a/applications/solvers/combustion/PDRFoam/PDRFoam.C
+++ b/applications/solvers/combustion/PDRFoam/PDRFoam.C
@@ -89,6 +89,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C
index dec1a6a1385e957f1a24cc2e6e6d073e45c51488..34c42e7d12f1ec2571bce885f5e02be8f0032da7 100644
--- a/applications/solvers/combustion/XiFoam/XiFoam.C
+++ b/applications/solvers/combustion/XiFoam/XiFoam.C
@@ -67,6 +67,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C
index 1821b7a5405d28a47a061eca633bbe4469ac22be..7a3c3c1372c33ccef4a3dc1ca8dee59d32261338 100644
--- a/applications/solvers/combustion/fireFoam/fireFoam.C
+++ b/applications/solvers/combustion/fireFoam/fireFoam.C
@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C
index ff769cf4d2a8833899ee102c5ac5e46ced0abd58..2a15a666e604e7ead2ca0ea150241ed28efb766c 100644
--- a/applications/solvers/combustion/reactingFoam/reactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/reactingFoam.C
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
index 3517d25658fd98f09754e6cba7087aacdece1816..f46cbc1b576d2c11e698cdb76eaa7bc5298506d7 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
index 9277ef00412411fc8f6a8d56a79f9ae51f985b72..37adbcc4c0cb4de92e849afcf5b458e10ab48b1e 100644
--- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
+++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C
@@ -50,6 +50,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
index 6ec612d820163f2c5fade3e0604af366d1dada2a..17dc6ab8e3415f763313e033cef7e756690ff1d8 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
     #define NO_CONTROL
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/compressible/rhoPimpleAdiabaticFoam/rhoPimpleAdiabaticFoam.C b/applications/solvers/compressible/rhoPimpleAdiabaticFoam/rhoPimpleAdiabaticFoam.C
index c1b574a2c97283fada1cad9bfe1561ecf179c33b..4fcdfdbc51072d1b5addde8d4c7fb0e41056ef97 100644
--- a/applications/solvers/compressible/rhoPimpleAdiabaticFoam/rhoPimpleAdiabaticFoam.C
+++ b/applications/solvers/compressible/rhoPimpleAdiabaticFoam/rhoPimpleAdiabaticFoam.C
@@ -60,6 +60,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index 9d580abe2e234b61421ab3b522fe84c555447159..fcdaa9db35ebd29c42cf57d5fbd8f6aed307c364 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
@@ -54,6 +54,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
index 7ba9ee5ebb5ec13c0909018d2c54176be40c1b14..0283b3823aed59e6172aecf58a6058fd16f66982 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
@@ -47,6 +47,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
index d4bb7dc734174cb222b2f2028895acbd745bba51..ae8252bbf5277a69848ee2efcad321e17d8df505 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
@@ -45,6 +45,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C
index 46641eb690ac404a45268904ee2adaa17ff30c25..1ffbb6738fde7ab7170094f22a08356cb01566d4 100644
--- a/applications/solvers/compressible/sonicFoam/sonicFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicFoam.C
@@ -45,6 +45,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
index 619b704c31b2f49b8fe0f81990b41eaf4d98b8c3..afe963d8cf3f17a59aaf50075f5406c390cc4237 100644
--- a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
@@ -42,6 +42,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C b/applications/solvers/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C
index 725c36f1231662a0d0455a63a1387f7104410f22..38eb94fc4d77115101ba41bc0fc99722b2bb11ed 100644
--- a/applications/solvers/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C
+++ b/applications/solvers/discreteMethods/dsmc/dsmcFoam/dsmcFoam.C
@@ -43,6 +43,7 @@ int main(int argc, char *argv[])
     #define NO_CONTROL
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
index 3302b6d0735ea0e736eef68d199f3e16983b04c2..3bb0a881c3f55f2c3b4e67942c4236a0aa89898a 100644
--- a/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
+++ b/applications/solvers/discreteMethods/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
@@ -37,6 +37,7 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
index 6ecf1c804b0cefa20542f13d031d7b6238fe78e1..075a4504415a232a42befa047bb2175d2a3a57c3 100644
--- a/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
+++ b/applications/solvers/electromagnetics/electrostaticFoam/electrostaticFoam.C
@@ -38,6 +38,7 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
 
     #include "createTime.H"
diff --git a/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C b/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C
index 9430aeb8e7273d0d3e8695b80a2e9d5ca67a204e..33af0292aea49fb215cf2be08efe29b1edbb1a28 100644
--- a/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C
+++ b/applications/solvers/electromagnetics/magneticFoam/magneticFoam.C
@@ -65,6 +65,7 @@ int main(int argc, char *argv[])
         "write the paramagnetic particle force field"
     );
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
index 3e8e5473638747b839ac8770fac12f8ee0d649cc..1f9d4e1b8e67d53bb7e5125e30344a527ca0f5ce 100644
--- a/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
+++ b/applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
@@ -60,6 +60,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/financial/financialFoam/financialFoam.C b/applications/solvers/financial/financialFoam/financialFoam.C
index 5af22900114fe9c01a6c94de9aa83a96f4217c0e..c8e8e7b5d08861ba1d1a3b730f053d5c7eb8fd8f 100644
--- a/applications/solvers/financial/financialFoam/financialFoam.C
+++ b/applications/solvers/financial/financialFoam/financialFoam.C
@@ -43,6 +43,7 @@ int main(int argc, char *argv[])
     #define NO_CONTROL
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
index b769c66c6b1a0dce61f226bc6983de632ce8a78d..eaeb49019c8b941c3e0273e3609842cbb0ca0d12 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C
@@ -61,6 +61,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
index 4baa85ab78aab7e503dff6d07624a4455e540ab0..8cc6523fc7597c467bedb55b59ffc3e04f84bf07 100644
--- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C
@@ -61,6 +61,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
index 1b229481a14040655c21a0d1548f2985540ead81..a75c39d0f4076b59d41886514b5d5d325e5e8c32 100644
--- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
index 82324ce1ba5e4305b3ec1f95bd260824b9985ede..a8fc1a9f35e81e828377cbb64c36993a4d9d3998 100644
--- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
+++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C
@@ -46,6 +46,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C
index 70acdd9da5e66bf2d1a3fb5e8f68e41022b75a34..59a26dd5f78ec9e181b36c01b86ebaa9b9342303 100644
--- a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C
+++ b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
     #define NO_CONTROL
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
index d443338c265126c3293d453ec2249088f2f991b4..3094f0c7191b8769057d1e4c1b2a2470c3c480a8 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
@@ -74,6 +74,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
index 9d5147a3fcc5689186aa24623bf95531ceadfbde..d9ec41c0ab7acb57ebf648ef74a1ec1046ee8ae6 100644
--- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
+++ b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C
@@ -50,6 +50,7 @@ Description
 int main(int argc, char *argv[])
 {
     argList::noParallel();
+    #include "addCheckCaseOptions.H"
 
     #include "setRootCase.H"
 
diff --git a/applications/solvers/incompressible/icoFoam/icoFoam.C b/applications/solvers/incompressible/icoFoam/icoFoam.C
index 90057926b1c15c43c490a47abcf0244a064d4f45..eab1372654016e8722695676df5fe2853c52af99 100644
--- a/applications/solvers/incompressible/icoFoam/icoFoam.C
+++ b/applications/solvers/incompressible/icoFoam/icoFoam.C
@@ -67,6 +67,7 @@ Description
 
 int main(int argc, char *argv[])
 {
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
index 713906aaf35b8179c52fb67d6ece14bee52f1ef2..71656d352716e1c18885e981889ccf0ad909216a 100644
--- a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
@@ -42,6 +42,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMeshNoClear.H"
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
index d9f01333d4f5a5b3096d6cfddbd935c635979d04..9508c33934b68c61f65015a461bd79b7124f47b3 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
index 51949bb5452c623e6cea5c92096d1dc17bf7d9a8..9614701de8785db94257c6f18025d0baab4b5f0b 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@@ -81,6 +81,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
index 5d01454078bab475632344863923df4effa2a6f4..d2e3efd2fbc25f30d97f71c427553f0289fcedb9 100644
--- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C
+++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
@@ -77,6 +77,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
index c069cb0d03e3741b9157374e05dff0323d050d2f..fa643a7a473741d70a25fce52e54a385cb16ecb8 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
+++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
@@ -44,6 +44,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
index 60b9ad25bfa12c5fb9997bdcb21890e5aeff58d1..4b0cbe1547b5360d360a89d2c8fabd75e8eaafc7 100644
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
@@ -46,6 +46,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
index 8031ee363bbac5ef3c0f32e943eeb536e85743b8..a03cb5ed448fb1621b59a20479aca21d9cc7098d 100644
--- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
     #define CREATE_FIELDS_2 createPorousZones.H
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
index f16cf59df4f08cb7146c191edca6da69e634ab9c..839dd3ddd6d2d127a35d8910fedfe6971cc7c1fe 100644
--- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
@@ -73,6 +73,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
index aa1e808be3651d445427a42b3a812479f8ce8897..e0c4a06460e4a93208bbbbd231e55caf4395c09b 100644
--- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
+++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C
@@ -58,6 +58,7 @@ int main(int argc, char *argv[])
 
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
index e51f053fcd5b3d44ac378fd619aaf95a132af084..72f61c79b6054a05c88e3de1e2c0cec1fa42d355 100644
--- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
+++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C
@@ -53,6 +53,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
index b3d0fa2471136247a37ce334d31de29293f2a8c9..775e12099b59d12c04a2357acb6571500780c2b8 100644
--- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C
@@ -53,6 +53,7 @@ int main(int argc, char *argv[])
 
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
index d5c7a2a4f1b9b941b666f5398f6a929caf981b42..8862c4018437a6d6dfcb2c4d5c5718c9eb7b0148 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C
@@ -53,6 +53,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C
index e7bab7de83799fa47e24d1cf9479dee0b0ddd837..fd5c373be820dbe812f7df48aba11313e940fd3a 100644
--- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C
+++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C
@@ -47,6 +47,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C b/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C
index 80da3612fa77907d3c38acee524e8ed45a3a5d72..5c2a11b43ba7f7cf27552b414e5e34780c3630aa 100644
--- a/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C
+++ b/applications/solvers/lagrangian/simpleCoalParcelFoam/simpleCoalParcelFoam.C
@@ -51,6 +51,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C
index 5f5359c85e9c2c4bd96d06088fee5bef039022b5..9e3201c3d1409ef13a7bc21a44d7d0a83ee8e9e6 100644
--- a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C
+++ b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
index 987033f4d5ce8e80b682f16b76b4a71c8c9b604f..4ac6e57a65193c0dc26ffce2d05f4043462e5d9e 100644
--- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
+++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C
@@ -53,6 +53,7 @@ int main(int argc, char *argv[])
     #define NO_CONTROL
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C b/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C
index 6e6c8c0bf2a36f12c816334bbe58456466fac669..97bc27901491bafe7be2b7d9db7305ffa8973203 100644
--- a/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C
+++ b/applications/solvers/multiphase/MPPICInterFoam/MPPICInterFoam.C
@@ -58,6 +58,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
index 2c59f602d87aa8b0896873dce669ac1d3f76a494..99666a3531d91149acf8d47366be6e829efdebb6 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
@@ -47,6 +47,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C
index b598cc31098eb931d1e0c5086d3c34b87191ac24..6ebb641b9cd1c95171121bccf617d28365ecc3c9 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C
@@ -55,6 +55,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
index 6a8a92a5b525e233c46bd59b47f791e0d5d4f176..6364a92e8277fcdfa86d3003456a2ccd8c6fccdb 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -58,6 +58,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C
index 7b2365b728547cf0b112eaca7b40128b3c2400e9..c3d36e4267d4639cdf65fabcaaf08d1895485632 100644
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
index aca3a7b2e6313c627b055389906aba1d127e2954..d2335cba937d52e6052d412021642ca3e8a578bf 100644
--- a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
+++ b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
@@ -54,6 +54,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/interCondensatingEvaporatingFoam.C b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/interCondensatingEvaporatingFoam.C
index 3d0635a90377f2cfffb5eea3b8bbf967536f346d..b3350d335002eab679d82a036d69fbdf8994f81b 100644
--- a/applications/solvers/multiphase/interCondensatingEvaporatingFoam/interCondensatingEvaporatingFoam.C
+++ b/applications/solvers/multiphase/interCondensatingEvaporatingFoam/interCondensatingEvaporatingFoam.C
@@ -58,6 +58,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index 3c626373c862e43b5ab143f5136e540b6d5f7ec3..23bba65dbb282de2337f7cac684451e1c9be22ea 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -55,6 +55,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
index f6be50eb4644f1744bb126d261fa1f0216689988..b0db0a92a89e95c6eaba27967c7abfc5edb08f78 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
diff --git a/applications/solvers/multiphase/interIsoFoam/interIsoFoam.C b/applications/solvers/multiphase/interIsoFoam/interIsoFoam.C
index 0405546bc6fdc0b9330895c4722f5ee3650e0ae5..07a0cf1e6df2b4a42d0734dc1daf2c7bf303cef6 100644
--- a/applications/solvers/multiphase/interIsoFoam/interIsoFoam.C
+++ b/applications/solvers/multiphase/interIsoFoam/interIsoFoam.C
@@ -68,6 +68,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
index abbd9b7e43414adda034dcb144721bf0e84cda9a..d28c5cdca3729416079d93a44962d67613e85bf8 100644
--- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
@@ -58,6 +58,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
index debca9adecc5ab7e6e5572e0e35f5ad47013f4b2..d52c2234bc87c43fe48ae4fb3ff7a896655881f0 100644
--- a/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
+++ b/applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
@@ -50,6 +50,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
index 08985131e9e12c539521cc6c5d069e817793ca8a..3f61b3f82c475c82c0ed864511a8d0d2ea28a90e 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
@@ -50,6 +50,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createDynamicFvMesh.H"
diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
index a6aac5882f56b00b82205b0aa859216d1848e640..e5e9a1af0b07ce7f92b74ee037b6de64cd80259b 100644
--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
@@ -49,6 +49,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
index 43a1f28c939eac6a83c9fce1d4e1697f25606a8c..1dfdc66ab97a354e98fd8505271cb049ca0f669e 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
index fc068ac81215eecbb6d19cacf970cc4a2d8782dd..244e3ed0cba2ff3c3efb7d97ba1a1dda38948a5f 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
@@ -77,6 +77,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
index e993679c3480fe757b1ec3419407d5cf80487962..70fb04d64af76ed223a050ea2b744d434a998bff 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
@@ -47,6 +47,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index e162a0d9335a8a42ca835b623a63818f1b7d405e..244840664495e78e3fc7f17129ca9af5964ca904 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -46,6 +46,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
index d02e420ecbdf0cefa42f8bb33ecf9257e4f5d284..9d6a3e9dbb3ea0b0d76965e9e79b119893f90120 100644
--- a/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
+++ b/applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.C
@@ -47,6 +47,7 @@ int main(int argc, char *argv[])
 {
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
index ce297ac89ea35612274074f0e23decae06f90a4d..61f209d3cde6590e16bbdacf4e1d09c3c0e3a332 100644
--- a/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
+++ b/applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.C
@@ -48,6 +48,7 @@ int main(int argc, char *argv[])
     #define NO_CONTROL
     #include "postProcess.H"
 
+    #include "addCheckCaseOptions.H"
     #include "setRootCase.H"
     #include "createTime.H"
     #include "createMesh.H"
diff --git a/src/OpenFOAM/include/addCheckCaseOptions.H b/src/OpenFOAM/include/addCheckCaseOptions.H
new file mode 100644
index 0000000000000000000000000000000000000000..e2419ce082c73fd02597918d758dc5615c02d2f6
--- /dev/null
+++ b/src/OpenFOAM/include/addCheckCaseOptions.H
@@ -0,0 +1,5 @@
+Foam::argList::addBoolOption
+(
+    "check",
+    "Check set-up only using a single time step"
+);
diff --git a/src/OpenFOAM/include/createMesh.H b/src/OpenFOAM/include/createMesh.H
index 8c3d989849a2cf651323d2e78d36d872f7361f51..37bb3ecf839b27c581fd470850c859fec266ad47 100644
--- a/src/OpenFOAM/include/createMesh.H
+++ b/src/OpenFOAM/include/createMesh.H
@@ -1,14 +1,45 @@
-Foam::Info
-    << "Create mesh for time = "
-    << runTime.timeName() << Foam::nl << Foam::endl;
+Foam::autoPtr<Foam::fvMesh> meshPtr(nullptr);
 
-Foam::fvMesh mesh
-(
-    Foam::IOobject
+if (args.optionFound("check"))
+{
+    Info<< "Operating in 'check' mode: case will run for 1 time step.  "
+        << "All checks assumed OK on a clean exit" << endl;
+
+    Field<label>::allowConstructFromLargerSize = true;
+    Field<scalar>::allowConstructFromLargerSize = true;
+    Field<vector>::allowConstructFromLargerSize = true;
+    Field<sphericalTensor>::allowConstructFromLargerSize = true;
+    Field<symmTensor>::allowConstructFromLargerSize = true;
+    Field<tensor>::allowConstructFromLargerSize = true;
+
+    // Create a simplified 1D mesh and attempt to re-create boundary conditions
+    meshPtr = dummyFvMesh::equivalent1DMesh(runTime);
+
+    // Stopping after 1 iteration of the simplified mesh
+    // Note: using saWriteNow to trigger writing/execution of function objects
+    // - saNoWriteNow will only trigger the function object execute function
+    runTime.stopAt(Foam::Time::saNoWriteNow);
+//    runTime.stopAt(Foam::Time::saWriteNow);
+}
+else
+{
+    Foam::Info
+        << "Create mesh for time = "
+        << runTime.timeName() << Foam::nl << Foam::endl;
+
+    meshPtr.reset
     (
-        Foam::fvMesh::defaultRegion,
-        runTime.timeName(),
-        runTime,
-        Foam::IOobject::MUST_READ
-    )
-);
+        new Foam::fvMesh
+        (
+            Foam::IOobject
+            (
+                Foam::fvMesh::defaultRegion,
+                runTime.timeName(),
+                runTime,
+                Foam::IOobject::MUST_READ
+            )
+        )
+    );
+}
+
+Foam::fvMesh& mesh = meshPtr();
diff --git a/src/finiteVolume/cfdTools/general/include/fvCFD.H b/src/finiteVolume/cfdTools/general/include/fvCFD.H
index f539b0a004b3a1819ee036b1aa056433fc4f5368..5fc2f56e45516cf92dc5a6519ec36a63d316db2f 100644
--- a/src/finiteVolume/cfdTools/general/include/fvCFD.H
+++ b/src/finiteVolume/cfdTools/general/include/fvCFD.H
@@ -21,6 +21,7 @@
 #include "findRefCell.H"
 #include "IOMRFZoneList.H"
 #include "constants.H"
+#include "dummyFvMesh.H"
 
 #include "OSspecific.H"
 #include "argList.H"