Thermodynamics: Completed most of the conversion of the enthalpy source

applications/solvers/compressible/rhoPimpleFoam/UEqn.H

@@ -14,4 +14,5 @@ volScalarField rAU(1.0/UEqn().A());
 if (pimple.momentumPredictor())
 {
     solve(UEqn() == -fvc::grad(p));
+    K = 0.5*magSqr(U);
 }

applications/solvers/compressible/rhoPimpleFoam/createFields.H

@@ -54,8 +54,8 @@
         )
     );
 
-    Info<< "Creating field DpDt\n" << endl;
+    Info<< "Creating field dpdt\n" << endl;
-    volScalarField DpDt
+    volScalarField dpdt("dpdt", fvc::ddt(p));
-    (
+
-        fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p)
+    Info<< "Creating field kinetic energy K\n" << endl;
-    );
+    volScalarField K("K", 0.5*magSqr(U));

applications/solvers/compressible/rhoPimpleFoam/hEqn.H

@@ -5,7 +5,8 @@
       + fvm::div(phi, h)
       - fvm::laplacian(turbulence->alphaEff(), h)
      ==
-        DpDt
+        dpdt
+      - (fvc::ddt(rho, K) + fvc::div(phi, K))
     );
 
     hEqn.relax();

applications/solvers/compressible/rhoPimpleFoam/pEqn.H

@@ -83,5 +83,6 @@ Info<< "rho max/min : " << max(rho).value()
 
 U -= rAU*fvc::grad(p);
 U.correctBoundaryConditions();
+K = 0.5*magSqr(U);
 
-DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
+dpdt = fvc::ddt(p);

applications/solvers/compressible/rhoPimpleFoam/rhoPorousMRFPimpleFoam/pEqn.H

@@ -85,5 +85,6 @@ Info<< "rho max/min : " << max(rho).value()
 
 U -= rAU*fvc::grad(p);
 U.correctBoundaryConditions();
+K = 0.5*magSqr(U);
 
-DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
+dpdt = fvc::ddt(p);

applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/hEqn.H

@@ -5,8 +5,7 @@
       - fvm::Sp(fvc::div(phi), h)
       - fvm::laplacian(turbulence->alphaEff(), h)
      ==
-        fvc::div(phi/fvc::interpolate(rho), rho/psi, "div(U,p)")
+      - fvc::div(phi, 0.5*magSqr(U), "div(phi,K)")
-      - (rho/psi)*fvc::div(phi/fvc::interpolate(rho))
     );
 
     pZones.addEnthalpySource(thermo, rho, hEqn);

applications/solvers/heatTransfer/buoyantPimpleFoam/UEqn.H

@@ -23,4 +23,5 @@
                 )*mesh.magSf()
             )
         );
+        K = 0.5*magSqr(U);
     }

applications/solvers/heatTransfer/buoyantPimpleFoam/createFields.H

@@ -74,9 +74,8 @@
     // Force p_rgh to be consistent with p
     p_rgh = p - rho*gh;
 
-    Info<< "Creating field DpDt\n" << endl;
+    Info<< "Creating field dpdt\n" << endl;
-    volScalarField DpDt
+    volScalarField dpdt("dpdt", fvc::ddt(p));
-    (
+
-        "DpDt",
+    Info<< "Creating field kinetic energy K\n" << endl;
-        fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p)
+    volScalarField K("K", 0.5*magSqr(U));
-    );

applications/solvers/heatTransfer/buoyantPimpleFoam/hEqn.H

@@ -5,7 +5,8 @@
       + fvm::div(phi, h)
       - fvm::laplacian(turbulence->alphaEff(), h)
      ==
-        DpDt
+        dpdt
+      - (fvc::ddt(rho, K) + fvc::div(phi, K))
     );
 
     hEqn.relax();

applications/solvers/heatTransfer/buoyantPimpleFoam/pEqn.H

@@ -47,6 +47,7 @@
             // calculated from the relaxed pressure
             U += rAU*fvc::reconstruct((buoyancyPhi + p_rghEqn.flux())/rhorAUf);
             U.correctBoundaryConditions();
+            K = 0.5*magSqr(U);
         }
     }
 
@@ -55,7 +56,7 @@
     // Second part of thermodynamic density update
     thermo.rho() += psi*p_rgh;
 
-    DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
+    dpdt = fvc::ddt(p);
 
     #include "rhoEqn.H"
     #include "compressibleContinuityErrs.H"

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/createFluidFields.H

@@ -1,7 +1,7 @@
     // Initialise fluid field pointer lists
     PtrList<basicRhoThermo> thermoFluid(fluidRegions.size());
     PtrList<volScalarField> rhoFluid(fluidRegions.size());
