Thermodynamics: E-equation generalized to handle mesh motion

applications/solvers/combustion/PDRFoam/EaEqn.H

@@ -7,7 +7,12 @@
       + betav*fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             hea.name() == "ea"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                phi/fvc::interpolate(rho),
+                p,
+                "div(phiv,p)"
+            )
           : -betav*dpdt
         )
       - fvm::laplacian(Db, hea)

applications/solvers/combustion/PDRFoam/EauEqn.H

@@ -8,7 +8,12 @@ if (ign.ignited())
       + (betav*fvc::ddt(rho, K) + fvc::div(phi, K))*rho/thermo.rhou()
       + (
             heau.name() == "eau"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))*rho/thermo.rhou()
+          ? fvc::div
+            (
+                phi/fvc::interpolate(rho),
+                p,
+                "div(phiv,p)"
+            )*rho/thermo.rhou()
           : -betav*dpdt*rho/thermo.rhou()
         )
       - fvm::laplacian(Db, heau)

applications/solvers/combustion/XiFoam/EaEqn.H

@@ -7,7 +7,12 @@
       + fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             hea.name() == "ea"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )
           : -dpdt
         )
       - fvm::laplacian(turbulence->alphaEff(), hea)

applications/solvers/combustion/XiFoam/EauEqn.H

@@ -8,7 +8,12 @@ if (ign.ignited())
       + (fvc::ddt(rho, K) + fvc::div(phi, K))*rho/thermo.rhou()
       + (
             heau.name() == "eau"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))*rho/thermo.rhou()
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )*rho/thermo.rhou()
           : -dpdt*rho/thermo.rhou()
         )
       - fvm::laplacian(turbulence->alphaEff(), heau)

applications/solvers/combustion/engineFoam/pEqn.H

@@ -66,5 +66,5 @@ K = 0.5*magSqr(U);
 
 if (thermo.dpdt())
 {
-    dpdt = fvc::ddt(p);
+    dpdt = fvc::ddt(p) - fvc::div(fvc::meshPhi(rho, U), p);
 }

applications/solvers/combustion/fireFoam/YEEqn.H

@@ -55,7 +55,12 @@ tmp<fv::convectionScheme<scalar> > mvConvection
       + fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             he.name() == "e"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )
           : -dpdt
         )
       - fvm::laplacian(turbulence->alphaEff(), he)

applications/solvers/combustion/reactingFoam/EEqn.H

@@ -7,7 +7,12 @@
       + fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             he.name() == "e"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )
           : -dpdt
         )
       - fvm::laplacian(turbulence->alphaEff(), he)

applications/solvers/compressible/rhoPimpleFoam/EEqn.H

@@ -7,7 +7,12 @@
       + fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             he.name() == "e"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )
           : -dpdt
         )
       - fvm::laplacian(turbulence->alphaEff(), he)

applications/solvers/compressible/sonicFoam/EEqn.H

@@ -2,7 +2,8 @@
     solve
     (
         fvm::ddt(rho, e) + fvm::div(phi, e)
-      + fvc::ddt(rho, K) + fvc::div(phi, volScalarField("Ekp", K + p/rho))
+      + fvc::ddt(rho, K) + fvc::div(phi, K)
+      + fvc::div(fvc::absolute(phi/fvc::interpolate(rho), U), p, "div(phiv,p)")
       - fvm::laplacian(turbulence->alphaEff(), e)
     );
 

applications/solvers/compressible/sonicFoam/sonicDyMFoam/EEqn.H

@@ -1,11 +0,0 @@
-{
-    solve
-    (
-        fvm::ddt(rho, e) + fvm::div(phi, e)
-      + fvc::ddt(rho, K) + fvc::div(phi, K)
-      + fvc::div(phi/fvc::interpolate(rho) + mesh.phi(), p, "div(phiv,p)")
-      - fvm::laplacian(turbulence->alphaEff(), e)
-    );
-
-    thermo.correct();
-}

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

@@ -7,7 +7,12 @@
       + fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             he.name() == "e"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )
           : -dpdt
         )
       - fvm::laplacian(turb.alphaEff(), he)

applications/solvers/lagrangian/coalChemistryFoam/EEqn.H

@@ -7,7 +7,12 @@
       + fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             he.name() == "e"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )
           : -dpdt
         )
       - fvm::laplacian(turbulence->alphaEff(), he)

applications/solvers/lagrangian/reactingParcelFilmFoam/EEqn.H

@@ -7,7 +7,12 @@
       + fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             he.name() == "e"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )
           : -dpdt
         )
       - fvm::laplacian(turbulence->alphaEff(), he)

applications/solvers/lagrangian/reactingParcelFoam/EEqn.H

