applications/solvers: Moved createMRF.H into createField.H

to ensure MRF functionality is available for the -postProcess option
2025-11-28 03:28:01 +00:00 · 2016-05-09 16:06:12 +01:00
parent 0dc0301da7
commit 30a18e31ae
25 changed files with 86 additions and 78 deletions
--- 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"
--- 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"

    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- 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"
--- 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<psiThermo> pThermo
+autoPtr<psiThermo> 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<compressible::turbulenceModel> 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<compressible::turbulenceModel> 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- a/applications/solvers/incompressible/pimpleFoam/createFields.H
+++ b/applications/solvers/incompressible/pimpleFoam/createFields.H
@ -41,3 +41,5 @@ autoPtr<incompressible::turbulenceModel> turbulence
 (
    incompressible::turbulenceModel::New(U, phi, laminarTransport)
 );
+
+#include "createMRF.H"
--- 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"
--- 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"

--- a/applications/solvers/incompressible/pisoFoam/createFields.H
+++ b/applications/solvers/incompressible/pisoFoam/createFields.H
@ -41,3 +41,5 @@ autoPtr<incompressible::turbulenceModel> turbulence
 (
    incompressible::turbulenceModel::New(U, phi, laminarTransport)
 );
+
+#include "createMRF.H"
--- 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"

--- 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<surfaceScalarField> talphaPhiCorr0;
+
+#include "createMRF.H"
--- 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"

--- 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"
--- 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
--- 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"
--- 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"
--- 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
--- 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"