-    PtrList<volScalarField> KFluid(fluidRegions.size());
+    PtrList<volScalarField> kappaFluid(fluidRegions.size());
     PtrList<volVectorField> UFluid(fluidRegions.size());
     PtrList<surfaceScalarField> phiFluid(fluidRegions.size());
     PtrList<uniformDimensionedVectorField> gFluid(fluidRegions.size());
@@ -50,15 +50,15 @@
             )
         );
 
-        Info<< "    Adding to KFluid\n" << endl;
+        Info<< "    Adding to kappaFluid\n" << endl;
-        KFluid.set
+        kappaFluid.set
         (
             i,
             new volScalarField
             (
                 IOobject
                 (
-                    "K",
+                    "kappa",
                     runTime.timeName(),
                     fluidRegions[i],
                     IOobject::NO_READ,

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/pEqn.H

@@ -71,5 +71,5 @@
         << max(rho).value() << endl;
 
     // Update thermal conductivity
-    K = thermo.Cp()*turb.alphaEff();
+    kappa = thermo.Cp()*turb.alphaEff();
 }

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/fluid/setRegionFluidFields.H

@@ -2,7 +2,7 @@
 
     basicRhoThermo& thermo = thermoFluid[i];
     volScalarField& rho = rhoFluid[i];
-    volScalarField& K = KFluid[i];
+    volScalarField& kappa = kappaFluid[i];
     volVectorField& U = UFluid[i];
     surfaceScalarField& phi = phiFluid[i];
 

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/setRegionSolidFields.H

@@ -7,8 +7,8 @@
     tmp<volScalarField> tcp = thermo.Cp();
     const volScalarField& cp = tcp();
 
-    tmp<volScalarField> tK = thermo.K();
+    tmp<volScalarField> tkappa = thermo.K();
-    //tmp<volSymmTensorField> tK = thermo.directionalK();
+    //tmp<volSymmTensorField> tkappa = thermo.directionalkappa();
-    const volScalarField& K = tK();
+    const volScalarField& kappa = tkappa();
 
     volScalarField& T = thermo.T();

applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/solid/solveSolid.H

@@ -3,7 +3,7 @@
     {
         fvScalarMatrix tEqn
         (
-            -fvm::laplacian(K, T)
+            -fvm::laplacian(kappa, T)
         );
         tEqn.relax();
         tEqn.solve();

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/UEqn.H

@@ -23,4 +23,5 @@
             ),
             mesh.solver(U.select(finalIter))
          );
+         K = 0.5*magSqr(U);
     }

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/createFluidFields.H

@@ -1,7 +1,7 @@
     // Initialise fluid field pointer lists
     PtrList<basicRhoThermo> thermoFluid(fluidRegions.size());
     PtrList<volScalarField> rhoFluid(fluidRegions.size());
-    PtrList<volScalarField> KFluid(fluidRegions.size());
+    PtrList<volScalarField> kappaFluid(fluidRegions.size());
     PtrList<volVectorField> UFluid(fluidRegions.size());
     PtrList<surfaceScalarField> phiFluid(fluidRegions.size());
     PtrList<uniformDimensionedVectorField> gFluid(fluidRegions.size());
@@ -10,7 +10,8 @@
     PtrList<volScalarField> ghFluid(fluidRegions.size());
     PtrList<surfaceScalarField> ghfFluid(fluidRegions.size());
     PtrList<radiation::radiationModel> radiation(fluidRegions.size());
-    PtrList<volScalarField> DpDtFluid(fluidRegions.size());
+    PtrList<volScalarField> KFluid(fluidRegions.size());
+    PtrList<volScalarField> dpdtFluid(fluidRegions.size());
 
     List<scalar> initialMassFluid(fluidRegions.size());
 
@@ -45,15 +46,15 @@
             )
         );
 
