From 30a18e31aefe47e10ad4e477e293f4252eb76fd4 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Mon, 9 May 2016 16:06:12 +0100 Subject: [PATCH] applications/solvers: Moved createMRF.H into createField.H to ensure MRF functionality is available for the -postProcess option --- .../basic/potentialFoam/createFields.H | 2 + .../basic/potentialFoam/potentialFoam.C | 1 - .../coldEngineFoam/coldEngineFoam.C | 1 - .../combustion/coldEngineFoam/createFields.H | 130 +++++++++--------- .../buoyantBoussinesqPimpleFoam.C | 1 - .../createFields.H | 2 + .../buoyantBoussinesqSimpleFoam.C | 1 - .../createFields.H | 2 + .../buoyantPimpleFoam/buoyantPimpleFoam.C | 1 - .../buoyantPimpleFoam/createFields.H | 2 + .../buoyantSimpleFoam/buoyantSimpleFoam.C | 1 - .../buoyantSimpleFoam/createFields.H | 2 + .../incompressible/pimpleFoam/createFields.H | 2 + .../pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C | 1 - .../incompressible/pimpleFoam/pimpleFoam.C | 1 - .../incompressible/pisoFoam/createFields.H | 2 + .../incompressible/pisoFoam/pisoFoam.C | 1 - .../multiphase/driftFluxFoam/createFields.H | 2 + .../multiphase/driftFluxFoam/driftFluxFoam.C | 1 - .../multiphaseInterFoam/createFields.H | 2 + .../multiphaseInterDyMFoam.C | 1 - .../multiphaseInterFoam/multiphaseInterFoam.C | 1 - .../potentialFreeSurfaceFoam/createFields.H | 2 + .../potentialFreeSurfaceDyMFoam.C | 1 - .../potentialFreeSurfaceFoam.C | 1 - 25 files changed, 86 insertions(+), 78 deletions(-) diff --git a/applications/solvers/basic/potentialFoam/createFields.H b/applications/solvers/basic/potentialFoam/createFields.H index 80866b5779..97801c0221 100644 --- a/applications/solvers/basic/potentialFoam/createFields.H +++ b/applications/solvers/basic/potentialFoam/createFields.H @@ -97,3 +97,5 @@ setRefCell PhiRefValue ); mesh.setFluxRequired(Phi.name()); + +#include "createMRF.H" diff --git a/applications/solvers/basic/potentialFoam/potentialFoam.C b/applications/solvers/basic/potentialFoam/potentialFoam.C index 2de65d10a9..5759421e87 100644 --- a/applications/solvers/basic/potentialFoam/potentialFoam.C +++ b/applications/solvers/basic/potentialFoam/potentialFoam.C @@ -79,7 +79,6 @@ int main(int argc, char *argv[]) pisoControl potentialFlow(mesh, "potentialFlow"); #include "createFields.H" - #include "createMRF.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C index 45ff68f17b..c3d973c862 100644 --- a/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C +++ b/applications/solvers/combustion/coldEngineFoam/coldEngineFoam.C @@ -52,7 +52,6 @@ int main(int argc, char *argv[]) #include "createControl.H" #include "createFields.H" #include "createFieldRefs.H" - #include "createMRF.H" #include "createFvOptions.H" #include "createRhoUf.H" #include "initContinuityErrs.H" diff --git a/applications/solvers/combustion/coldEngineFoam/createFields.H b/applications/solvers/combustion/coldEngineFoam/createFields.H index 6a131ef8a8..10e1546584 100644 --- a/applications/solvers/combustion/coldEngineFoam/createFields.H +++ b/applications/solvers/combustion/coldEngineFoam/createFields.H @@ -1,68 +1,70 @@ - Info<< "Reading thermophysical properties\n" << endl; +Info<< "Reading thermophysical properties\n" << endl; - autoPtr pThermo +autoPtr pThermo +( + psiThermo::New(mesh) +); +psiThermo& thermo = pThermo(); +thermo.validate(args.executable(), "h", "e"); + +volScalarField rho +( + IOobject ( - psiThermo::New(mesh) - ); - psiThermo& thermo = pThermo(); - thermo.validate(args.executable(), "h", "e"); - - volScalarField rho - ( - IOobject - ( - "rho", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - thermo.rho() - ); - - volScalarField& p = thermo.p(); - - Info<< "\nReading field U\n" << endl; - volVectorField U - ( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - - #include "compressibleCreatePhi.H" - - - Info<< "Creating turbulence model\n" << endl; - autoPtr turbulence - ( - compressible::turbulenceModel::New - ( - rho, - U, - phi, - thermo - ) - ); - - Info<< "Creating field dpdt\n" << endl; - volScalarField dpdt - ( - IOobject - ( - "dpdt", - runTime.timeName(), - mesh - ), + "rho", + runTime.timeName(), mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) - ); + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + thermo.rho() +); - Info<< "Creating field kinetic energy K\n" << endl; - volScalarField K("K", 0.5*magSqr(U)); +volScalarField& p = thermo.p(); + +Info<< "\nReading field U\n" << endl; +volVectorField U +( + IOobject + ( + "U", + runTime.timeName(), + mesh, + IOobject::MUST_READ, + IOobject::AUTO_WRITE + ), + mesh +); + +#include "compressibleCreatePhi.H" + + +Info<< "Creating turbulence model\n" << endl; +autoPtr turbulence +( + compressible::turbulenceModel::New + ( + rho, + U, + phi, + thermo + ) +); + +Info<< "Creating field dpdt\n" << endl; +volScalarField dpdt +( + IOobject + ( + "dpdt", + runTime.timeName(), + mesh + ), + mesh, + dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) +); + +Info<< "Creating field kinetic energy K\n" << endl; +volScalarField K("K", 0.5*magSqr(U)); + +#include "createMRF.H" diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C index 7e53284620..d522323fd3 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/buoyantBoussinesqPimpleFoam.C @@ -64,7 +64,6 @@ int main(int argc, char *argv[]) #include "createFields.H" #include "createIncompressibleRadiationModel.H" - #include "createMRF.H" #include "createFvOptions.H" #include "initContinuityErrs.H" #include "createTimeControls.H" diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H index 0916e2788d..cc2c5f0b4c 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantBoussinesqPimpleFoam/createFields.H @@ -120,3 +120,5 @@ if (p_rgh.needReference()) } mesh.setFluxRequired(p_rgh.name()); + +#include "createMRF.H" diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C index 63c35ed424..6c4955dfbf 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/buoyantBoussinesqSimpleFoam.C @@ -64,7 +64,6 @@ int main(int argc, char *argv[]) #include "createFields.H" #include "createIncompressibleRadiationModel.H" - #include "createMRF.H" #include "createFvOptions.H" #include "initContinuityErrs.H" diff --git a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H index e78daa67b3..583cbaf2d5 100644 --- a/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantBoussinesqSimpleFoam/createFields.H @@ -120,3 +120,5 @@ if (p_rgh.needReference()) } mesh.setFluxRequired(p_rgh.name()); + +#include "createMRF.H" diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C index a977816b5c..56ebdc5c8b 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/buoyantPimpleFoam.C @@ -51,7 +51,6 @@ int main(int argc, char *argv[]) pimpleControl pimple(mesh); #include "createFields.H" - #include "createMRF.H" #include "createFvOptions.H" #include "createRadiationModel.H" #include "initContinuityErrs.H" diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H index 8c6402f8f4..b3c45fcaaf 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H @@ -90,3 +90,5 @@ volScalarField dpdt Info<< "Creating field kinetic energy K\n" << endl; volScalarField K("K", 0.5*magSqr(U)); + +#include "createMRF.H" diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C index c319804418..cb4d67a0c2 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/buoyantSimpleFoam.C @@ -48,7 +48,6 @@ int main(int argc, char *argv[]) simpleControl simple(mesh); #include "createFields.H" - #include "createMRF.H" #include "createFvOptions.H" #include "createRadiationModel.H" #include "initContinuityErrs.H" diff --git a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H index 35c6c59560..ca107c0928 100644 --- a/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantSimpleFoam/createFields.H @@ -86,3 +86,5 @@ mesh.setFluxRequired(p_rgh.name()); dimensionedScalar initialMass = fvc::domainIntegrate(rho); dimensionedScalar totalVolume = sum(mesh.V()); + +#include "createMRF.H" diff --git a/applications/solvers/incompressible/pimpleFoam/createFields.H b/applications/solvers/incompressible/pimpleFoam/createFields.H index 1abf327c11..993ea3f4cf 100644 --- a/applications/solvers/incompressible/pimpleFoam/createFields.H +++ b/applications/solvers/incompressible/pimpleFoam/createFields.H @@ -41,3 +41,5 @@ autoPtr turbulence ( incompressible::turbulenceModel::New(U, phi, laminarTransport) ); + +#include "createMRF.H" diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C index d30bbaa67b..464ab53b9c 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C @@ -53,7 +53,6 @@ int main(int argc, char *argv[]) #include "createControls.H" #include "createFields.H" #include "createUf.H" - #include "createMRF.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 86c9ed0bd6..22be49cbd0 100644 --- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C +++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C @@ -52,7 +52,6 @@ int main(int argc, char *argv[]) #include "createControl.H" #include "createTimeControls.H" #include "createFields.H" - #include "createMRF.H" #include "createFvOptions.H" #include "initContinuityErrs.H" diff --git a/applications/solvers/incompressible/pisoFoam/createFields.H b/applications/solvers/incompressible/pisoFoam/createFields.H index 2d1c48a1fa..0a5af8ff62 100644 --- a/applications/solvers/incompressible/pisoFoam/createFields.H +++ b/applications/solvers/incompressible/pisoFoam/createFields.H @@ -41,3 +41,5 @@ autoPtr turbulence ( incompressible::turbulenceModel::New(U, phi, laminarTransport) ); + +#include "createMRF.H" diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C index 5529e23492..0913a78436 100644 --- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C +++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C @@ -50,7 +50,6 @@ int main(int argc, char *argv[]) #include "createMesh.H" #include "createControl.H" #include "createFields.H" - #include "createMRF.H" #include "createFvOptions.H" #include "initContinuityErrs.H" diff --git a/applications/solvers/multiphase/driftFluxFoam/createFields.H b/applications/solvers/multiphase/driftFluxFoam/createFields.H index f1b4e78645..52133ae619 100644 --- a/applications/solvers/multiphase/driftFluxFoam/createFields.H +++ b/applications/solvers/multiphase/driftFluxFoam/createFields.H @@ -130,3 +130,5 @@ mesh.setFluxRequired(alpha1.name()); // MULES Correction tmp talphaPhiCorr0; + +#include "createMRF.H" diff --git a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C index 990c11b8b0..b6656a9dab 100644 --- a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C +++ b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C @@ -57,7 +57,6 @@ int main(int argc, char *argv[]) #include "createControl.H" #include "createTimeControls.H" #include "createFields.H" - #include "createMRF.H" #include "createFvOptions.H" #include "initContinuityErrs.H" diff --git a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H index 1f50b72050..fed33957ed 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/createFields.H +++ b/applications/solvers/multiphase/multiphaseInterFoam/createFields.H @@ -91,3 +91,5 @@ if (p_rgh.needReference()) } mesh.setFluxRequired(p_rgh.name()); + +#include "createMRF.H" diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C index 9cff08c31f..ed80bb49ae 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C @@ -54,7 +54,6 @@ int main(int argc, char *argv[]) #include "createTimeControls.H" #include "createDyMControls.H" #include "createFields.H" - #include "createMRF.H" #include "createFvOptions.H" volScalarField rAU diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C index 68ea578ff9..f2e530cd3e 100644 --- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C +++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C @@ -51,7 +51,6 @@ int main(int argc, char *argv[]) #include "createControl.H" #include "initContinuityErrs.H" #include "createFields.H" - #include "createMRF.H" #include "createFvOptions.H" #include "createTimeControls.H" #include "correctPhi.H" diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H b/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H index 23845a4f75..e20b5aea2c 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/createFields.H @@ -75,3 +75,5 @@ label p_ghRefCell = 0; scalar p_ghRefValue = 0.0; setRefCell(p_gh, pimple.dict(), p_ghRefCell, p_ghRefValue); mesh.setFluxRequired(p_gh.name()); + +#include "createMRF.H" diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C index 9b5b6a44ed..eef6401eda 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C @@ -59,7 +59,6 @@ int main(int argc, char *argv[]) #include "createTimeControls.H" #include "createDyMControls.H" #include "createFields.H" - #include "createMRF.H" #include "createFvOptions.H" volScalarField rAU diff --git a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C index 615c76bd52..b9e629494a 100644 --- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C +++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C @@ -52,7 +52,6 @@ int main(int argc, char *argv[]) #include "createControl.H" #include "createTimeControls.H" #include "createFields.H" - #include "createMRF.H" #include "createFvOptions.H" #include "initContinuityErrs.H"