@@ -7,7 +7,12 @@
       + fvc::ddt(rho, K) + fvc::div(phi, K)
       + (
             he.name() == "e"
-          ? fvc::div(phi, volScalarField("Ep", p/rho))
+          ? fvc::div
+            (
+                fvc::absolute(phi/fvc::interpolate(rho), U),
+                p,
+                "div(phiv,p)"
+            )
           : -dpdt
         )
       - fvm::laplacian(turbulence->alphaEff(), he)

applications/solvers/lagrangian/sprayFoam/sprayEngineFoam/pEqn.H

@@ -79,5 +79,5 @@ K = 0.5*magSqr(U);
 
 if (thermo.dpdt())
 {
-    dpdt = fvc::ddt(p);
+    dpdt = fvc::ddt(p) - fvc::div(fvc::meshPhi(rho, U), p);
 }

src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.C

@@ -148,4 +148,39 @@ void Foam::fvc::makeAbsolute
 }
 
 
+Foam::tmp<Foam::surfaceScalarField> Foam::fvc::absolute
+(
+    const tmp<surfaceScalarField>& tphi,
+    const volVectorField& U
+)
+{
+    if (tphi().mesh().moving())
+    {
+        return tphi + fvc::meshPhi(U);
+    }
+    else
+    {
+        return tphi;
+    }
+}
+
+
+Foam::tmp<Foam::surfaceScalarField> Foam::fvc::absolute
+(
+    const tmp<surfaceScalarField>& tphi,
+    const volScalarField& rho,
+    const volVectorField& U
+)
+{
+    if (tphi().mesh().moving())
+    {
+        return tphi + fvc::meshPhi(rho, U);
+    }
+    else
+    {
+        return tphi;
+    }
+}
+
+
 // ************************************************************************* //

src/finiteVolume/finiteVolume/fvc/fvcMeshPhi.H

@@ -116,6 +116,22 @@ namespace fvc
         const volScalarField& rho,
         const volVectorField& U
     );
+
+
+    //- Return the given relative flux in absolute form
+    tmp<surfaceScalarField> absolute
+    (
+        const tmp<surfaceScalarField>& tphi,
+        const volVectorField& U
+    );
+
+    //- Return the given relative flux in absolute form
+    tmp<surfaceScalarField> absolute
+    (
+        const tmp<surfaceScalarField>& tphi,
+        const volScalarField& rho,
+        const volVectorField& U
+    );
 }
 
 

tutorials/combustion/engineFoam/kivaTest/constant/thermophysicalProperties

@@ -24,6 +24,7 @@ thermoType
     equationOfState perfectGas;
     specie          specie;
     energy          absoluteEnthalpy;
+    //energy          absoluteInternalEnergy;
 }
 
 stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.0336;

tutorials/combustion/engineFoam/kivaTest/system/fvSchemes

@@ -31,6 +31,8 @@ divSchemes
     div(phi,U)      Gauss upwind;
     div(phi,K)      Gauss upwind;
     div(phid,p)     Gauss upwind;
+    div(meshPhi,p)  Gauss upwind;
+    div(phiv,p)     Gauss upwind;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,R)      Gauss upwind;
@@ -45,6 +47,8 @@ divSchemes
         b   limitedLinear01 1;
         ha  limitedLinear 1;
         hau limitedLinear 1;
+        ea  limitedLinear 1;
+        eau limitedLinear 1;
     };
     div(U)          Gauss linear;
     div((Su*grad(b))) Gauss linear;
@@ -54,17 +58,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default         none;
+    default         Gauss linear limited 0.5;
-    laplacian(muEff,U) Gauss linear corrected;
-    laplacian(DkEff,k) Gauss linear limited 0.5;
-    laplacian(DepsilonEff,epsilon) Gauss linear limited 0.5;
-    laplacian(DREff,R) Gauss linear limited 0.5;
-    laplacian((rho*(1|A(U))),p) Gauss linear limited 0.5;
-    laplacian(alphaEff,b) Gauss linear limited 0.5;
-    laplacian(muEff,ft) Gauss linear limited 0.5;
-    laplacian(alphaEff,ha) Gauss linear limited 0.5;
-    laplacian(alphaEff,hau) Gauss linear limited 0.5;
-    laplacian(alphaEff,ft) Gauss linear limited 0.5;
 }
 
 interpolationSchemes

tutorials/combustion/engineFoam/kivaTest/system/fvSolution

@@ -47,14 +47,14 @@ solvers
         relTol          0;
     }
 
-    "(U|Xi|hau|ft|b|ha|k|epsilon)"
+    "(U|Xi|hau|eau|ft|b|ha|ea|k|epsilon)"
     {
         solver          PBiCG;
         preconditioner  DILU;
         tolerance       1e-05;
         relTol          0.1;
     }
-    "(U|ft|Xi|hau|b|ha|k|epsilon)Final"
+    "(U|ft|Xi|hau|eau|b|ha|ea|k|epsilon)Final"
     {
         $U;
         tolerance       1e-05;