-        Info<< "    Adding to KFluid\n" << endl;
+        Info<< "    Adding to kappaFluid\n" << endl;
-        KFluid.set
+        kappaFluid.set
         (
             i,
             new volScalarField
             (
                 IOobject
                 (
-                    "K",
+                    "kappa",
                     runTime.timeName(),
                     fluidRegions[i],
                     IOobject::NO_READ,
@@ -175,22 +176,25 @@
 
         initialMassFluid[i] = fvc::domainIntegrate(rhoFluid[i]).value();
 
-        Info<< "    Adding to DpDtFluid\n" << endl;
+        Info<< "    Adding to KFluid\n" << endl;
-        DpDtFluid.set
+        KFluid.set
         (
             i,
             new volScalarField
             (
-                "DpDt",
+                "K",
-                fvc::DDt
+                0.5*magSqr(UFluid[i])
-                (
-                    surfaceScalarField
-                    (
-                        "phiU",
-                        phiFluid[i]/fvc::interpolate(rhoFluid[i])
-                    ),
-                    thermoFluid[i].p()
             )
+        );
+
+        Info<< "    Adding to dpdtFluid\n" << endl;
+        dpdtFluid.set
+        (
+            i,
+            new volScalarField
+            (
+                "dpdt",
+                fvc::ddt(thermoFluid[i].p())
             )
         );
     }

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/hEqn.H

@@ -5,7 +5,8 @@
       + fvm::div(phi, h)
       - fvm::laplacian(turb.alphaEff(), h)
      ==
-        DpDt
+        dpdt
+      - (fvc::ddt(rho, K) + fvc::div(phi, K))
       + rad.Sh(thermo)
     );
 

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/pEqn.H

@@ -68,11 +68,13 @@
     // Correct velocity field
     U += rAU*fvc::reconstruct((phi - phiU)/rhorAUf);
     U.correctBoundaryConditions();
+    K = 0.5*magSqr(U);
 
     p = p_rgh + rho*gh;
 
-    // Update pressure substantive derivative
+    // Update pressure time derivative
-    DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
+    dpdt = fvc::ddt(p);
+
 
     // Solve continuity
     #include "rhoEqn.H"
@@ -91,5 +93,5 @@
     }
 
     // Update thermal conductivity
-    K = thermoFluid[i].Cp()*turb.alphaEff();
+    kappa = thermoFluid[i].Cp()*turb.alphaEff();
 }

applications/solvers/heatTransfer/chtMultiRegionFoam/fluid/setRegionFluidFields.H

@@ -2,12 +2,13 @@
 
     basicRhoThermo& thermo = thermoFluid[i];
     volScalarField& rho = rhoFluid[i];
-    volScalarField& K = KFluid[i];
+    volScalarField& kappa = kappaFluid[i];
     volVectorField& U = UFluid[i];
     surfaceScalarField& phi = phiFluid[i];
 
     compressible::turbulenceModel& turb = turbulence[i];
-    volScalarField& DpDt = DpDtFluid[i];
+    volScalarField& K = KFluid[i];
+    volScalarField& dpdt = dpdtFluid[i];
 
     volScalarField& p = thermo.p();
     const volScalarField& psi = thermo.psi();

applications/solvers/heatTransfer/chtMultiRegionFoam/solid/setRegionSolidFields.H

@@ -7,9 +7,9 @@
     tmp<volScalarField> tcp = thermo.Cp();
     const volScalarField& cp = tcp();
 
-    tmp<volScalarField> tK = thermo.K();
+    tmp<volScalarField> tkappa = thermo.K();
-    //tmp<volSymmTensorField> tK = thermo.directionalK();
+    //tmp<volSymmTensorField> tkappa = thermo.directionalkappa();
-    const volScalarField& K = tK();
+    const volScalarField& kappa = tkappa();
-    //const volSymmTensorField& K = tK();
+    //const volSymmTensorField& kappa = tkappa();
 
     volScalarField& T = thermo.T();

applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.C

@@ -31,7 +31,7 @@ Foam::scalar Foam::solidRegionDiffNo
     const fvMesh& mesh,
     const Time& runTime,
     const volScalarField& Cprho,
