From 0dc0301da73db1c6621fa25abc7ff537904df10b Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Mon, 9 May 2016 15:55:23 +0100 Subject: [PATCH] applications/solvers/lagrangian: Added -postProcess option See also commit cc455173ffc914470a830c46ae51fabbba8dfdb0 --- .../solvers/DNS/dnsFoam/createFields.H | 4 + applications/solvers/DNS/dnsFoam/dnsFoam.C | 9 +- .../solvers/lagrangian/DPMFoam/DPMFoam.C | 7 +- .../solvers/lagrangian/DPMFoam/createFields.H | 2 + .../coalChemistryFoam/coalChemistryFoam.C | 15 +- .../coalChemistryFoam/createFields.H | 6 + .../createFields.H | 182 +++++++++--------- .../icoUncoupledKinematicParcelDyMFoam.C | 7 +- .../icoUncoupledKinematicParcelFoam.C | 6 +- .../reactingParcelFilmFoam/createFields.H | 5 + .../reactingParcelFilmFoam.C | 17 +- .../reactingParcelFoam/Make/options | 1 + .../reactingParcelFoam/createFieldRefs.H | 2 + .../reactingParcelFoam/createFields.H | 8 +- .../reactingParcelFoam/reactingParcelFoam.C | 16 +- .../simpleReactingParcelFoam/Make/options | 1 + .../simpleReactingParcelFoam/createFields.H | 8 +- .../simpleReactingParcelFoam.C | 14 +- .../solvers/lagrangian/sprayFoam/Make/options | 1 + .../lagrangian/sprayFoam/createFields.H | 8 +- .../sprayFoam/sprayDyMFoam/sprayDyMFoam.C | 15 +- .../sprayFoam/sprayEngineFoam/Make/options | 1 + .../sprayEngineFoam/sprayEngineFoam.C | 20 +- .../solvers/lagrangian/sprayFoam/sprayFoam.C | 18 +- .../createFields.H | 112 +++++------ .../uncoupledKinematicParcelFoam.C | 6 +- 26 files changed, 252 insertions(+), 239 deletions(-) create mode 100644 applications/solvers/lagrangian/reactingParcelFoam/createFieldRefs.H diff --git a/applications/solvers/DNS/dnsFoam/createFields.H b/applications/solvers/DNS/dnsFoam/createFields.H index 7584773636..64f4ccf465 100644 --- a/applications/solvers/DNS/dnsFoam/createFields.H +++ b/applications/solvers/DNS/dnsFoam/createFields.H @@ -1,3 +1,5 @@ +#include "readTransportProperties.H" + Info<< "Reading field p\n" << endl; volScalarField p ( @@ -29,3 +31,5 @@ volVectorField U #include "createPhi.H" mesh.setFluxRequired(p.name()); + +#include "readTurbulenceProperties.H" diff --git a/applications/solvers/DNS/dnsFoam/dnsFoam.C b/applications/solvers/DNS/dnsFoam/dnsFoam.C index b889c38674..07802b6fa5 100644 --- a/applications/solvers/DNS/dnsFoam/dnsFoam.C +++ b/applications/solvers/DNS/dnsFoam/dnsFoam.C @@ -41,16 +41,13 @@ Description int main(int argc, char *argv[]) { - #include "setRootCase.H" + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createMeshNoClear.H" - - pisoControl piso(mesh); - - #include "readTransportProperties.H" + #include "createControl.H" #include "createFields.H" - #include "readTurbulenceProperties.H" #include "initContinuityErrs.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C index 772c80bf1c..908a319d7d 100644 --- a/applications/solvers/lagrangian/DPMFoam/DPMFoam.C +++ b/applications/solvers/lagrangian/DPMFoam/DPMFoam.C @@ -53,14 +53,13 @@ int main(int argc, char *argv[]) "specify alternative cloud name. default is 'kinematicCloud'" ); + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" - - pimpleControl pimple(mesh); - + #include "createControl.H" #include "createTimeControls.H" - #include "readGravitationalAcceleration.H" #include "createFields.H" #include "initContinuityErrs.H" diff --git a/applications/solvers/lagrangian/DPMFoam/createFields.H b/applications/solvers/lagrangian/DPMFoam/createFields.H index 6c08de4b8e..26467976f5 100644 --- a/applications/solvers/lagrangian/DPMFoam/createFields.H +++ b/applications/solvers/lagrangian/DPMFoam/createFields.H @@ -1,3 +1,5 @@ +#include "readGravitationalAcceleration.H" + word continuousPhaseName ( IOdictionary diff --git a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C index 7a67cb8cf2..110fc7ea36 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C +++ b/applications/solvers/lagrangian/coalChemistryFoam/coalChemistryFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -51,22 +51,17 @@ Description int main(int argc, char *argv[]) { - #include "setRootCase.H" + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" - - pimpleControl pimple(mesh); - + #include "createControl.H" #include "createTimeControls.H" #include "createRDeltaT.H" - #include "initContinuityErrs.H" - #include "readGravitationalAcceleration.H" #include "createFields.H" - #include "createMRF.H" #include "createFvOptions.H" - #include "createClouds.H" - #include "createRadiationModel.H" + #include "initContinuityErrs.H" turbulence->validate(); diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H index 2f9a7ce6f4..ee25bffaae 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H @@ -1,3 +1,5 @@ +#include "readGravitationalAcceleration.H" + Info<< "Creating combustion model\n" << endl; autoPtr combustion @@ -141,3 +143,7 @@ volScalarField dQ mesh, dimensionedScalar("dQ", dimEnergy/dimTime, 0.0) ); + +#include "createMRF.H" +#include "createClouds.H" +#include "createRadiationModel.H" diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H index c8b4dbc4f5..d2be5bdd08 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/createFields.H @@ -1,107 +1,109 @@ - Info<< "Reading field U\n" << endl; - volVectorField U +#include "readGravitationalAcceleration.H" + +Info<< "Reading field U\n" << endl; +volVectorField U +( + IOobject ( - IOobject - ( - "U", - runTime.timeName(), - mesh, - IOobject::MUST_READ, - IOobject::AUTO_WRITE - ), - mesh - ); - - #include "createPhi.H" - - singlePhaseTransportModel laminarTransport(U, phi); - - dimensionedScalar rhoInfValue - ( - "rhoInf", - dimDensity, - laminarTransport - ); - - volScalarField rhoInf - ( - IOobject - ( - "rho", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - mesh, - rhoInfValue - ); - - autoPtr turbulence - ( - incompressible::turbulenceModel::New(U, phi, laminarTransport) - ); - - volScalarField mu - ( - IOobject - ( - "mu", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - laminarTransport.nu()*rhoInfValue - ); - - word kinematicCloudName("kinematicCloud"); - args.optionReadIfPresent("cloudName", kinematicCloudName); - - Info<< "Constructing kinematicCloud " << kinematicCloudName << endl; - basicKinematicCollidingCloud kinematicCloud - ( - kinematicCloudName, - rhoInf, - U, - mu, - g - ); - - IOobject Hheader - ( - "H", + "U", runTime.timeName(), mesh, IOobject::MUST_READ, IOobject::AUTO_WRITE - ); + ), + mesh +); - autoPtr HPtr; +#include "createPhi.H" - if (Hheader.headerOk()) - { - Info<< "\nReading field H\n" << endl; +singlePhaseTransportModel laminarTransport(U, phi); - HPtr.reset(new volVectorField (Hheader, mesh)); - } +dimensionedScalar rhoInfValue +( + "rhoInf", + dimDensity, + laminarTransport +); - IOobject HdotGradHheader +volScalarField rhoInf +( + IOobject ( - "HdotGradH", + "rho", runTime.timeName(), mesh, - IOobject::MUST_READ, + IOobject::NO_READ, IOobject::AUTO_WRITE - ); + ), + mesh, + rhoInfValue +); - autoPtr HdotGradHPtr; +autoPtr turbulence +( + incompressible::turbulenceModel::New(U, phi, laminarTransport) +); - if (HdotGradHheader.headerOk()) - { - Info<< "Reading field HdotGradH" << endl; +volScalarField mu +( + IOobject + ( + "mu", + runTime.timeName(), + mesh, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + laminarTransport.nu()*rhoInfValue +); - HdotGradHPtr.reset(new volVectorField(HdotGradHheader, mesh)); - } +word kinematicCloudName("kinematicCloud"); +args.optionReadIfPresent("cloudName", kinematicCloudName); - #include "createNonInertialFrameFields.H" +Info<< "Constructing kinematicCloud " << kinematicCloudName << endl; +basicKinematicCollidingCloud kinematicCloud +( + kinematicCloudName, + rhoInf, + U, + mu, + g +); + +IOobject Hheader +( + "H", + runTime.timeName(), + mesh, + IOobject::MUST_READ, + IOobject::AUTO_WRITE +); + +autoPtr HPtr; + +if (Hheader.headerOk()) +{ + Info<< "\nReading field H\n" << endl; + + HPtr.reset(new volVectorField (Hheader, mesh)); +} + +IOobject HdotGradHheader +( + "HdotGradH", + runTime.timeName(), + mesh, + IOobject::MUST_READ, + IOobject::AUTO_WRITE +); + +autoPtr HdotGradHPtr; + +if (HdotGradHheader.headerOk()) +{ + Info<< "Reading field HdotGradH" << endl; + + HdotGradHPtr.reset(new volVectorField(HdotGradHheader, mesh)); +} + +#include "createNonInertialFrameFields.H" diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C index b355148a94..68254dfabb 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelDyMFoam/icoUncoupledKinematicParcelDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -49,11 +49,12 @@ int main(int argc, char *argv[]) "specify alternative cloud name. default is 'kinematicCloud'" ); + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createDynamicFvMesh.H" - - #include "readGravitationalAcceleration.H" + #include "createControl.H" #include "createFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C index befcb57d02..4b9a556cfe 100644 --- a/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C +++ b/applications/solvers/lagrangian/icoUncoupledKinematicParcelFoam/icoUncoupledKinematicParcelFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,10 +48,12 @@ int main(int argc, char *argv[]) "specify alternative cloud name. default is 'kinematicCloud'" ); + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" - #include "readGravitationalAcceleration.H" + #include "createControl.H" #include "createFields.H" // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * // diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H index 63d8b8b05c..a84f09ea48 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H @@ -142,3 +142,8 @@ volScalarField dQ mesh, dimensionedScalar("dQ", dimEnergy/dimTime, 0.0) ); + +#include "createMRF.H" +#include "createClouds.H" +#include "createRadiationModel.H" +#include "createSurfaceFilmModel.H" diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C b/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C index c776889e6b..06d9b3206c 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/reactingParcelFilmFoam.C @@ -44,23 +44,18 @@ Description int main(int argc, char *argv[]) { - #include "setRootCase.H" + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" - - pimpleControl pimple(mesh); - - #include "createFields.H" - #include "createMRF.H" - #include "createFvOptions.H" - #include "createClouds.H" - #include "createRadiationModel.H" - #include "createSurfaceFilmModel.H" - #include "initContinuityErrs.H" + #include "createControl.H" #include "createTimeControls.H" + #include "createFields.H" + #include "createFvOptions.H" #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" + #include "initContinuityErrs.H" turbulence->validate(); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/Make/options index 755aa59e9a..f39888db2f 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I. \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFieldRefs.H b/applications/solvers/lagrangian/reactingParcelFoam/createFieldRefs.H new file mode 100644 index 0000000000..5842906a6b --- /dev/null +++ b/applications/solvers/lagrangian/reactingParcelFoam/createFieldRefs.H @@ -0,0 +1,2 @@ +const volScalarField& T = thermo.T(); +const volScalarField& psi = thermo.psi(); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H index 54f0e9e9b2..32608bd964 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H @@ -1,3 +1,5 @@ +#include "readGravitationalAcceleration.H" + Info<< "Creating combustion model\n" << endl; autoPtr combustion @@ -24,8 +26,6 @@ if (!composition.contains(inertSpecie)) } volScalarField& p = thermo.p(); -const volScalarField& T = thermo.T(); -const volScalarField& psi = thermo.psi(); volScalarField rho ( @@ -133,3 +133,7 @@ volScalarField dQ mesh, dimensionedScalar("dQ", dimEnergy/dimTime, 0.0) ); + +#include "createMRF.H" +#include "createRadiationModel.H" +#include "createClouds.H" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C index 46a8e0ab93..de60a5fe58 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/reactingParcelFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -46,22 +46,18 @@ Description int main(int argc, char *argv[]) { - #include "setRootCase.H" + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" - #include "readGravitationalAcceleration.H" - - pimpleControl pimple(mesh); - + #include "createControl.H" #include "createTimeControls.H" #include "createRDeltaT.H" - #include "initContinuityErrs.H" #include "createFields.H" - #include "createRadiationModel.H" - #include "createClouds.H" - #include "createMRF.H" + #include "createFieldRefs.H" #include "createFvOptions.H" + #include "initContinuityErrs.H" turbulence->validate(); diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options index 755aa59e9a..f39888db2f 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I. \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \ -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \ diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H index 7a26729e54..03413049b4 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/createFields.H @@ -1,3 +1,5 @@ +#include "readGravitationalAcceleration.H" + Info<< "Creating combustion model\n" << endl; autoPtr combustion @@ -24,8 +26,6 @@ if (!composition.contains(inertSpecie)) } volScalarField& p = thermo.p(); -const volScalarField& T = thermo.T(); -const volScalarField& psi = thermo.psi(); volScalarField rho ( @@ -117,3 +117,7 @@ volScalarField dQ mesh, dimensionedScalar("dQ", dimEnergy/dimTime, 0.0) ); + +#include "createMRF.H" +#include "createRadiationModel.H" +#include "createClouds.H" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C index a74cbabe6c..7d0d3b9e41 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C +++ b/applications/solvers/lagrangian/reactingParcelFoam/simpleReactingParcelFoam/simpleReactingParcelFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2013-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2013-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,18 +45,14 @@ Description int main(int argc, char *argv[]) { - #include "setRootCase.H" + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" - #include "readGravitationalAcceleration.H" - - simpleControl simple(mesh); - + #include "createControl.H" #include "createFields.H" - #include "createRadiationModel.H" - #include "createClouds.H" - #include "createMRF.H" + #include "createFieldRefs.H" #include "createFvOptions.H" #include "initContinuityErrs.H" diff --git a/applications/solvers/lagrangian/sprayFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/Make/options index af719ec4c2..35233e06cb 100644 --- a/applications/solvers/lagrangian/sprayFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I. \ -I../reactingParcelFoam \ -I$(LIB_SRC)/finiteVolume/lnInclude \ -I${LIB_SRC}/meshTools/lnInclude \ diff --git a/applications/solvers/lagrangian/sprayFoam/createFields.H b/applications/solvers/lagrangian/sprayFoam/createFields.H index e043feb221..7a6156f3ad 100644 --- a/applications/solvers/lagrangian/sprayFoam/createFields.H +++ b/applications/solvers/lagrangian/sprayFoam/createFields.H @@ -1,3 +1,5 @@ +#include "readGravitationalAcceleration.H" + Info<< "Creating combustion model\n" << endl; autoPtr combustion @@ -24,8 +26,6 @@ if (!composition.contains(inertSpecie)) } volScalarField& p = thermo.p(); -const volScalarField& T = thermo.T(); -const volScalarField& psi = thermo.psi(); volScalarField rho ( @@ -131,3 +131,7 @@ volScalarField dQ mesh, dimensionedScalar("dQ", dimEnergy/dimTime, 0.0) ); + +#include "createMRF.H" +#include "createClouds.H" +#include "createRadiationModel.H" diff --git a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C index 0f19b4ecf1..0afe2f05b4 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/sprayDyMFoam/sprayDyMFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2015-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,23 +45,20 @@ Description int main(int argc, char *argv[]) { + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createDynamicFvMesh.H" - #include "initContinuityErrs.H" - - pimpleControl pimple(mesh); - + #include "createControl.H" #include "createControls.H" - #include "readGravitationalAcceleration.H" #include "createFields.H" + #include "createFieldRefs.H" #include "createRhoUf.H" - #include "createMRF.H" #include "createFvOptions.H" - #include "createClouds.H" - #include "createRadiationModel.H" #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" + #include "initContinuityErrs.H" turbulence->validate(); diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options index 5cc555e27f..86c7ad23f2 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options +++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/Make/options @@ -1,4 +1,5 @@ EXE_INC = \ + -I. \ -I../sprayDyMFoam \ -I.. \ -I../../reactingParcelFoam \ diff --git a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C index 5b6a75993a..457336b53e 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/sprayEngineFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -45,24 +45,22 @@ Description int main(int argc, char *argv[]) { - #include "setRootCase.H" + #define CREATE_TIME createEngineTime.H + #define CREATE_MESH createEngineMesh.H + #include "postProcess.H" + #include "setRootCase.H" #include "createEngineTime.H" #include "createEngineMesh.H" - - pimpleControl pimple(mesh); - - #include "readGravitationalAcceleration.H" + #include "createControl.H" + #include "readEngineTimeControls.H" #include "createFields.H" - #include "createMRF.H" + #include "createFieldRefs.H" #include "createFvOptions.H" #include "createRhoUf.H" - #include "createClouds.H" - #include "createRadiationModel.H" - #include "initContinuityErrs.H" - #include "readEngineTimeControls.H" #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" + #include "initContinuityErrs.H" #include "startSummary.H" turbulence->validate(); diff --git a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C index 754eecef49..113aff30d6 100644 --- a/applications/solvers/lagrangian/sprayFoam/sprayFoam.C +++ b/applications/solvers/lagrangian/sprayFoam/sprayFoam.C @@ -43,23 +43,19 @@ Description int main(int argc, char *argv[]) { - #include "setRootCase.H" + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" - - pimpleControl pimple(mesh); - - #include "readGravitationalAcceleration.H" - #include "createFields.H" - #include "createMRF.H" - #include "createFvOptions.H" - #include "createClouds.H" - #include "createRadiationModel.H" - #include "initContinuityErrs.H" + #include "createControl.H" #include "createTimeControls.H" + #include "createFields.H" + #include "createFieldRefs.H" + #include "createFvOptions.H" #include "compressibleCourantNo.H" #include "setInitialDeltaT.H" + #include "initContinuityErrs.H" turbulence->validate(); diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H index ee38ffa837..9f728049f9 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/createFields.H @@ -1,63 +1,65 @@ - Info<< "Reading thermophysical properties\n" << endl; +#include "readGravitationalAcceleration.H" - autoPtr pThermo +Info<< "Reading thermophysical properties\n" << endl; + +autoPtr pThermo +( + psiThermo::New(mesh) +); +psiThermo& thermo = pThermo(); + +volScalarField rho +( + IOobject ( - psiThermo::New(mesh) - ); - psiThermo& thermo = pThermo(); + "rho", + runTime.timeName(), + mesh, + IOobject::NO_READ, + IOobject::AUTO_WRITE + ), + thermo.rho() +); - volScalarField rho +Info<< "\nReading field U\n" << endl; +volVectorField U +( + IOobject ( - IOobject - ( - "rho", - runTime.timeName(), - mesh, - IOobject::NO_READ, - IOobject::AUTO_WRITE - ), - thermo.rho() - ); + "U", + runTime.timeName(), + mesh, + IOobject::MUST_READ, + IOobject::AUTO_WRITE + ), + mesh +); - Info<< "\nReading field U\n" << endl; - volVectorField U +#include "compressibleCreatePhi.H" + +Info<< "Creating turbulence model\n" << endl; +autoPtr turbulence +( + compressible::turbulenceModel::New ( - 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 - ) - ); - - const word kinematicCloudName - ( - args.optionLookupOrDefault("cloudName", "kinematicCloud") - ); - - Info<< "Constructing kinematicCloud " << kinematicCloudName << endl; - basicKinematicCloud kinematicCloud - ( - kinematicCloudName, rho, U, - thermo.mu(), - g - ); + phi, + thermo + ) +); + +const word kinematicCloudName +( + args.optionLookupOrDefault("cloudName", "kinematicCloud") +); + +Info<< "Constructing kinematicCloud " << kinematicCloudName << endl; +basicKinematicCloud kinematicCloud +( + kinematicCloudName, + rho, + U, + thermo.mu(), + g +); diff --git a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C index 6545c4d72b..5e99910dcc 100644 --- a/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C +++ b/applications/solvers/lagrangian/uncoupledKinematicParcelFoam/uncoupledKinematicParcelFoam.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | - \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -48,10 +48,12 @@ int main(int argc, char *argv[]) "specify alternative cloud name. default is 'kinematicCloud'" ); + #define NO_CONTROL + #include "postProcess.H" + #include "setRootCase.H" #include "createTime.H" #include "createMesh.H" - #include "readGravitationalAcceleration.H" #include "createFields.H" #include "compressibleCourantNo.H"