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

applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/UEqns.H

@@ -18,7 +18,7 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
         volTensorField Rc1
         (
             "Rc1",
-            ((2.0/3.0)*I)*(sqr(Ct)*k + nuEff1*tr(gradU1T)) - nuEff1*gradU1T
+            (((2.0/3.0)*I)*nuEff1)*tr(gradU1T) - nuEff1*gradU1T
         );
 
         if (kineticTheory.on())
@@ -45,7 +45,7 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
           - fvm::Sp(dragCoeff/rho1, U1)
           - alpha1*alpha2/rho1*(liftForce - Cvm*rho2*DDtU2)
         );
-
+        mrfZones.addCoriolis(alpha1, U1Eqn);
         U1Eqn.relax();
     }
 
@@ -54,7 +54,7 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
         volTensorField Rc2
         (
             "Rc2",
-            ((2.0/3.0)*I)*(k + nuEff2*tr(gradU2T)) - nuEff2*gradU2T
+            (((2.0/3.0)*I)*nuEff2)*tr(gradU2T) - nuEff2*gradU2T
         );
 
         U2Eqn =
@@ -76,7 +76,7 @@ fvVectorMatrix U2Eqn(U2, U2.dimensions()*dimVol/dimTime);
           - fvm::Sp(dragCoeff/rho2, U2)
           + alpha1*alpha2/rho2*(liftForce + Cvm*rho2*DDtU1)
         );
-
+        mrfZones.addCoriolis(alpha2, U2Eqn);
         U2Eqn.relax();
     }
 }

applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/compressibleTwoPhaseEulerFoam.C

@@ -45,6 +45,8 @@ Description
 
 #include "pimpleControl.H"
 
+#include "MRFZones.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 int main(int argc, char *argv[])
@@ -55,6 +57,7 @@ int main(int argc, char *argv[])
     #include "createMesh.H"
     #include "readGravitationalAcceleration.H"
     #include "createFields.H"
+    #include "createMRFZones.H"
     #include "readPPProperties.H"
     #include "initContinuityErrs.H"
     #include "readTimeControls.H"

applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/createMRFZones.H

+    MRFZones mrfZones(mesh);
+    mrfZones.correctBoundaryVelocity(U1);
+    mrfZones.correctBoundaryVelocity(U2);
+    mrfZones.correctBoundaryVelocity(U);

applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/pEqn.H

@@ -2,6 +2,11 @@
     rho1 = rho10 + psi1*p;
     rho2 = rho20 + psi2*p;
 
+    mrfZones.absoluteFlux(phi1.oldTime());
+    mrfZones.absoluteFlux(phi1);
+    mrfZones.absoluteFlux(phi2.oldTime());
+    mrfZones.absoluteFlux(phi2);
+
     surfaceScalarField alpha1f(fvc::interpolate(alpha1));
     surfaceScalarField alpha2f(scalar(1) - alpha1f);
 
@@ -25,6 +30,7 @@
       + fvc::interpolate((1.0/rho1)*rAU1*dragCoeff)*phi2
       + rAlphaAU1f*(g & mesh.Sf())
     );
+    mrfZones.relativeFlux(phiHbyA1);
 
     surfaceScalarField phiHbyA2
     (
@@ -34,6 +40,7 @@
       + fvc::interpolate((1.0/rho2)*rAU2*dragCoeff)*phi1
       + rAlphaAU2f*(g & mesh.Sf())
     );
+    mrfZones.relativeFlux(phiHbyA2);
 
     surfaceScalarField phiHbyA("phiHbyA", alpha1f*phiHbyA1 + alpha2f*phiHbyA2);
 
@@ -97,10 +104,12 @@
             phi1.boundaryField() ==
                 (fvc::interpolate(U1) & mesh.Sf())().boundaryField();
             phi1 = phiHbyA1 + rAlphaAU1f*mSfGradp/fvc::interpolate(rho1);
+            mrfZones.relativeFlux(phi1.oldTime());
 
             phi2.boundaryField() ==
                 (fvc::interpolate(U2) & mesh.Sf())().boundaryField();
             phi2 = phiHbyA2 + rAlphaAU2f*mSfGradp/fvc::interpolate(rho2);
+            mrfZones.relativeFlux(phi2.oldTime());
 
             phi = alpha1f*phi1 + alpha2f*phi2;
 

applications/solvers/multiphase/twoPhaseEulerFoam/MRFtwoPhaseEulerFoam/createMRFZones.H

     MRFZones mrfZones(mesh);
     mrfZones.correctBoundaryVelocity(U1);
     mrfZones.correctBoundaryVelocity(U2);
+    mrfZones.correctBoundaryVelocity(U);