-    const volScalarField& K
+    const volScalarField& kappa
 )
 {
     scalar DiNum = 0.0;
@@ -39,16 +39,16 @@ Foam::scalar Foam::solidRegionDiffNo
 
     //- Take care: can have fluid domains with 0 cells so do not test for
     //  zero internal faces.
-    surfaceScalarField KrhoCpbyDelta
+    surfaceScalarField kapparhoCpbyDelta
     (
         mesh.surfaceInterpolation::deltaCoeffs()
-      * fvc::interpolate(K)
+      * fvc::interpolate(kappa)
       / fvc::interpolate(Cprho)
     );
 
-    DiNum = gMax(KrhoCpbyDelta.internalField())*runTime.deltaT().value();
+    DiNum = gMax(kapparhoCpbyDelta.internalField())*runTime.deltaT().value();
 
-    meanDiNum = (average(KrhoCpbyDelta)).value()*runTime.deltaT().value();
+    meanDiNum = (average(kapparhoCpbyDelta)).value()*runTime.deltaT().value();
 
     Info<< "Region: " << mesh.name() << " Diffusion Number mean: " << meanDiNum
         << " max: " << DiNum << endl;
@@ -62,26 +62,26 @@ Foam::scalar Foam::solidRegionDiffNo
     const fvMesh& mesh,
     const Time& runTime,
     const volScalarField& Cprho,
-    const volSymmTensorField& Kdirectional
+    const volSymmTensorField& kappadirectional
 )
 {
     scalar DiNum = 0.0;
     scalar meanDiNum = 0.0;
 
-    volScalarField K(mag(Kdirectional));
+    volScalarField kappa(mag(kappadirectional));
 
     //- Take care: can have fluid domains with 0 cells so do not test for
     //  zero internal faces.
-    surfaceScalarField KrhoCpbyDelta
+    surfaceScalarField kapparhoCpbyDelta
     (
         mesh.surfaceInterpolation::deltaCoeffs()
-      * fvc::interpolate(K)
+      * fvc::interpolate(kappa)
       / fvc::interpolate(Cprho)
     );
 
-    DiNum = gMax(KrhoCpbyDelta.internalField())*runTime.deltaT().value();
+    DiNum = gMax(kapparhoCpbyDelta.internalField())*runTime.deltaT().value();
 
-    meanDiNum = (average(KrhoCpbyDelta)).value()*runTime.deltaT().value();
+    meanDiNum = (average(kapparhoCpbyDelta)).value()*runTime.deltaT().value();
 
     Info<< "Region: " << mesh.name() << " Diffusion Number mean: " << meanDiNum
         << " max: " << DiNum << endl;

applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffNo.H

@@ -39,7 +39,7 @@ namespace Foam
         const fvMesh& mesh,
         const Time& runTime,
         const volScalarField& Cprho,
-        const volScalarField& K
+        const volScalarField& kappa
     );
 
     scalar solidRegionDiffNo
@@ -47,7 +47,7 @@ namespace Foam
         const fvMesh& mesh,
         const Time& runTime,
         const volScalarField& Cprho,
-        const volSymmTensorField& K
+        const volSymmTensorField& kappa
     );
 
 }

applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solidRegionDiffusionNo.H

@@ -11,7 +11,7 @@
                 solidRegions[i],
                 runTime,
                 rho*cp,
-                K
+                kappa
             ),
             DiNum
         );

applications/solvers/heatTransfer/chtMultiRegionFoam/solid/solveSolid.H

@@ -9,7 +9,7 @@ if (finalIter)
         tmp<fvScalarMatrix> TEqn
         (
             fvm::ddt(rho*cp, T)
-          - fvm::laplacian(K, T)
+          - fvm::laplacian(kappa, T)
         );
         TEqn().relax();
         TEqn().solve(mesh.solver(T.select(finalIter)));

applications/solvers/lagrangian/LTSReactingParcelFoam/createFields.H

@@ -124,20 +124,3 @@
         dimensionedScalar("one", dimless/dimTime, 1),
         zeroGradientFvPatchScalarField::typeName
     );
-
-    Info<< "Creating field DpDt\n" << endl;
-    volScalarField DpDt
-    (
-        IOobject
-        (
-            "DpDt",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        mesh,
-        dimensionedScalar("zero", dimPressure/dimTime, 0.0)
-    );
-
-    #include "setPressureWork.H"

applications/solvers/lagrangian/LTSReactingParcelFoam/hsEqn.H

@@ -5,7 +5,7 @@
       + mvConvection->fvmDiv(phi, hs)
       - fvm::laplacian(turbulence->alphaEff(), hs)
      ==
-        DpDt
+      - fvc::div(phi, 0.5*magSqr(U), "div(phi,K)")
       + parcels.Sh(hs)
       + radiation->Shs(thermo)
       + combustion->Sh()

applications/solvers/lagrangian/LTSReactingParcelFoam/pEqn.H

@@ -65,7 +65,5 @@
     rho = max(rho, rhoMin);
     rho = min(rho, rhoMax);
 
-    #include "setPressureWork.H"
-
     Info<< "p min/max = " << min(p).value() << ", " << max(p).value() << endl;
 }

applications/solvers/lagrangian/LTSReactingParcelFoam/setPressureWork.H

@@ -1,13 +0,0 @@
-DpDt == dimensionedScalar("zero", DpDt.dimensions(), 0.0);
-
-if (pressureWork)
-{
-    surfaceScalarField phiU("phiU", phi/fvc::interpolate(rho));
-
-    DpDt += fvc::div(phiU*fvc::interpolate(p)) - p*fvc::div(phiU);
-
-    if (pressureWorkTimeDerivative)
-    {
-        DpDt += fvc::ddt(p);
-    }
-}

applications/solvers/lagrangian/LTSReactingParcelFoam/timeScales.H

