From 798ac98aef44b5e62d3f469e3a44b0cce274a374 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Mon, 23 Oct 2017 22:20:52 +0100 Subject: [PATCH] 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 | 2 ++ applications/solvers/basic/laplacianFoam/laplacianFoam.C | 3 +-- .../solvers/basic/scalarTransportFoam/createFields.H | 2 ++ .../solvers/basic/scalarTransportFoam/scalarTransportFoam.C | 3 +-- applications/solvers/combustion/PDRFoam/PDRFoam.C | 3 +-- applications/solvers/combustion/PDRFoam/createFields.H | 1 + .../solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C | 1 - applications/solvers/combustion/XiFoam/XiFoam.C | 3 +-- applications/solvers/combustion/XiFoam/createFields.H | 1 + .../solvers/combustion/coldEngineFoam/coldEngineFoam.C | 1 - .../solvers/combustion/coldEngineFoam/createFields.H | 1 + applications/solvers/combustion/fireFoam/createFields.H | 1 + applications/solvers/combustion/fireFoam/fireFoam.C | 3 +-- applications/solvers/combustion/reactingFoam/createFields.H | 1 + applications/solvers/combustion/reactingFoam/reactingFoam.C | 1 - .../reactingFoam/rhoReactingBuoyantFoam/createFields.H | 1 + .../rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C | 3 +-- .../combustion/reactingFoam/rhoReactingFoam/createFields.H | 1 + .../reactingFoam/rhoReactingFoam/rhoReactingFoam.C | 1 - .../solvers/compressible/rhoPimpleFoam/createFields.H | 2 ++ .../rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C | 1 - .../solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C | 1 - .../solvers/compressible/rhoSimpleFoam/createFields.H | 1 + .../rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C | 1 - .../solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C | 1 - applications/solvers/compressible/sonicFoam/createFields.H | 1 + .../compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C | 1 - applications/solvers/compressible/sonicFoam/sonicFoam.C | 3 +-- .../buoyantBoussinesqPimpleFoam.C | 3 +-- .../heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H | 1 + .../buoyantBoussinesqSimpleFoam.C | 3 +-- .../heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H | 1 + .../heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C | 3 +-- .../solvers/heatTransfer/buoyantPimpleFoam/createFields.H | 1 + .../heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C | 3 +-- .../solvers/heatTransfer/buoyantSimpleFoam/createFields.H | 1 + applications/solvers/heatTransfer/thermoFoam/createFields.H | 1 + applications/solvers/heatTransfer/thermoFoam/thermoFoam.C | 1 - .../adjointShapeOptimizationFoam.C | 3 +-- .../adjointShapeOptimizationFoam/createFields.H | 2 ++ .../solvers/incompressible/boundaryFoam/boundaryFoam.C | 3 +-- .../solvers/incompressible/boundaryFoam/createFields.H | 2 ++ .../incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C | 3 +-- .../incompressible/pimpleFoam/SRFPimpleFoam/createFields.H | 2 ++ .../solvers/incompressible/pimpleFoam/createFields.H | 1 + .../incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C | 1 - applications/solvers/incompressible/pimpleFoam/pimpleFoam.C | 3 +-- applications/solvers/incompressible/pisoFoam/createFields.H | 1 + applications/solvers/incompressible/pisoFoam/pisoFoam.C | 3 +-- .../incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C | 3 +-- .../incompressible/simpleFoam/SRFSimpleFoam/createFields.H | 2 ++ .../solvers/incompressible/simpleFoam/createFields.H | 1 + .../simpleFoam/porousSimpleFoam/porousSimpleFoam.C | 3 +-- applications/solvers/incompressible/simpleFoam/simpleFoam.C | 3 +-- .../solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C | 1 - .../solvers/lagrangian/coalChemistryFoam/createFields.H | 1 + .../solvers/lagrangian/reactingParcelFoam/createFields.H | 1 + .../lagrangian/reactingParcelFoam/reactingParcelFoam.C | 1 - .../simpleReactingParcelFoam/createFields.H | 1 + .../simpleReactingParcelFoam/simpleReactingParcelFoam.C | 1 - applications/solvers/lagrangian/sprayFoam/createFields.H | 1 + .../solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C | 1 - .../solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C | 1 - applications/solvers/lagrangian/sprayFoam/sprayFoam.C | 3 +-- .../compressibleInterDyMFoam/compressibleInterDyMFoam.C | 1 - .../compressibleInterFilmFoam/compressibleInterFilmFoam.C | 1 - .../multiphase/compressibleInterFoam/compressibleInterFoam.C | 1 - .../solvers/multiphase/compressibleInterFoam/createFields.H | 1 + applications/solvers/multiphase/driftFluxFoam/createFields.H | 1 + .../solvers/multiphase/driftFluxFoam/driftFluxFoam.C | 3 +-- applications/solvers/multiphase/interFoam/createFields.H | 1 + .../solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C | 1 - applications/solvers/multiphase/interFoam/interFoam.C | 1 - .../multiphase/interFoam/interMixingFoam/createFields.H | 1 + .../multiphase/interFoam/interMixingFoam/interMixingFoam.C | 1 - .../solvers/multiphase/interPhaseChangeFoam/createFields.H | 2 ++ .../interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C | 3 +-- .../multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C | 3 +-- .../solvers/multiphase/multiphaseInterFoam/createFields.H | 1 + .../multiphaseInterDyMFoam/multiphaseInterDyMFoam.C | 3 +-- .../multiphase/multiphaseInterFoam/multiphaseInterFoam.C | 3 +-- .../multiphase/potentialFreeSurfaceFoam/createFields.H | 1 + .../potentialFreeSurfaceDyMFoam.C | 1 - .../potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C | 3 +-- .../solvers/multiphase/twoPhaseEulerFoam/createFields.H | 1 + .../solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C | 3 +-- src/finiteVolume/cfdTools/general/fvOptions/fvOptions.C | 2 -- src/finiteVolume/cfdTools/general/include/createFvOptions.H | 5 +++++ src/finiteVolume/cfdTools/general/include/createMRF.H | 2 +- 89 files changed, 77 insertions(+), 80 deletions(-) diff --git a/applications/solvers/basic/laplacianFoam/createFields.H b/applications/solvers/basic/laplacianFoam/createFields.H index 7056505e99..2c38779b3a 100644 --- a/applications/solvers/basic/laplacianFoam/createFields.H +++ b/applications/solvers/basic/laplacianFoam/createFields.H @@ -37,3 +37,5 @@ dimensionedScalar DT dimArea/dimTime, transportProperties ); + +#include "createFvOptions.H" diff --git a/applications/solvers/basic/laplacianFoam/laplacianFoam.C b/applications/solvers/basic/laplacianFoam/laplacianFoam.C index 06148020d1..a59f2ec0c8 100644 --- a/applications/solvers/basic/laplacianFoam/laplacianFoam.C +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/basic/scalarTransportFoam/createFields.H b/applications/solvers/basic/scalarTransportFoam/createFields.H index 54dcb3fca5..390ac4e473 100644 --- a/applications/solvers/basic/scalarTransportFoam/createFields.H +++ b/applications/solvers/basic/scalarTransportFoam/createFields.H @@ -55,3 +55,5 @@ dimensionedScalar DT ); #include "createPhi.H" + +#include "createFvOptions.H" diff --git a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C b/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C index 12dbaa9e2e..07a99141cb 100644 --- a/applications/solvers/basic/scalarTransportFoam/scalarTransportFoam.C +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/combustion/PDRFoam/PDRFoam.C b/applications/solvers/combustion/PDRFoam/PDRFoam.C index 5f4cac3e6e..409989b6f3 100644 --- a/applications/solvers/combustion/PDRFoam/PDRFoam.C +++ b/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" diff --git a/applications/solvers/combustion/PDRFoam/createFields.H b/applications/solvers/combustion/PDRFoam/createFields.H index c0602016c8..70cec41f5b 100644 --- a/applications/solvers/combustion/PDRFoam/createFields.H +++ b/applications/solvers/combustion/PDRFoam/createFields.H @@ -215,3 +215,4 @@ flameWrinkling->addXi(fields); #include "createK.H" #include "createMRF.H" +#include "createFvOptions.H" diff --git a/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C b/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C index 1dd347fd1f..89b6370dca 100644 --- a/applications/solvers/combustion/XiFoam/XiEngineFoam/XiEngineFoam.C +++ b/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" diff --git a/applications/solvers/combustion/XiFoam/XiFoam.C b/applications/solvers/combustion/XiFoam/XiFoam.C index b4a19af179..dec1a6a138 100644 --- a/applications/solvers/combustion/XiFoam/XiFoam.C +++ b/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" diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H index 0d4c403b13..4339a3d84b 100644 --- a/applications/solvers/combustion/XiFoam/createFields.H +++ b/applications/solvers/combustion/XiFoam/createFields.H @@ -129,3 +129,4 @@ fields.add(thermo.heu()); #include "createK.H" #include "createMRF.H" +#include "createFvOptions.H" diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C index 799b2ee3fc..c1e4d16529 100644 --- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C +++ b/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" diff --git a/applications/solvers/combustion/coldEngineFoam/createFields.H b/applications/solvers/combustion/coldEngineFoam/createFields.H index 19b655e21c..7cb4e1d320 100644 --- a/applications/solvers/combustion/coldEngineFoam/createFields.H +++ b/applications/solvers/combustion/coldEngineFoam/createFields.H @@ -56,3 +56,4 @@ autoPtr turbulence #include "createK.H" #include "createMRF.H" +#include "createFvOptions.H" diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H index 2938f97f12..8db1885d33 100644 --- a/applications/solvers/combustion/fireFoam/createFields.H +++ b/applications/solvers/combustion/fireFoam/createFields.H @@ -153,3 +153,4 @@ volScalarField Qdot #include "createSurfaceFilmModel.H" #include "createPyrolysisModel.H" #include "createRadiationModel.H" +#include "createFvOptions.H" diff --git a/applications/solvers/combustion/fireFoam/fireFoam.C b/applications/solvers/combustion/fireFoam/fireFoam.C index 6b068cc302..84f7a830e8 100644 --- a/applications/solvers/combustion/fireFoam/fireFoam.C +++ b/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" diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H index e989a03a20..8ef86846b9 100644 --- a/applications/solvers/combustion/reactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/createFields.H @@ -98,3 +98,4 @@ volScalarField Qdot #include "createK.H" #include "createMRF.H" +#include "createFvOptions.H" diff --git a/applications/solvers/combustion/reactingFoam/reactingFoam.C b/applications/solvers/combustion/reactingFoam/reactingFoam.C index e2e8291661..3a3b76402f 100644 --- a/applications/solvers/combustion/reactingFoam/reactingFoam.C +++ b/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(); diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H index 330c6fbb18..afa58af394 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H @@ -119,3 +119,4 @@ volScalarField Qdot #include "createK.H" #include "createMRF.H" +#include "createFvOptions.H" diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C index f3b0b6d326..183604219b 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/rhoReactingBuoyantFoam.C +++ b/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(); diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H index 9f5b4c899b..b4d03cb761 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H @@ -122,3 +122,4 @@ dimensionedScalar rhoMin ) ); +#include "createFvOptions.H" diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C index 195b80735e..c269b12d7c 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/rhoReactingFoam.C +++ b/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(); diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H index 9d2307d418..33987a11a3 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H @@ -84,3 +84,5 @@ dimensionedScalar rhoMin 0 ) ); + +#include "createFvOptions.H" diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C index dcd73ffc68..787d799090 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C +++ b/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" diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C index 120b81f0f7..53798463f8 100644 --- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C +++ b/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(); diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H index c7914f89d3..6822efa11a 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H +++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H @@ -57,3 +57,4 @@ autoPtr turbulence dimensionedScalar initialMass = fvc::domainIntegrate(rho); #include "createMRF.H" +#include "createFvOptions.H" diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C index 967e754035..7ba9ee5ebb 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C +++ b/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" diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C index 89fa908d82..d4bb7dc734 100644 --- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C +++ b/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(); diff --git a/applications/solvers/compressible/sonicFoam/createFields.H b/applications/solvers/compressible/sonicFoam/createFields.H index 0c929b3ffb..86d85a8c82 100644 --- a/applications/solvers/compressible/sonicFoam/createFields.H +++ b/applications/solvers/compressible/sonicFoam/createFields.H @@ -53,3 +53,4 @@ autoPtr turbulence #include "createK.H" #include "createMRF.H" +#include "createFvOptions.H" diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C index 60dd32589c..831935caeb 100644 --- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C +++ b/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" diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C index 90037c2c56..46641eb690 100644 --- a/applications/solvers/compressible/sonicFoam/sonicFoam.C +++ b/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(); diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C index 2a453d933b..b769c66c6b 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C +++ b/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" diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H index def60953c4..908af133dc 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H @@ -123,3 +123,4 @@ mesh.setFluxRequired(p_rgh.name()); #include "createMRF.H" #include "createIncompressibleRadiationModel.H" +#include "createFvOptions.H" diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C index 604484d6ea..4baa85ab78 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C +++ b/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(); diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H index 043440763f..a61f66aea0 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H @@ -123,3 +123,4 @@ mesh.setFluxRequired(p_rgh.name()); #include "createMRF.H" #include "createIncompressibleRadiationModel.H" +#include "createFvOptions.H" diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C index a3bbf07b19..1b229481a1 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C +++ b/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" diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H index d4f6eb54e7..82f63c93fb 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H +++ b/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" diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C index ba03a2674d..82324ce1ba 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C +++ b/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(); diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H index 64bc8558c8..6e801a15fa 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H @@ -111,3 +111,4 @@ dimensionedScalar rhoMin ) ); +#include "createFvOptions.H" diff --git a/applications/solvers/heatTransfer/thermoFoam/createFields.H b/applications/solvers/heatTransfer/thermoFoam/createFields.H index 2e09b43e59..7c0a8b2c95 100644 --- a/applications/solvers/heatTransfer/thermoFoam/createFields.H +++ b/applications/solvers/heatTransfer/thermoFoam/createFields.H @@ -66,3 +66,4 @@ if (turbulencePropertiesHeader.typeHeaderOk(false)) #include "createK.H" #include "createRadiationModel.H" +#include "createFvOptions.H" diff --git a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C b/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C index 285f536af8..70acdd9da5 100644 --- a/applications/solvers/heatTransfer/thermoFoam/thermoFoam.C +++ b/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" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C index 0b36208ba9..d443338c26 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C +++ b/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" diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H index d7545b7900..4d7b9d8811 100644 --- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H +++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H @@ -120,3 +120,5 @@ volScalarField alpha ); zeroCells(alpha, inletCells); //zeroCells(alpha, outletCells); + +#include "createFvOptions.H" diff --git a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C b/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C index 7ed87e218e..9d5147a3fc 100644 --- a/applications/solvers/incompressible/boundaryFoam/boundaryFoam.C +++ b/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(); diff --git a/applications/solvers/incompressible/boundaryFoam/createFields.H b/applications/solvers/incompressible/boundaryFoam/createFields.H index 4402b3af68..67cc081263 100644 --- a/applications/solvers/incompressible/boundaryFoam/createFields.H +++ b/applications/solvers/incompressible/boundaryFoam/createFields.H @@ -47,3 +47,5 @@ dimensionedVector gradP dimensionSet(0, 1, -2, 0, 0), Zero ); + +#include "createFvOptions.H" diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C index 99af095921..d9f01333d4 100644 --- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C +++ b/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(); diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H index da4fee802e..b2ccf32cc8 100644 --- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H +++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H @@ -71,3 +71,5 @@ autoPtr turbulence ( incompressible::turbulenceModel::New(U, phi, laminarTransport) ); + +#include "createFvOptions.H" diff --git a/applications/solvers/incompressible/pimpleFoam/createFields.H b/applications/solvers/incompressible/pimpleFoam/createFields.H index 993ea3f4cf..089cc0871a 100644 --- a/applications/solvers/incompressible/pimpleFoam/createFields.H +++ b/applications/solvers/incompressible/pimpleFoam/createFields.H @@ -43,3 +43,4 @@ autoPtr turbulence ); #include "createMRF.H" +#include "createFvOptions.H" diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C index 47a3bd4ce2..7de38082e9 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C +++ b/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" diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C index 46e18dcfee..26d4e2480a 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C +++ b/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(); diff --git a/applications/solvers/incompressible/pisoFoam/createFields.H b/applications/solvers/incompressible/pisoFoam/createFields.H index 0a5af8ff62..6485334fec 100644 --- a/applications/solvers/incompressible/pisoFoam/createFields.H +++ b/applications/solvers/incompressible/pisoFoam/createFields.H @@ -43,3 +43,4 @@ autoPtr turbulence ); #include "createMRF.H" +#include "createFvOptions.H" diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C index ebe88caafc..5d01454078 100644 --- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C +++ b/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(); diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C index 7d6e15007a..60b9ad25bf 100644 --- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C +++ b/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(); diff --git a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H index ea565f0949..b7b0a5d10b 100644 --- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H +++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H @@ -68,3 +68,5 @@ autoPtr turbulence ( incompressible::turbulenceModel::New(U, phi, laminarTransport) ); + +#include "createFvOptions.H" diff --git a/applications/solvers/incompressible/simpleFoam/createFields.H b/applications/solvers/incompressible/simpleFoam/createFields.H index 86789ed65b..3c4971527b 100644 --- a/applications/solvers/incompressible/simpleFoam/createFields.H +++ b/applications/solvers/incompressible/simpleFoam/createFields.H @@ -43,3 +43,4 @@ autoPtr turbulence ); #include "createMRF.H" +#include "createFvOptions.H" diff --git a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C index 2e0f67a53f..8031ee363b 100644 --- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C +++ b/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(); diff --git a/applications/solvers/incompressible/simpleFoam/simpleFoam.C b/applications/solvers/incompressible/simpleFoam/simpleFoam.C index caaf58c3b8..f16cf59df4 100644 --- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C +++ b/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(); diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C index 269997ed79..1febe270c1 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C +++ b/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(); diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H index 3df6eefa27..158c7bd563 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H @@ -136,3 +136,4 @@ volScalarField Qdot #include "createMRF.H" #include "createClouds.H" #include "createRadiationModel.H" +#include "createFvOptions.H" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H index bd223a81ce..81fc4bb6d5 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H @@ -132,3 +132,4 @@ volScalarField Qdot #include "createRadiationModel.H" #include "createClouds.H" #include "createSurfaceFilmModel.H" +#include "createFvOptions.H" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C index 57a285028b..d2df47c8cb 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C +++ b/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(); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H index 47ffa16e50..2be141b8db 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H +++ b/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" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C index f9ba557872..20a6a70828 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C +++ b/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(); diff --git a/applications/solvers/lagrangian/sprayFoam/createFields.H b/applications/solvers/lagrangian/sprayFoam/createFields.H index 6b5bda6b2f..972246cc2c 100644 --- a/applications/solvers/lagrangian/sprayFoam/createFields.H +++ b/applications/solvers/lagrangian/sprayFoam/createFields.H @@ -123,3 +123,4 @@ volScalarField Qdot #include "createMRF.H" #include "createClouds.H" #include "createRadiationModel.H" +#include "createFvOptions.H" diff --git a/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C b/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C index 955f056198..489c233148 100644 --- a/applications/solvers/lagrangian/sprayFoam/engineFoam/engineFoam.C +++ b/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" diff --git a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C index 710ce766eb..9983f0cf6e 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C +++ b/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" diff --git a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C index 96dd72220f..e3b6b9f1f1 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C +++ b/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" diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C index 7828936239..116c4ec00e 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C +++ b/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" diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C index 598a0aec5d..70a714a46b 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/compressibleInterFilmFoam.C +++ b/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(); diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C index 1ed92af190..4f61ee9841 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C +++ b/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(); diff --git a/applications/solvers/multiphase/compressibleInterFoam/createFields.H b/applications/solvers/multiphase/compressibleInterFoam/createFields.H index 8170ff2f99..9100429be0 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/createFields.H +++ b/applications/solvers/multiphase/compressibleInterFoam/createFields.H @@ -98,3 +98,4 @@ autoPtr turbulence #include "createK.H" #include "createMRF.H" +#include "createFvOptions.H" diff --git a/applications/solvers/multiphase/driftFluxFoam/createFields.H b/applications/solvers/multiphase/driftFluxFoam/createFields.H index 52133ae619..d85ba792ea 100644 --- a/applications/solvers/multiphase/driftFluxFoam/createFields.H +++ b/applications/solvers/multiphase/driftFluxFoam/createFields.H @@ -132,3 +132,4 @@ mesh.setFluxRequired(alpha1.name()); tmp talphaPhiCorr0; #include "createMRF.H" +#include "createFvOptions.H" diff --git a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C index 10b05e9e81..aca3a7b2e6 100644 --- a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C +++ b/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()); diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H index c0c23c3b1e..9d7f7e7402 100644 --- a/applications/solvers/multiphase/interFoam/createFields.H +++ b/applications/solvers/multiphase/interFoam/createFields.H @@ -137,3 +137,4 @@ surfaceScalarField alphaPhiUn ); #include "createMRF.H" +#include "createFvOptions.H" diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C index 956743a4cc..4fedf55bd7 100644 --- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C +++ b/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 ( diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C index 240c70581f..affdd3cdc0 100644 --- a/applications/solvers/multiphase/interFoam/interFoam.C +++ b/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(); diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H index 5d8a42388a..7862915150 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H +++ b/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" diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C index d2c03d8897..150796f5bc 100644 --- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C +++ b/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(); diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H b/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H index da76766cc1..28c6b2c4eb 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/createFields.H +++ b/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" diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C index 268fa2cce5..6ce57a501d 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C +++ b/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 ( diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C b/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C index 7a710fdb8a..abbd9b7e43 100644 --- a/applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C +++ b/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" diff --git a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H index fed33957ed..201a4def06 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H +++ b/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" diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C index 5a39281a84..efceb9b056 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C +++ b/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 ( diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C index 8f4a59cf78..cb15e3beb4 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C +++ b/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" diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H index 61c2b37136..a9a7807949 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H +++ b/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" diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C index 18f511c5d8..0caf4c32f1 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C +++ b/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 ( diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C index 5fe31eab7b..a6aac5882f 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C +++ b/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(); diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H b/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H index d82e79ee54..1372ae309c 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H +++ b/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" diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C index 0b99456e5c..e162a0d933 100644 --- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C +++ b/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" diff --git a/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.C b/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.C index 267a5510b4..15bb909e14 100644 --- a/src/finiteVolume/cfdTools/general/fvOptions/fvOptions.C +++ b/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; } diff --git a/src/finiteVolume/cfdTools/general/include/createFvOptions.H b/src/finiteVolume/cfdTools/general/include/createFvOptions.H index aa02a3604d..796362fadd 100644 --- a/src/finiteVolume/cfdTools/general/include/createFvOptions.H +++ b/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; +} diff --git a/src/finiteVolume/cfdTools/general/include/createMRF.H b/src/finiteVolume/cfdTools/general/include/createMRF.H index d1c2b340cb..375fa6c6d3 100644 --- a/src/finiteVolume/cfdTools/general/include/createMRF.H +++ b/src/finiteVolume/cfdTools/general/include/createMRF.H @@ -1 +1 @@ - IOMRFZoneList MRF(mesh); +IOMRFZoneList MRF(mesh);