diff --git a/applications/solvers/combustion/PDRFoam/createFields.H b/applications/solvers/combustion/PDRFoam/createFields.H index 1341894242..84155c4849 100644 --- a/applications/solvers/combustion/PDRFoam/createFields.H +++ b/applications/solvers/combustion/PDRFoam/createFields.H @@ -58,23 +58,6 @@ autoPtr turbulence ); -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)); - - Info<< "Creating the unstrained laminar flame speed\n" << endl; autoPtr unstrainedLaminarFlameSpeed ( @@ -227,4 +210,8 @@ fields.add(thermo.he()); fields.add(thermo.heu()); flameWrinkling->addXi(fields); +#include "createDpdt.H" + +#include "createK.H" + #include "createMRF.H" diff --git a/applications/solvers/combustion/XiFoam/createFields.H b/applications/solvers/combustion/XiFoam/createFields.H index 9dd4b6560f..0d4c403b13 100644 --- a/applications/solvers/combustion/XiFoam/createFields.H +++ b/applications/solvers/combustion/XiFoam/createFields.H @@ -58,21 +58,6 @@ autoPtr turbulence ) ); -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)); Info<< "Creating field Xi\n" << endl; volScalarField Xi @@ -139,4 +124,8 @@ fields.add(b); fields.add(thermo.he()); fields.add(thermo.heu()); +#include "createDpdt.H" + +#include "createK.H" + #include "createMRF.H" diff --git a/applications/solvers/combustion/coldEngineFoam/createFields.H b/applications/solvers/combustion/coldEngineFoam/createFields.H index 10e1546584..19b655e21c 100644 --- a/applications/solvers/combustion/coldEngineFoam/createFields.H +++ b/applications/solvers/combustion/coldEngineFoam/createFields.H @@ -51,20 +51,8 @@ autoPtr turbulence ) ); -Info<< "Creating field dpdt\n" << endl; -volScalarField dpdt -( - IOobject - ( - "dpdt", - runTime.timeName(), - mesh - ), - mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) -); +#include "createDpdt.H" -Info<< "Creating field kinetic energy K\n" << endl; -volScalarField K("K", 0.5*magSqr(U)); +#include "createK.H" #include "createMRF.H" diff --git a/applications/solvers/combustion/fireFoam/createFields.H b/applications/solvers/combustion/fireFoam/createFields.H index 85d26aed87..626e1652ef 100644 --- a/applications/solvers/combustion/fireFoam/createFields.H +++ b/applications/solvers/combustion/fireFoam/createFields.H @@ -145,22 +145,9 @@ volScalarField Qdot dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) ); +#include "createDpdt.H" -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 "createK.H" #include "createClouds.H" #include "createSurfaceFilmModel.H" diff --git a/applications/solvers/combustion/reactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/createFields.H index bc09358193..708cab0b42 100644 --- a/applications/solvers/combustion/reactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/createFields.H @@ -71,24 +71,6 @@ autoPtr turbulence // Set the turbulence into the reaction model reaction->setTurbulence(turbulence()); - -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)); - - multivariateSurfaceInterpolationScheme::fieldTable fields; forAll(Y, i) @@ -111,4 +93,8 @@ volScalarField Qdot dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) ); +#include "createDpdt.H" + +#include "createK.H" + #include "createMRF.H" diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H index 675aef3f5a..8e56e940fb 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingBuoyantFoam/createFields.H @@ -92,23 +92,6 @@ volScalarField p_rgh // Force p_rgh to be consistent with p p_rgh = p - rho*gh; -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)); - - multivariateSurfaceInterpolationScheme::fieldTable fields; forAll(Y, i) @@ -131,4 +114,8 @@ volScalarField Qdot dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) ); +#include "createDpdt.H" + +#include "createK.H" + #include "createMRF.H" diff --git a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H index 3ad7cb7464..6f0c93cc5d 100644 --- a/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H +++ b/applications/solvers/combustion/reactingFoam/rhoReactingFoam/createFields.H @@ -72,24 +72,6 @@ autoPtr turbulence // Set the turbulence into the reaction model reaction->setTurbulence(turbulence()); - -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)); - - multivariateSurfaceInterpolationScheme::fieldTable fields; forAll(Y, i) @@ -112,6 +94,10 @@ volScalarField Qdot dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) ); +#include "createDpdt.H" + +#include "createK.H" + #include "createMRF.H" dimensionedScalar rhoMax diff --git a/applications/solvers/compressible/sonicFoam/createFields.H b/applications/solvers/compressible/sonicFoam/createFields.H index 1b54f4a912..0c929b3ffb 100644 --- a/applications/solvers/compressible/sonicFoam/createFields.H +++ b/applications/solvers/compressible/sonicFoam/createFields.H @@ -50,7 +50,6 @@ autoPtr turbulence ) ); -Info<< "Creating field kinetic energy K\n" << endl; -volScalarField K("K", 0.5*magSqr(U)); +#include "createK.H" #include "createMRF.H" diff --git a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H index cc0bc64f0a..d4f6eb54e7 100644 --- a/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H +++ b/applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H @@ -73,22 +73,6 @@ p_rgh = p - rho*gh; mesh.setFluxRequired(p_rgh.name()); -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)); - label pRefCell = 0; scalar pRefValue = 0.0; @@ -113,5 +97,9 @@ if (p_rgh.needReference()) dimensionedScalar initialMass("initialMass", fvc::domainIntegrate(rho)); +#include "createDpdt.H" + +#include "createK.H" + #include "createMRF.H" #include "createRadiationModel.H" diff --git a/applications/solvers/heatTransfer/thermoFoam/createFields.H b/applications/solvers/heatTransfer/thermoFoam/createFields.H index 3a217895f6..90f25a89a3 100644 --- a/applications/solvers/heatTransfer/thermoFoam/createFields.H +++ b/applications/solvers/heatTransfer/thermoFoam/createFields.H @@ -37,20 +37,8 @@ volVectorField U #include "setAlphaEff.H" -Info<< "Creating field dpdt\n" << endl; -volScalarField dpdt -( - IOobject - ( - "dpdt", - runTime.timeName(), - mesh - ), - mesh, - dimensionedScalar("dpdt", p.dimensions()/dimTime, 0) -); +#include "createDpdt.H" -Info<< "Creating field kinetic energy K\n" << endl; -volScalarField K("K", 0.5*magSqr(U)); +#include "createK.H" #include "createRadiationModel.H" diff --git a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H index 4e4f45e721..f97d5af51e 100644 --- a/applications/solvers/lagrangian/coalChemistryFoam/createFields.H +++ b/applications/solvers/lagrangian/coalChemistryFoam/createFields.H @@ -115,22 +115,6 @@ autoPtr turbulence // Set the turbulence into the combustion model combustion->setTurbulence(turbulence()); -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)); - volScalarField Qdot ( IOobject @@ -145,6 +129,10 @@ volScalarField Qdot dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) ); +#include "createDpdt.H" + +#include "createK.H" + #include "createMRF.H" #include "createClouds.H" #include "createRadiationModel.H" diff --git a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H index 0159cdba15..6ecb8c7e44 100644 --- a/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H @@ -69,23 +69,6 @@ autoPtr turbulence // Set the turbulence into the combustion model combustion->setTurbulence(turbulence()); -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 "readGravitationalAcceleration.H" #include "readhRef.H" #include "gh.H" @@ -148,6 +131,10 @@ volScalarField Qdot dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) ); +#include "createDpdt.H" + +#include "createK.H" + #include "createMRF.H" #include "createClouds.H" #include "createRadiationModel.H" diff --git a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H index 2da47d4ced..ce7e5441e0 100644 --- a/applications/solvers/lagrangian/reactingParcelFoam/createFields.H +++ b/applications/solvers/lagrangian/reactingParcelFoam/createFields.H @@ -96,22 +96,6 @@ autoPtr turbulence // Set the turbulence into the combustion model combustion->setTurbulence(turbulence()); -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)); - Info<< "Creating multi-variate interpolation scheme\n" << endl; multivariateSurfaceInterpolationScheme::fieldTable fields; @@ -135,6 +119,10 @@ volScalarField Qdot dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) ); +#include "createDpdt.H" + +#include "createK.H" + #include "createMRF.H" #include "createRadiationModel.H" #include "createClouds.H" diff --git a/applications/solvers/lagrangian/sprayFoam/createFields.H b/applications/solvers/lagrangian/sprayFoam/createFields.H index e2124b3685..df9df8fbf3 100644 --- a/applications/solvers/lagrangian/sprayFoam/createFields.H +++ b/applications/solvers/lagrangian/sprayFoam/createFields.H @@ -94,21 +94,6 @@ autoPtr turbulence // Set the turbulence into the combustion model combustion->setTurbulence(turbulence()); -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)); multivariateSurfaceInterpolationScheme::fieldTable fields; forAll(Y, i) @@ -131,6 +116,10 @@ volScalarField Qdot dimensionedScalar("Qdot", dimEnergy/dimVolume/dimTime, 0.0) ); +#include "createDpdt.H" + +#include "createK.H" + #include "createMRF.H" #include "createClouds.H" #include "createRadiationModel.H" diff --git a/applications/solvers/multiphase/compressibleInterFoam/createFields.H b/applications/solvers/multiphase/compressibleInterFoam/createFields.H index 0616b80ea8..c1f3538169 100644 --- a/applications/solvers/multiphase/compressibleInterFoam/createFields.H +++ b/applications/solvers/multiphase/compressibleInterFoam/createFields.H @@ -98,7 +98,6 @@ autoPtr turbulence compressible::turbulenceModel::New(rho, U, rhoPhi, mixture) ); -Info<< "Creating field kinetic energy K\n" << endl; -volScalarField K("K", 0.5*magSqr(U)); +#include "createK.H" #include "createMRF.H" diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H index dcb89c35b9..39930ed638 100644 --- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H +++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H @@ -65,5 +65,4 @@ autoPtr turbulence ) ); -Info<< "Creating field kinetic energy K\n" << endl; -volScalarField K("K", 0.5*magSqr(U)); +#include "createK.H" diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/createFields.H b/applications/solvers/multiphase/interCondensingEvaporatingFoam/createFields.H index 4d43cf3d5d..87a9b2bbc0 100644 --- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/createFields.H +++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/createFields.H @@ -124,9 +124,6 @@ volScalarField kappaEff thermo->kappa() ); -Info<< "Creating field kinetic energy K\n" << endl; -volScalarField K("K", 0.5*magSqr(U)); - Info<< "Creating field pDivU\n" << endl; volScalarField pDivU ( diff --git a/applications/solvers/multiphase/interCondensingEvaporatingFoam/pEqn.H b/applications/solvers/multiphase/interCondensingEvaporatingFoam/pEqn.H index 366dc78a12..5c7eec6d3c 100644 --- a/applications/solvers/multiphase/interCondensingEvaporatingFoam/pEqn.H +++ b/applications/solvers/multiphase/interCondensingEvaporatingFoam/pEqn.H @@ -47,7 +47,6 @@ U = HbyA + rAU*fvc::reconstruct((phig + p_rghEqn.flux())/rAUf); U.correctBoundaryConditions(); fvOptions.correct(U); - K = 0.5*magSqr(U); } } diff --git a/src/finiteVolume/cfdTools/compressible/createDpdt.H b/src/finiteVolume/cfdTools/compressible/createDpdt.H index 7c73006924..2d645e5e1d 100644 --- a/src/finiteVolume/cfdTools/compressible/createDpdt.H +++ b/src/finiteVolume/cfdTools/compressible/createDpdt.H @@ -1,7 +1,7 @@ Info<< "Creating field dpdt\n" << endl; volScalarField dpdt ( - IOobject + IOobject ( "dpdt", runTime.timeName(),