BUG: simpleFoam: moved createFvOptions.H into createFields.H for -postProcess option

To unsure fvOptions are instantiated for post-processing createFvOptions.H must
be included in createFields.H rather than in the solver directly.

Resolves bug-report https://bugs.openfoam.org/view.php?id=2733

BUG: porousSimpleFoam: moved createFvOptions.H into createFields.H for -postProcess option

Resolves bug-report https://bugs.openfoam.org/view.php?id=2733

BUG: solvers: Moved fvOption construction into createFields.H for post-processing

This ensures that the fvOptions are constructed for the -postProcessing option
so that functionObjects which process fvOption data operate correctly in this
mode.

applications/solvers/basic/laplacianFoam/createFields.H

@@ -37,3 +37,5 @@ dimensionedScalar DT
     dimArea/dimTime,
     transportProperties
 );
+
+#include "createFvOptions.H"

applications/solvers/basic/laplacianFoam/laplacianFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -67,7 +67,6 @@ int main(int argc, char *argv[])
     simpleControl simple(mesh);
 
     #include "createFields.H"
-    #include "createFvOptions.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

applications/solvers/basic/scalarTransportFoam/createFields.H

@@ -55,3 +55,5 @@ dimensionedScalar DT
 );
 
 #include "createPhi.H"
+
+#include "createFvOptions.H"

applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -68,7 +68,6 @@ int main(int argc, char *argv[])
     simpleControl simple(mesh);
 
     #include "createFields.H"
-    #include "createFvOptions.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

applications/solvers/combustion/PDRFoam/PDRFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -97,7 +97,6 @@ int main(int argc, char *argv[])
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "createTimeControls.H"
     #include "compressibleCourantNo.H"

applications/solvers/combustion/PDRFoam/createFields.H

@@ -215,3 +215,4 @@ flameWrinkling->addXi(fields);
 #include "createK.H"
 
 #include "createMRF.H"
+#include "createFvOptions.H"

applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C

@@ -79,7 +79,6 @@ int main(int argc, char *argv[])
     #include "readCombustionProperties.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
     #include "createRhoUf.H"
     #include "initContinuityErrs.H"
     #include "readEngineTimeControls.H"

applications/solvers/combustion/XiFoam/XiFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -74,7 +74,6 @@ int main(int argc, char *argv[])
     #include "readCombustionProperties.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "createTimeControls.H"
     #include "compressibleCourantNo.H"

applications/solvers/combustion/XiFoam/createFields.H

@@ -129,3 +129,4 @@ fields.add(thermo.heu());
 #include "createK.H"
 
 #include "createMRF.H"
+#include "createFvOptions.H"

applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C

@@ -55,7 +55,6 @@ int main(int argc, char *argv[])
     #include "createControl.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
     #include "createRhoUf.H"
     #include "initContinuityErrs.H"
     #include "readEngineTimeControls.H"

applications/solvers/combustion/coldEngineFoam/createFields.H

@@ -56,3 +56,4 @@ autoPtr<compressible::turbulenceModel> turbulence
 #include "createK.H"
 
 #include "createMRF.H"
+#include "createFvOptions.H"

applications/solvers/combustion/fireFoam/createFields.H

@@ -153,3 +153,4 @@ volScalarField Qdot
 #include "createSurfaceFilmModel.H"
 #include "createPyrolysisModel.H"
 #include "createRadiationModel.H"
+#include "createFvOptions.H"

applications/solvers/combustion/fireFoam/fireFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -57,7 +57,6 @@ int main(int argc, char *argv[])
     #include "createControl.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "createTimeControls.H"
     #include "compressibleCourantNo.H"

applications/solvers/combustion/reactingFoam/createFields.H

@@ -98,3 +98,4 @@ volScalarField Qdot
 #include "createK.H"
 
 #include "createMRF.H"
+#include "createFvOptions.H"

applications/solvers/combustion/reactingFoam/reactingFoam.C

