diff --git a/applications/solvers/compressible/rhoSimpleFoam/eEqn.H b/applications/solvers/compressible/rhoSimpleFoam/eEqn.H
new file mode 100644
index 0000000000000000000000000000000000000000..a1ea77157311f3f475957a725a237c7baa8fbed3
--- /dev/null
+++ b/applications/solvers/compressible/rhoSimpleFoam/eEqn.H
@@ -0,0 +1,18 @@
+{
+ // Kinetic + pressure energy
+ volScalarField Ekp("Ekp", 0.5*magSqr(U) + p/rho);
+
+ fvScalarMatrix eEqn
+ (
+ fvm::div(phi, e)
+ - fvm::Sp(fvc::div(phi), e)
+ - fvm::laplacian(turbulence->alphaEff(), e)
+ ==
+ fvc::div(phi)*Ekp - fvc::div(phi, Ekp)
+ );
+
+ eEqn.relax();
+ eEqn.solve();
+
+ thermo.correct();
+}
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H
new file mode 100644
index 0000000000000000000000000000000000000000..4791062d35ac4c8031951ca123e2d215c9b6695f
--- /dev/null
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H
@@ -0,0 +1,19 @@
+{
+ volScalarField Ekp("Ekp", 0.5*magSqr(U) + p/rho);
+
+ fvScalarMatrix eEqn
+ (
+ fvm::div(phi, e)
+ - fvm::Sp(fvc::div(phi), e)
+ - fvm::laplacian(turbulence->alphaEff(), e)
+ ==
+ fvc::div(phi)*Ekp - fvc::div(phi, Ekp)
+ );
+
+ //pZones.addEnergySource(thermo, rho, eEqn);
+
+ eEqn.relax();
+ eEqn.solve();
+
+ thermo.correct();
+}
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes
index 711e4e3233a2e700ada115f8ffeb80db86b6950d..0a14cc31a562d3cf4ef18e5f212213f57ba396d9 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSchemes
@@ -29,16 +29,16 @@ divSchemes
{
div(phi,U) Gauss upwind;
div((muEff*dev2(T(grad(U))))) Gauss linear;
- div(phi,h) Gauss upwind;
+ div(phi,e) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,k) Gauss upwind;
- div(phi,K) Gauss upwind;
+ div(phi,Ekp) Gauss upwind;
}
laplacianSchemes
{
laplacian(muEff,U) Gauss linear corrected;
- laplacian(alphaEff,h) Gauss linear corrected;
+ laplacian(alphaEff,e) Gauss linear corrected;
laplacian((rho*rAU),p) Gauss linear corrected;
laplacian(DepsilonEff,epsilon) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected;
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution
index 317c954ef60beb892d00878b5fc21b414ca99a4d..a1e310922224d85f5ade01fa361b7ed0e1aeba01 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctExplicit/system/fvSolution
@@ -38,7 +38,7 @@ solvers
relTol 0.1;
}
- h
+ e
{
solver PBiCG;
preconditioner DILU;
@@ -82,7 +82,7 @@ relaxationFactors
{
U 0.7;
"(k|epsilon)" 0.7;
- h 0.5;
+ e 0.5;
}
}
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
index d6d597d433f7d69e5e2329e6c716ed66b8a99675..cbe21562972775a88448d54c26a3dba002171ac0 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+thermoType ePsiThermo<pureMixture<sutherlandTransport<specieThermo<eConstThermo<perfectGas>>>>>;
mixture
{
@@ -26,7 +26,7 @@ mixture
}
thermodynamics
{
- Cp 1007;
+ Cv 719.3;
Hf 0;
}
transport
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes
index 711e4e3233a2e700ada115f8ffeb80db86b6950d..0a14cc31a562d3cf4ef18e5f212213f57ba396d9 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSchemes
@@ -29,16 +29,16 @@ divSchemes
{
div(phi,U) Gauss upwind;
div((muEff*dev2(T(grad(U))))) Gauss linear;
- div(phi,h) Gauss upwind;
+ div(phi,e) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,k) Gauss upwind;
- div(phi,K) Gauss upwind;
+ div(phi,Ekp) Gauss upwind;
}
laplacianSchemes
{
laplacian(muEff,U) Gauss linear corrected;
- laplacian(alphaEff,h) Gauss linear corrected;
+ laplacian(alphaEff,e) Gauss linear corrected;
laplacian((rho*rAU),p) Gauss linear corrected;
laplacian(DepsilonEff,epsilon) Gauss linear corrected;
laplacian(DkEff,k) Gauss linear corrected;
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution
index 6f93606315e870b623e74ae0992328c26c6e7735..65a9606e7fb75aadf0be3b521903be30b9f3f193 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/system/fvSolution
@@ -29,7 +29,7 @@ solvers
mergeLevels 1;
}
- h
+ e
{
solver PBiCG;
preconditioner DILU;
@@ -76,7 +76,7 @@ relaxationFactors
{
U 0.7;
"(k|epsilon)" 0.9;
- h 0.9;
+ e 0.9;
}
}
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
index d6d597d433f7d69e5e2329e6c716ed66b8a99675..cbe21562972775a88448d54c26a3dba002171ac0 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
}
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-thermoType hPsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>>>>>;
+thermoType ePsiThermo<pureMixture<sutherlandTransport<specieThermo<eConstThermo<perfectGas>>>>>;
mixture
{
@@ -26,7 +26,7 @@ mixture
}
thermodynamics
{
- Cp 1007;
+ Cv 719.3;
Hf 0;
}
transport
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSchemes b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSchemes
index c9c95b180c2eb1e4f92092bd77559607b35226c4..e1e47211d72678553a22afbf86cea2a1328511c2 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSchemes
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSchemes
@@ -31,12 +31,13 @@ divSchemes
div(phi,U) Gauss upwind;
div((muEff*dev2(T(grad(U))))) Gauss linear;
- div(phi,h) Gauss upwind;
+ div(phi,e) Gauss upwind;
div(phi,epsilon) Gauss upwind;
div(phi,k) Gauss upwind;
div(phid,p) Gauss upwind;
- div(phi,K) Gauss upwind;
+ div(phi,Ekp) Gauss upwind;
+ div((phi|interpolate(rho)),p) Gauss upwind;
}
laplacianSchemes
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution
index 09afca5761b1515ad887abe4ff8a8c39a9273876..812766041a21bed2e68133a8532c64336f224a37 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/system/fvSolution
@@ -32,7 +32,7 @@ solvers
mergeLevels 1;
}
- "(U|h|k|epsilon)"
+ "(U|e|k|epsilon)"
{
solver GAMG;
tolerance 1e-08;
@@ -67,7 +67,7 @@ relaxationFactors
{
p 1;
U 0.9;
- h 0.9;
+ e 0.9;
k 0.9;
epsilon 0.9;
}