Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

applications/solvers/compressible/rhoSimpleFoam/eEqn.H

+{
+    // 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();
+}

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

+{
+    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();
+}

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;

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;
     }
 }
 

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

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;

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;
     }
 }
 

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

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

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;
     }