@@ -56,7 +56,6 @@ int main(int argc, char *argv[])
     #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
 
     turbulence->validate();
 

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H

@@ -119,3 +119,4 @@ volScalarField Qdot
 #include "createK.H"
 
 #include "createMRF.H"
+#include "createFvOptions.H"

applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,6 @@ int main(int argc, char *argv[])
     #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
 
     turbulence->validate();
 

applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H

@@ -122,3 +122,4 @@ dimensionedScalar rhoMin
     )
 );
 
+#include "createFvOptions.H"

applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C

@@ -57,7 +57,6 @@ int main(int argc, char *argv[])
     #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
 
     turbulence->validate();
 

applications/solvers/compressible/rhoPimpleFoam/createFields.H

@@ -84,3 +84,5 @@ dimensionedScalar rhoMin
         0
     )
 );
+
+#include "createFvOptions.H"

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C

@@ -61,7 +61,6 @@ int main(int argc, char *argv[])
     #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
     #include "createRhoUf.H"
     #include "createControls.H"
 

applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C

@@ -60,7 +60,6 @@ int main(int argc, char *argv[])
     #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
 
     turbulence->validate();
 

applications/solvers/compressible/rhoSimpleFoam/createFields.H

@@ -57,3 +57,4 @@ autoPtr<compressible::turbulenceModel> turbulence
 dimensionedScalar initialMass = fvc::domainIntegrate(rho);
 
 #include "createMRF.H"
+#include "createFvOptions.H"

applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C

@@ -52,7 +52,6 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "createControl.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
     #include "createZones.H"
     #include "initContinuityErrs.H"
 

applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C

@@ -51,7 +51,6 @@ int main(int argc, char *argv[])
     #include "createControl.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     turbulence->validate();

applications/solvers/compressible/sonicFoam/createFields.H

@@ -53,3 +53,4 @@ autoPtr<compressible::turbulenceModel> turbulence
 #include "createK.H"
 
 #include "createMRF.H"
+#include "createFvOptions.H"

applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C

@@ -54,7 +54,6 @@ int main(int argc, char *argv[])
     #include "createControls.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
     #include "createRhoUf.H"
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"

applications/solvers/compressible/sonicFoam/sonicFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,6 @@ int main(int argc, char *argv[])
     #include "createControl.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     turbulence->validate();

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,6 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "createControl.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
     #include "createTimeControls.H"
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"

applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H

@@ -123,3 +123,4 @@ mesh.setFluxRequired(p_rgh.name());
 
 #include "createMRF.H"
 #include "createIncompressibleRadiationModel.H"
+#include "createFvOptions.H"

applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -66,7 +66,6 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "createControl.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     turbulence->validate();

applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H

@@ -123,3 +123,4 @@ mesh.setFluxRequired(p_rgh.name());
 
 #include "createMRF.H"
 #include "createIncompressibleRadiationModel.H"
+#include "createFvOptions.H"

applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,6 @@ int main(int argc, char *argv[])
     #include "createControl.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "createTimeControls.H"
     #include "compressibleCourantNo.H"

applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H

@@ -103,3 +103,4 @@ dimensionedScalar initialMass("initialMass", fvc::domainIntegrate(rho));
 
 #include "createMRF.H"
 #include "createRadiationModel.H"
+#include "createFvOptions.H"

applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,6 @@ int main(int argc, char *argv[])
     #include "createControl.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     turbulence->validate();

applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H

@@ -111,3 +111,4 @@ dimensionedScalar rhoMin
     )
 );
 
+#include "createFvOptions.H"

applications/solvers/heatTransfer/thermoFoam/createFields.H

@@ -66,3 +66,4 @@ if (turbulencePropertiesHeader.typeHeaderOk<IOdictionary>(false))
 #include "createK.H"
 
 #include "createRadiationModel.H"
+#include "createFvOptions.H"

applications/solvers/heatTransfer/thermoFoam/thermoFoam.C