@@ -74,10 +74,10 @@ Info<< "Time scales min/max:" << endl;
             runTime.deltaTValue()
            *mag
             (
-                DpDt
+                parcels.hsTrans()/(mesh.V()*runTime.deltaT())
-              + parcels.hsTrans()/(mesh.V()*runTime.deltaT())
            // + sources(rho, hs)
               + combustion->Sh()()
+              - fvc::div(phi, 0.5*magSqr(U), "div(phi,K)")()
             )
            /rho
         );

applications/solvers/lagrangian/coalChemistryFoam/UEqn.H

@@ -17,4 +17,5 @@
     if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
+        K = 0.5*magSqr(U);
     }

applications/solvers/lagrangian/coalChemistryFoam/createFields.H

@@ -115,12 +115,11 @@
     // Set the turbulence into the combustion model
     combustion->setTurbulence(turbulence());
 
-    Info<< "Creating field DpDt\n" << endl;
+    Info<< "Creating field dpdt\n" << endl;
-    volScalarField DpDt
+    volScalarField dpdt("dpdt", fvc::ddt(p));
-    (
+
-        "DpDt",
+    Info<< "Creating field kinetic energy K\n" << endl;
-        fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p)
+    volScalarField K("K", 0.5*magSqr(U));
-    );
 
     Info<< "\nConstructing sources" << endl;
     IObasicSourceList sources(mesh);

applications/solvers/lagrangian/coalChemistryFoam/hsEqn.H

@@ -5,7 +5,8 @@
       + mvConvection->fvmDiv(phi, hs)
       - fvm::laplacian(turbulence->alphaEff(), hs)
      ==
-        DpDt
+        dpdt
+      - (fvc::ddt(rho, K) + fvc::div(phi, K))
       + combustion->Sh()
       + coalParcels.Sh(hs)
       + limestoneParcels.Sh(hs)

applications/solvers/lagrangian/coalChemistryFoam/pEqn.H

@@ -74,5 +74,6 @@ else
 
 U -= rAU*fvc::grad(p);
 U.correctBoundaryConditions();
+K = 0.5*magSqr(U);
 
-DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
+dpdt = fvc::ddt(p);

applications/solvers/lagrangian/reactingParcelFilmFoam/UEqn.H

@@ -23,4 +23,5 @@
                 )*mesh.magSf()
             )
         );
+        K = 0.5*magSqr(U);
     }

applications/solvers/lagrangian/reactingParcelFilmFoam/createFields.H

@@ -69,13 +69,11 @@
     // Set the turbulence into the combustion model
     combustion->setTurbulence(turbulence());
 
-    Info<< "Creating field DpDt\n" << endl;
+    Info<< "Creating field dpdt\n" << endl;
-    volScalarField DpDt
+    volScalarField dpdt("dpdt", fvc::ddt(p));
-    (
-        "DpDt",
-        fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p)
-    );
 
+    Info<< "Creating field kinetic energy K\n" << endl;
+    volScalarField K("K", 0.5*magSqr(U));
 
     Info<< "Calculating field g.h\n" << endl;
     volScalarField gh("gh", g & mesh.C());

applications/solvers/lagrangian/reactingParcelFilmFoam/hsEqn.H

@@ -5,7 +5,8 @@
       + mvConvection->fvmDiv(phi, hs)
       - fvm::laplacian(turbulence->alphaEff(), hs)
      ==
-        DpDt
+        dpdt
+      - (fvc::ddt(rho, K) + fvc::div(phi, K))
       + parcels.Sh(hs)
       + surfaceFilm.Sh()
       + radiation->Shs(thermo)

applications/solvers/lagrangian/reactingParcelFilmFoam/pEqn.H

@@ -43,5 +43,6 @@ p = p_rgh + rho*gh;
 
 U += rAU*fvc::reconstruct((phi - phiU)/rhorAUf);
 U.correctBoundaryConditions();
+K = 0.5*magSqr(U);
 
-DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);
+dpdt = fvc::ddt(p);

applications/solvers/lagrangian/reactingParcelFoam/UEqn.H

@@ -13,4 +13,5 @@
     if (pimple.momentumPredictor())
     {
         solve(UEqn == -fvc::grad(p));
+        K = 0.5*magSqr(U);
     }

applications/solvers/lagrangian/reactingParcelFoam/createFields.H

@@ -76,13 +76,11 @@
     // Set the turbulence into the combustion model
     combustion->setTurbulence(turbulence());
 
-    Info<< "Creating field DpDt\n" << endl;
+    Info<< "Creating field dpdt\n" << endl;
-    volScalarField DpDt
+    volScalarField dpdt("dpdt", fvc::ddt(p));
-    (
-        "DpDt",
-        fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p)
-    );
 
