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

to ensure MRF functionality is available for the -postProcess option
This commit is contained in:
Henry Weller
2016-05-09 16:06:12 +01:00
parent 0dc0301da7
commit 30a18e31ae
25 changed files with 86 additions and 78 deletions

View File

@ -97,3 +97,5 @@ setRefCell
PhiRefValue PhiRefValue
); );
mesh.setFluxRequired(Phi.name()); mesh.setFluxRequired(Phi.name());
#include "createMRF.H"

View File

@ -79,7 +79,6 @@ int main(int argc, char *argv[])
pisoControl potentialFlow(mesh, "potentialFlow"); pisoControl potentialFlow(mesh, "potentialFlow");
#include "createFields.H" #include "createFields.H"
#include "createMRF.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

View File

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

View File

@ -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) "rho",
); runTime.timeName(),
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
),
mesh, mesh,
dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) IOobject::NO_READ,
); IOobject::AUTO_WRITE
),
thermo.rho()
);
Info<< "Creating field kinetic energy K\n" << endl; volScalarField& p = thermo.p();
volScalarField K("K", 0.5*magSqr(U));
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"

View File

@ -64,7 +64,6 @@ int main(int argc, char *argv[])
#include "createFields.H" #include "createFields.H"
#include "createIncompressibleRadiationModel.H" #include "createIncompressibleRadiationModel.H"
#include "createMRF.H"
#include "createFvOptions.H" #include "createFvOptions.H"
#include "initContinuityErrs.H" #include "initContinuityErrs.H"
#include "createTimeControls.H" #include "createTimeControls.H"

View File

@ -120,3 +120,5 @@ if (p_rgh.needReference())
} }
mesh.setFluxRequired(p_rgh.name()); mesh.setFluxRequired(p_rgh.name());
#include "createMRF.H"

View File

@ -64,7 +64,6 @@ int main(int argc, char *argv[])
#include "createFields.H" #include "createFields.H"
#include "createIncompressibleRadiationModel.H" #include "createIncompressibleRadiationModel.H"
#include "createMRF.H"
#include "createFvOptions.H" #include "createFvOptions.H"
#include "initContinuityErrs.H" #include "initContinuityErrs.H"

View File

@ -120,3 +120,5 @@ if (p_rgh.needReference())
} }
mesh.setFluxRequired(p_rgh.name()); mesh.setFluxRequired(p_rgh.name());
#include "createMRF.H"

View File

@ -51,7 +51,6 @@ int main(int argc, char *argv[])
pimpleControl pimple(mesh); pimpleControl pimple(mesh);
#include "createFields.H" #include "createFields.H"
#include "createMRF.H"
#include "createFvOptions.H" #include "createFvOptions.H"
#include "createRadiationModel.H" #include "createRadiationModel.H"
#include "initContinuityErrs.H" #include "initContinuityErrs.H"

View File

@ -90,3 +90,5 @@ volScalarField dpdt
Info<< "Creating field kinetic energy K\n" << endl; Info<< "Creating field kinetic energy K\n" << endl;
volScalarField K("K", 0.5*magSqr(U)); volScalarField K("K", 0.5*magSqr(U));
#include "createMRF.H"

View File

@ -48,7 +48,6 @@ int main(int argc, char *argv[])
simpleControl simple(mesh); simpleControl simple(mesh);
#include "createFields.H" #include "createFields.H"
#include "createMRF.H"
#include "createFvOptions.H" #include "createFvOptions.H"
#include "createRadiationModel.H" #include "createRadiationModel.H"
#include "initContinuityErrs.H" #include "initContinuityErrs.H"

View File

@ -86,3 +86,5 @@ mesh.setFluxRequired(p_rgh.name());
dimensionedScalar initialMass = fvc::domainIntegrate(rho); dimensionedScalar initialMass = fvc::domainIntegrate(rho);
dimensionedScalar totalVolume = sum(mesh.V()); dimensionedScalar totalVolume = sum(mesh.V());
#include "createMRF.H"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -130,3 +130,5 @@ mesh.setFluxRequired(alpha1.name());
// MULES Correction // MULES Correction
tmp<surfaceScalarField> talphaPhiCorr0; tmp<surfaceScalarField> talphaPhiCorr0;
#include "createMRF.H"

View File

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

View File

@ -91,3 +91,5 @@ if (p_rgh.needReference())
} }
mesh.setFluxRequired(p_rgh.name()); mesh.setFluxRequired(p_rgh.name());
#include "createMRF.H"

View File

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

View File

@ -51,7 +51,6 @@ int main(int argc, char *argv[])
#include "createControl.H" #include "createControl.H"
#include "initContinuityErrs.H" #include "initContinuityErrs.H"
#include "createFields.H" #include "createFields.H"
#include "createMRF.H"
#include "createFvOptions.H" #include "createFvOptions.H"
#include "createTimeControls.H" #include "createTimeControls.H"
#include "correctPhi.H" #include "correctPhi.H"

View File

@ -75,3 +75,5 @@ label p_ghRefCell = 0;
scalar p_ghRefValue = 0.0; scalar p_ghRefValue = 0.0;
setRefCell(p_gh, pimple.dict(), p_ghRefCell, p_ghRefValue); setRefCell(p_gh, pimple.dict(), p_ghRefCell, p_ghRefValue);
mesh.setFluxRequired(p_gh.name()); mesh.setFluxRequired(p_gh.name());
#include "createMRF.H"

View File

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

View File

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