@@ -52,7 +52,6 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
 
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -79,7 +79,6 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "createControl.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
     #include "initAdjointContinuityErrs.H"
 

applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H

@@ -120,3 +120,5 @@ volScalarField alpha
 );
 zeroCells(alpha, inletCells);
 //zeroCells(alpha, outletCells);
+
+#include "createFvOptions.H"

applications/solvers/incompressible/boundaryFoam/boundaryFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -56,7 +56,6 @@ int main(int argc, char *argv[])
     #include "createTime.H"
     #include "createMesh.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
     #include "interrogateWallPatches.H"
 
     turbulence->validate();

applications/solvers/incompressible/boundaryFoam/createFields.H

@@ -47,3 +47,5 @@ dimensionedVector gradP
     dimensionSet(0, 1, -2, 0, 0),
     Zero
 );
+
+#include "createFvOptions.H"

applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,6 @@ int main(int argc, char *argv[])
     #include "createControl.H"
     #include "createTimeControls.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     turbulence->validate();

applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H

@@ -71,3 +71,5 @@ autoPtr<incompressible::turbulenceModel> turbulence
 (
     incompressible::turbulenceModel::New(U, phi, laminarTransport)
 );
+
+#include "createFvOptions.H"

applications/solvers/incompressible/pimpleFoam/createFields.H

@@ -43,3 +43,4 @@ autoPtr<incompressible::turbulenceModel> turbulence
 );
 
 #include "createMRF.H"
+#include "createFvOptions.H"

applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C

@@ -56,7 +56,6 @@ int main(int argc, char *argv[])
     #include "createControls.H"
     #include "createFields.H"
     #include "createUf.H"
-    #include "createFvOptions.H"
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"
 

applications/solvers/incompressible/pimpleFoam/pimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -85,7 +85,6 @@ int main(int argc, char *argv[])
     #include "createControl.H"
     #include "createTimeControls.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     turbulence->validate();

applications/solvers/incompressible/pisoFoam/createFields.H

@@ -43,3 +43,4 @@ autoPtr<incompressible::turbulenceModel> turbulence
 );
 
 #include "createMRF.H"
+#include "createFvOptions.H"

applications/solvers/incompressible/pisoFoam/pisoFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -82,7 +82,6 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "createControl.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     turbulence->validate();

applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -51,7 +51,6 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "createControl.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     turbulence->validate();

applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H

@@ -68,3 +68,5 @@ autoPtr<incompressible::turbulenceModel> turbulence
 (
     incompressible::turbulenceModel::New(U, phi, laminarTransport)
 );
+
+#include "createFvOptions.H"

applications/solvers/incompressible/simpleFoam/createFields.H

@@ -43,3 +43,4 @@ autoPtr<incompressible::turbulenceModel> turbulence
 );
 
 #include "createMRF.H"
+#include "createFvOptions.H"

applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,6 @@ int main(int argc, char *argv[])
     #include "createControl.H"
     #include "createFields.H"
     #include "createPorousZones.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     turbulence->validate();

applications/solvers/incompressible/simpleFoam/simpleFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,6 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "createControl.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     turbulence->validate();

applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C

@@ -59,7 +59,6 @@ int main(int argc, char *argv[])
     #include "createTimeControls.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     turbulence->validate();

applications/solvers/lagrangian/coalChemistryFoam/createFields.H

@@ -136,3 +136,4 @@ volScalarField Qdot
 #include "createMRF.H"
 #include "createClouds.H"
 #include "createRadiationModel.H"
+#include "createFvOptions.H"

applications/solvers/lagrangian/reactingParcelFoam/createFields.H

@@ -132,3 +132,4 @@ volScalarField Qdot
 #include "createRadiationModel.H"
 #include "createClouds.H"
 #include "createSurfaceFilmModel.H"
+#include "createFvOptions.H"

applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C