+    Info<< "Creating field kinetic energy K\n" << endl;
+    volScalarField K("K", 0.5*magSqr(U));
     multivariateSurfaceInterpolationScheme<scalar>::fieldTable fields;
 
     forAll(Y, i)

applications/solvers/lagrangian/reactingParcelFoam/hsEqn.H

@@ -5,7 +5,8 @@
       + mvConvection->fvmDiv(phi, hs)
       - fvm::laplacian(turbulence->alphaEff(), hs)
      ==
-        DpDt
+        dpdt
+      - (fvc::ddt(rho, K) + fvc::div(phi, K))
       + parcels.Sh(hs)
       + radiation->Shs(thermo)
       + combustion->Sh()

applications/solvers/lagrangian/reactingParcelFoam/pEqn.H

@@ -68,6 +68,6 @@ else
 
 U -= rAU*fvc::grad(p);
 U.correctBoundaryConditions();
+K = 0.5*magSqr(U);
 
-
+dpdt = fvc::ddt(p);
-DpDt = fvc::DDt(surfaceScalarField("phiU", phi/fvc::interpolate(rho)), p);

applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/TEqns.H

@@ -11,7 +11,7 @@
      ==
         heatTransferCoeff*T2/Cp1/rho1
       - fvm::Sp(heatTransferCoeff/Cp1/rho1, T1)
-      + alpha1*Dp1Dt/Cp1/rho1
+      + alpha1*(dpdt - (fvc::ddt(rho1, K1) + fvc::div(phi1, K1)))/Cp1/rho1
     );
 
     fvScalarMatrix T2Eqn
@@ -23,7 +23,7 @@
      ==
         heatTransferCoeff*T1/Cp2/rho2
       - fvm::Sp(heatTransferCoeff/Cp2/rho2, T2)
-      + alpha2*Dp2Dt/Cp2/rho2
+      + alpha2*(dpdt - (fvc::ddt(rho2, K2) + fvc::div(phi2, K2)))/Cp2/rho2
     );
 
     T1Eqn.relax();

applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createFields.H

@@ -357,6 +357,10 @@
     volScalarField dgdt =
         pos(alpha2)*fvc::div(phi)/max(alpha2, scalar(0.0001));
 
-    Info<< "Creating field DpDt\n" << endl;
+
-    volScalarField Dp1Dt(fvc::DDt(phi1, p));
+    Info<< "Creating field dpdt\n" << endl;
-    volScalarField Dp2Dt(fvc::DDt(phi2, p));
+    volScalarField dpdt("dpdt", fvc::ddt(p));
+
+    Info<< "Creating field kinetic energy K\n" << endl;
+    volScalarField K1("K1", 0.5*magSqr(U1));
+    volScalarField K2("K2", 0.5*magSqr(U2));

applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H

@@ -127,6 +127,8 @@
     rho1 = rho10 + psi1*p;
     rho2 = rho20 + psi2*p;
 
-    Dp1Dt = fvc::DDt(phi1, p);
+    K1 = 0.5*magSqr(U1);
-    Dp2Dt = fvc::DDt(phi2, p);
+    K2 = 0.5*magSqr(U1);
+
+    dpdt = fvc::ddt(p);
 }

tutorials/compressible/rhoPimpleFoam/les/pitzDaily/system/fvSchemes

@@ -30,7 +30,7 @@ divSchemes
     default         none;
     div(phi,U)      Gauss filteredLinear2V 0.2 0;
     div(phi,h)      Gauss filteredLinear2 0.2 0;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(phi,k)      Gauss limitedLinear 1;
     div(phi,B)      Gauss limitedLinear 1;
     div(phi,muTilda) Gauss limitedLinear 1;

tutorials/compressible/rhoPimpleFoam/ras/angledDuct/system/fvSchemes

@@ -31,7 +31,7 @@ divSchemes
     default         none;
     div(phi,U)      Gauss upwind;
     div(phid,p)     Gauss upwind;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(phi,h)      Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/compressible/rhoPimpleFoam/ras/cavity/system/fvSchemes

@@ -31,7 +31,7 @@ divSchemes
     default         none;
     div(phi,U)      Gauss limitedLinearV 1;
     div(phid,p)     Gauss limitedLinear 1;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(phi,h)      Gauss limitedLinear 1;
     div(phi,k)      Gauss limitedLinear 1;
     div(phi,epsilon) Gauss limitedLinear 1;

tutorials/compressible/rhoPorousMRFLTSPimpleFoam/angledDuct/system/fvSchemes

@@ -31,7 +31,7 @@ divSchemes
     default         none;
     div(phi,U)      Gauss upwind;
     div(phid,p)     Gauss upwind;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(phi,h)      Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/compressible/rhoPorousMRFPimpleFoam/mixerVessel2D/system/fvSchemes

