Thermodynamics and sub-models: Removed "Sp" boundedness corrections on transport, replaced with "bounded Gauss" scheme

applications/solvers/multiphase/compressibleInterFoam/pEqn.H

@@ -5,6 +5,27 @@
     volScalarField rAU("rAU", 1.0/UEqn.A());
     surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
 
+    volVectorField HbyA("HbyA", U);
+    HbyA = rAU*UEqn.H();
+
+    surfaceScalarField phiHbyA
+    (
+        "phiHbyA",
+        (fvc::interpolate(HbyA) & mesh.Sf())
+      + fvc::ddtPhiCorr(rAU, rho, U, phi)
+    );
+    phi = phiHbyA;
+
+    surfaceScalarField phig
+    (
+        (
+            fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
+          - ghf*fvc::snGrad(rho)
+        )*rAUf*mesh.magSf()
+    );
+
+    phiHbyA += phig;
+
     tmp<fvScalarMatrix> p_rghEqnComp1;
     tmp<fvScalarMatrix> p_rghEqnComp2;
 
@@ -27,27 +48,6 @@
           - fvc::Sp(fvc::div(phid2), p_rgh);
     }
 
-    volVectorField HbyA("HbyA", U);
-    HbyA = rAU*UEqn.H();
-
-    surfaceScalarField phiHbyA
-    (
-        "phiHbyA",
-        (fvc::interpolate(HbyA) & mesh.Sf())
-      + fvc::ddtPhiCorr(rAU, rho, U, phi)
-    );
-    phi = phiHbyA;
-
-    surfaceScalarField phig
-    (
-        (
-            fvc::interpolate(interface.sigmaK())*fvc::snGrad(alpha1)
-          - ghf*fvc::snGrad(rho)
-        )*rAUf*mesh.magSf()
-    );
-
-    phiHbyA += phig;
-
     // Thermodynamic density needs to be updated by psi*d(p) after the
     // pressure solution - done in 2 parts. Part 1:
     //thermo.rho() -= psi*p_rgh;

applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/TEqns.H

@@ -6,7 +6,6 @@
     (
         fvm::ddt(alpha1, T1)
       + fvm::div(alphaPhi1, T1)
-      - fvm::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), T1)
       - fvm::laplacian(kByCp1, T1)
      ==
         heatTransferCoeff*T2/Cp1/rho1
@@ -18,7 +17,6 @@
     (
         fvm::ddt(alpha2, T2)
       + fvm::div(alphaPhi2, T2)
-      - fvm::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), T2)
       - fvm::laplacian(kByCp2, T2)
      ==
         heatTransferCoeff*T1/Cp2/rho2

applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H

@@ -30,7 +30,6 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
         (
             fvm::ddt(alpha1, U1)
           + fvm::div(alphaPhi1, U1)
-          - fvm::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), U1)
 
           + Cvm*rho2*alpha1*alpha2/rho1*
             (
@@ -61,7 +60,6 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
         (
             fvm::ddt(alpha2, U2)
           + fvm::div(alphaPhi2, U2)
-          - fvm::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), U2)
 
           + Cvm*rho2*alpha1*alpha2/rho2*
             (

applications/solvers/multiphase/interPhaseChangeFoam/UEqn.H

@@ -2,7 +2,6 @@
     (
         fvm::ddt(rho, U)
       + fvm::div(rhoPhi, U)
-      - fvm::Sp(fvc::ddt(rho) + fvc::div(rhoPhi), U)
       + turbulence->divDevRhoReff(rho, U)
     );
 

applications/solvers/multiphase/multiphaseEulerFoam/TEqns.H

@@ -6,7 +6,6 @@
     (
         fvm::ddt(alpha1, T1)
       + fvm::div(alphaPhi1, T1)
-      - fvm::Sp(fvc::ddt(alpha1) + fvc::div(alphaPhi1), T1)
       - fvm::laplacian(kByCp1, T1)
      ==
         heatTransferCoeff*T2/Cp1/rho1
@@ -18,7 +17,6 @@
     (
         fvm::ddt(alpha2, T2)
       + fvm::div(alphaPhi2, T2)
-      - fvm::Sp(fvc::ddt(alpha2) + fvc::div(alphaPhi2), T2)
       - fvm::laplacian(kByCp2, T2)
      ==
         heatTransferCoeff*T1/Cp2/rho2

applications/solvers/multiphase/multiphaseEulerFoam/UEqns.H

@@ -17,7 +17,6 @@ forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
         (
             fvm::ddt(alpha, U)
           + fvm::div(phase.phiAlpha(), U)
-          - fvm::Sp(fvc::ddt(alpha) + fvc::div(phase.phiAlpha()), U)
 
           + (alpha/phase.rho())*fluid.Cvm(phase)*
             (