@@ -59,7 +59,6 @@ int main(int argc, char *argv[])
     #include "createTimeControls.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     turbulence->validate();

applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H

@@ -120,3 +120,4 @@ volScalarField Qdot
 #include "createMRF.H"
 #include "createRadiationModel.H"
 #include "createClouds.H"
+#include "createFvOptions.H"

applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C

@@ -52,7 +52,6 @@ int main(int argc, char *argv[])
     #include "createControl.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     turbulence->validate();

applications/solvers/lagrangian/sprayFoam/createFields.H

@@ -123,3 +123,4 @@ volScalarField Qdot
 #include "createMRF.H"
 #include "createClouds.H"
 #include "createRadiationModel.H"
+#include "createFvOptions.H"

applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C

@@ -59,7 +59,6 @@ int main(int argc, char *argv[])
     #include "readEngineTimeControls.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
     #include "createRhoUf.H"
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"

applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C

@@ -58,7 +58,6 @@ int main(int argc, char *argv[])
     #include "createFields.H"
     #include "createFieldRefs.H"
     #include "createRhoUf.H"
-    #include "createFvOptions.H"
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
     #include "initContinuityErrs.H"

applications/solvers/lagrangian/sprayFoam/sprayFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,6 @@ int main(int argc, char *argv[])
     #include "createTimeControls.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
     #include "compressibleCourantNo.H"
     #include "setInitialDeltaT.H"
     #include "initContinuityErrs.H"

applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C

@@ -65,7 +65,6 @@ int main(int argc, char *argv[])
     #include "createControl.H"
     #include "createFields.H"
     #include "createAlphaFluxes.H"
-    #include "createFvOptions.H"
     #include "createUf.H"
     #include "createControls.H"
     #include "CourantNo.H"

applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C

@@ -65,7 +65,6 @@ int main(int argc, char *argv[])
     #include "createFields.H"
     #include "createAlphaFluxes.H"
     #include "createSurfaceFilmModel.H"
-    #include "createFvOptions.H"
 
     volScalarField& p = mixture.p();
     volScalarField& T = mixture.T();

applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C

@@ -65,7 +65,6 @@ int main(int argc, char *argv[])
     #include "createTimeControls.H"
     #include "createFields.H"
     #include "createAlphaFluxes.H"
-    #include "createFvOptions.H"
 
     volScalarField& p = mixture.p();
     volScalarField& T = mixture.T();

applications/solvers/multiphase/compressibleInterFoam/createFields.H

@@ -98,3 +98,4 @@ autoPtr<compressible::turbulenceModel> turbulence
 #include "createK.H"
 
 #include "createMRF.H"
+#include "createFvOptions.H"

applications/solvers/multiphase/driftFluxFoam/createFields.H

@@ -132,3 +132,4 @@ mesh.setFluxRequired(alpha1.name());
 tmp<surfaceScalarField> talphaPhiCorr0;
 
 #include "createMRF.H"
+#include "createFvOptions.H"

applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -60,7 +60,6 @@ int main(int argc, char *argv[])
     #include "createControl.H"
     #include "createTimeControls.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     volScalarField& alpha2(mixture.alpha2());

applications/solvers/multiphase/interFoam/createFields.H

@@ -137,3 +137,4 @@ surfaceScalarField alphaPhiUn
 );
 
 #include "createMRF.H"
+#include "createFvOptions.H"

applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C

@@ -64,7 +64,6 @@ int main(int argc, char *argv[])
     #include "createDyMControls.H"
     #include "createFields.H"
     #include "createAlphaFluxes.H"