@@ -33,7 +33,7 @@ divSchemes
     div(phi,k)      Gauss limitedLinear 1;
     div(phi,epsilon) Gauss limitedLinear 1;
     div((muEff*dev2(T(grad(U))))) Gauss linear;
-    div(phiU,p) Gauss linear;
+    div(phi,K)      Gauss linear;
 }
 
 laplacianSchemes

tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes

@@ -32,7 +32,7 @@ divSchemes
     div(phi,h)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,k)      Gauss upwind;
-    div(U,p)        Gauss upwind;
+    div(phi,K)      Gauss upwind;
 }
 
 laplacianSchemes

tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary

@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      ascii;
+    format      binary;
     class       polyBoundaryMesh;
     location    "constant/polyMesh";
     object      boundary;

tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes

@@ -32,7 +32,7 @@ divSchemes
     div(phi,h)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,k)      Gauss upwind;
-    div(U,p)        Gauss upwind;
+    div(phi,K)      Gauss upwind;
 }
 
 laplacianSchemes

tutorials/compressible/sonicFoam/laminar/forwardStep/system/fvSchemes

@@ -33,7 +33,7 @@ divSchemes
     div(phi,U)      Gauss upwind;
     div(phid,p)     Gauss limitedLinear 1;
     div(phi,e)      Gauss limitedLinear 1;
-    div(phiU,p)     Gauss limitedLinear 1;
+    div(phi,K)      Gauss limitedLinear 1;
     div((muEff*dev2(T(grad(U))))) Gauss linear 1;
 }
 

tutorials/compressible/sonicFoam/laminar/shockTube/system/fvSchemes

@@ -33,7 +33,7 @@ divSchemes
     div(phi,U)      Gauss upwind;
     div(phid,p)     Gauss limitedLinear 1;
     div(phi,e)      Gauss limitedLinear 1;
-    div(phiU,p)     Gauss limitedLinear 1;
+    div(phi,K)      Gauss limitedLinear 1;
     div((muEff*dev2(T(grad(U))))) Gauss linear 1;
 }
 

tutorials/compressible/sonicFoam/ras/nacaAirfoil/system/fvSchemes

@@ -34,7 +34,7 @@ divSchemes
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
     div(phid,p)     Gauss limitedLinear 1;
-    div(phiU,p)     Gauss limitedLinear 1;
+    div(phi,K)      Gauss limitedLinear 1;
     div(phi,e)      Gauss limitedLinear 1;
     div((muEff*dev2(T(grad(U))))) Gauss linear;
 }

tutorials/compressible/sonicFoam/ras/prism/system/fvSchemes

@@ -34,7 +34,7 @@ divSchemes
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
     div(phid,p)     Gauss limitedLinear 1;
-    div(phiU,p)     Gauss limitedLinear 1;
+    div(phi,K)      Gauss limitedLinear 1;
     div(phi,e)      Gauss limitedLinear 1;
     div((muEff*dev2(T(grad(U))))) Gauss linear;
 }

tutorials/heatTransfer/buoyantPimpleFoam/hotRoom/system/fvSchemes

@@ -33,7 +33,7 @@ divSchemes
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,R)      Gauss upwind;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(R)          Gauss linear;
     div((muEff*dev2(T(grad(U))))) Gauss linear;
 }

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/bottomAir/fvSchemes

@@ -28,7 +28,7 @@ divSchemes
 {
     default        none;
     div(phi,U)      Gauss upwind;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(phi,h)      Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionHeater/system/topAir/fvSchemes

@@ -28,7 +28,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss upwind;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(phi,h)      Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/bottomWater/fvSchemes

@@ -28,7 +28,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss upwind;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(phi,h)      Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/heatTransfer/chtMultiRegionFoam/multiRegionLiquidHeater/system/topAir/fvSchemes

@@ -28,7 +28,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss upwind;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(phi,h)      Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/bottomAir/fvSchemes

@@ -28,7 +28,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss upwind;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(phi,h)      Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/heatTransfer/chtMultiRegionFoam/snappyMultiRegionHeater/system/topAir/fvSchemes

@@ -28,7 +28,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss upwind;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(phi,h)      Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes

@@ -34,7 +34,7 @@ divSchemes
     div(phi,R)      Gauss upwind;
     div(R)          Gauss linear;
     div(phid,p)     Gauss limitedLinear 1;
-    div(phiU,p)     Gauss limitedLinear 1;
+    div(phi,K)      Gauss limitedLinear 1;
     div(phi,e)      Gauss limitedLinear 1;
     div((muEff*dev2(T(grad(U))))) Gauss linear;
 }

tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes

@@ -33,7 +33,7 @@ divSchemes
     div(phi,U)      Gauss upwind;
     div(phi,Yi_h)   Gauss upwind;
     div(phi,h)      Gauss upwind;
-    div(phiU,p)     Gauss upwind;
+    div(phi,K)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,k)      Gauss upwind;
     div((muEff*dev2(T(grad(U))))) Gauss linear;

tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution

@@ -92,8 +92,6 @@ PIMPLE
 
 additional
 {
-    pressureWork    true;
-    pressureWorkTimeDerivative true;
     solveSpecies    true;
 }
 

tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSchemes

@@ -31,7 +31,7 @@ divSchemes
     default         none;
     div(phi,U)      Gauss upwind;
     div(phid,p)     Gauss upwind;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(phi,hs)     Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/lagrangian/LTSReactingParcelFoam/verticalChannel/system/fvSolution

@@ -79,8 +79,6 @@ PIMPLE
 
 additional
 {
-    pressureWork    true;
-    pressureWorkTimeDerivative false; // true;
     solveSpecies    true;
 }
 

tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSchemes

@@ -31,7 +31,7 @@ divSchemes
     default         none;
     div(phi,U)      Gauss upwind;
     div(phid,p)     Gauss upwind;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(phi,hs)     Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/filter/system/fvSchemes

@@ -31,7 +31,7 @@ divSchemes
     default         none;
     div(phi,U)      Gauss upwind;
     div(phid,p)     Gauss upwind;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(phi,hs)     Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/parcelInBox/system/fvSchemes

@@ -31,7 +31,7 @@ divSchemes
     default         none;
     div(phi,U)      Gauss upwind;
     div(phid,p)     Gauss upwind;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(phi,hs)     Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/lagrangian/porousExplicitSourceReactingParcelFoam/verticalChannel/system/fvSchemes

@@ -33,7 +33,7 @@ divSchemes
     default         none;
     div(phi,U)      Gauss upwind;
     div(phid,p)     Gauss upwind;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(phi,hs)     Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSchemes

@@ -30,7 +30,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss upwind;
-    div(phiU,p)     Gauss upwind;
+    div(phi,K)      Gauss upwind;
     div(phi,h)      Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSchemes

@@ -30,7 +30,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss upwind;
-    div(phiU,p)     Gauss upwind;
+    div(phi,K)      Gauss upwind;
     div(phi,h)      Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSchemes

@@ -30,7 +30,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss upwind;
-    div(phiU,p)     Gauss upwind;
+    div(phi,K)      Gauss upwind;
     div(phi,h)      Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSchemes

@@ -30,7 +30,7 @@ divSchemes
 {
     default         none;
     div(phi,U)      Gauss upwind;
-    div(phiU,p)     Gauss upwind;
+    div(phi,K)      Gauss upwind;
     div(phi,h)      Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/lagrangian/reactingParcelFoam/evaporationTest/system/fvSchemes

@@ -31,7 +31,7 @@ divSchemes
     default         none;
     div(phi,U)      Gauss upwind;
     div(phid,p)     Gauss upwind;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(phi,hs)     Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSchemes

@@ -31,7 +31,7 @@ divSchemes
     default         none;
     div(phi,U)      Gauss upwind;
     div(phid,p)     Gauss upwind;
-    div(phiU,p)     Gauss linear;
+    div(phi,K)      Gauss linear;
     div(phi,hs)     Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;

tutorials/multiphase/compressibleTwoPhaseEulerFoam/bubbleColumn/system/fvSchemes

@@ -44,8 +44,8 @@ divSchemes
     div(phi,Theta)      Gauss limitedLinear 1;
     div(phid1,p)        Gauss upwind;
     div(phid2,p)        Gauss upwind;
-    div(phi1,p)         Gauss linear;
+    div(phi1,K1)        Gauss limitedLinearV 1;
-    div(phi2,p)         Gauss linear;
+    div(phi2,K2)        Gauss limitedLinearV 1;
 }
 
 laplacianSchemes

tutorials/multiphase/compressibleTwoPhaseEulerFoam/fluidisedBed/system/fvSchemes

@@ -44,8 +44,8 @@ divSchemes
     div((alpha2*Rc2))        Gauss linear;
     div(phid1,p)        Gauss upwind;
     div(phid2,p)        Gauss upwind;
-    div(phi1,p)         Gauss linear;
+    div(phi1,K1)        Gauss limitedLinearV 1;
-    div(phi2,p)         Gauss linear;
+    div(phi2,K2)        Gauss limitedLinearV 1;
 }
 
 laplacianSchemes