-    #include "createFvOptions.H"
 
     volScalarField rAU
     (

applications/solvers/multiphase/interFoam/interFoam.C

@@ -67,7 +67,6 @@ int main(int argc, char *argv[])
     #include "initContinuityErrs.H"
     #include "createFields.H"
     #include "createAlphaFluxes.H"
-    #include "createFvOptions.H"
     #include "correctPhi.H"
 
     turbulence->validate();

applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H

@@ -125,3 +125,4 @@ mesh.setFluxRequired(p_rgh.name());
 mesh.setFluxRequired(alpha2.name());
 
 #include "createMRF.H"
+#include "createFvOptions.H"

applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C

@@ -57,7 +57,6 @@ int main(int argc, char *argv[])
     #include "createTimeControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
     #include "correctPhi.H"
 
     turbulence->validate();

applications/solvers/multiphase/interPhaseChangeFoam/createFields.H

@@ -107,3 +107,5 @@ if (p_rgh.needReference())
 
 mesh.setFluxRequired(p_rgh.name());
 mesh.setFluxRequired(alpha1.name());
+
+#include "createFvOptions.H"

applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -69,7 +69,6 @@ int main(int argc, char *argv[])
     #include "../interFoam/interDyMFoam/createDyMControls.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
 
     volScalarField rAU
     (

applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,6 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "createControl.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
     #include "createTimeControls.H"
     #include "CourantNo.H"
     #include "setInitialDeltaT.H"

applications/solvers/multiphase/multiphaseInterFoam/createFields.H

@@ -93,3 +93,4 @@ if (p_rgh.needReference())
 mesh.setFluxRequired(p_rgh.name());
 
 #include "createMRF.H"
+#include "createFvOptions.H"

applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,7 +58,6 @@ int main(int argc, char *argv[])
     #include "createTimeControls.H"
     #include "createDyMControls.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
 
     volScalarField rAU
     (

applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -54,7 +54,6 @@ int main(int argc, char *argv[])
     #include "createControl.H"
     #include "initContinuityErrs.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
     #include "createTimeControls.H"
     #include "correctPhi.H"
     #include "CourantNo.H"

applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H

@@ -77,3 +77,4 @@ setRefCell(p_gh, pimple.dict(), p_ghRefCell, p_ghRefValue);
 mesh.setFluxRequired(p_gh.name());
 
 #include "createMRF.H"
+#include "createFvOptions.H"

applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C

@@ -63,7 +63,6 @@ int main(int argc, char *argv[])
     #include "createTimeControls.H"
     #include "createDyMControls.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
 
     volScalarField rAU
     (

applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -55,7 +55,6 @@ int main(int argc, char *argv[])
     #include "createControl.H"
     #include "createTimeControls.H"
     #include "createFields.H"
-    #include "createFvOptions.H"
     #include "initContinuityErrs.H"
 
     turbulence->validate();

applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H

@@ -82,3 +82,4 @@ volScalarField K1(IOobject::groupName("K", phase1.name()), 0.5*magSqr(U1));
 volScalarField K2(IOobject::groupName("K", phase2.name()), 0.5*magSqr(U2));
 
 #include "createMRF.H"
+#include "createFvOptions.H"

applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -52,7 +52,6 @@ int main(int argc, char *argv[])
     #include "createControl.H"
     #include "createFields.H"
     #include "createFieldRefs.H"
-    #include "createFvOptions.H"
     #include "createTimeControls.H"
     #include "CourantNos.H"
     #include "setInitialDeltaT.H"

src/finiteVolume/cfdTools/general/fvOptions/fvOptions.C

@@ -79,8 +79,6 @@ Foam::IOobject Foam::fv::options::createIOobject
         }
         else
         {
-            Info<< "No finite volume options present" << nl << endl;
-
             io.readOpt() = IOobject::NO_READ;
             return io;
         }

src/finiteVolume/cfdTools/general/include/createFvOptions.H

@@ -1 +1,6 @@
 fv::options& fvOptions(fv::options::New(mesh));
+
+if (!fvOptions.optionList::size())
+{
+    Info << "No finite volume options present" << endl;
+}

src/finiteVolume/cfdTools/general/include/createMRF.H

@@ -1 +1 @@
-    IOMRFZoneList MRF(mesh);
+IOMRFZoneList MRF(mesh);