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

applications/solvers/multiphase/interDyMFoam/Make/options

@@ -1,4 +1,6 @@
 EXE_INC = \
+    -I../rasInterFoam \
+    -I../interFoam \
     -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
     -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \

applications/solvers/multiphase/interDyMFoam/UEqn.H

@@ -1,34 +0,0 @@
-surfaceScalarField muEff
-(
-    "muEff",
-    twoPhaseProperties.muf()
-  + fvc::interpolate(rho*turbulence->nut())
-);
-
-fvVectorMatrix UEqn
-(
-    fvm::ddt(rho, U)
-  + fvm::div(rhoPhi, U)
-  - fvm::laplacian(muEff, U)
-  - (fvc::grad(U) & fvc::grad(muEff))
-//- fvc::div(muEff*(fvc::interpolate(dev(fvc::grad(U))) & mesh.Sf()))
-);
-
-UEqn.relax();
-
-if (momentumPredictor)
-{
-    solve
-    (
-        UEqn
-      ==
-        fvc::reconstruct
-        (
-            (
-                fvc::interpolate(interface.sigmaK())*fvc::snGrad(gamma)
-              - ghf*fvc::snGrad(rho)
-              - fvc::snGrad(pd)
-            )*mesh.magSf()
-        )
-    );
-}

applications/solvers/multiphase/interDyMFoam/gammaEqn.H

@@ -1,35 +0,0 @@
-{
-    word gammaScheme("div(phi,gamma)");
-    word gammarScheme("div(phirb,gamma)");
-
-    surfaceScalarField phic = mag(phi/mesh.magSf());
-    phic = min(interface.cGamma()*phic, max(phic));
-    surfaceScalarField phir = phic*interface.nHatf();
-
-    for (int gCorr=0; gCorr<nGammaCorr; gCorr++)
-    {
-        surfaceScalarField phiGamma = 
-            fvc::flux
-            (
-                phi,
-                gamma,
-                gammaScheme
-            )
-          + fvc::flux
-            (
-                -fvc::flux(-phir, scalar(1) - gamma, gammarScheme),
-                gamma,
-                gammarScheme
-            );
-
-        MULES::explicitSolve(gamma, phi, phiGamma, 1, 0);
-
-        rhoPhi = phiGamma*(rho1 - rho2) + phi*rho2;
-    }
-
-    Info<< "Liquid phase volume fraction = "
-        << gamma.weightedAverage(mesh.V()).value()
-        << "  Min(gamma) = " << min(gamma).value()
-        << "  Max(gamma) = " << max(gamma).value()
-        << endl;
-}

applications/solvers/multiphase/interDyMFoam/gammaEqnSubCycle.H

@@ -1,35 +0,0 @@
-label nGammaCorr
-(
-    readLabel(piso.lookup("nGammaCorr"))
-);
-
-label nGammaSubCycles
-(
-    readLabel(piso.lookup("nGammaSubCycles"))
-);
-
-if (nGammaSubCycles > 1)
-{
-    dimensionedScalar totalDeltaT = runTime.deltaT();
-    surfaceScalarField rhoPhiSum = 0.0*rhoPhi;
-
-    for
-    (
-        subCycle<volScalarField> gammaSubCycle(gamma, nGammaSubCycles);
-        !(++gammaSubCycle).end();
-    )
-    {
-#       include "gammaEqn.H"
-        rhoPhiSum += (runTime.deltaT()/totalDeltaT)*rhoPhi;
-    }
-
-    rhoPhi = rhoPhiSum;
-}
-else
-{
-#       include "gammaEqn.H"
-}
-
-interface.correct();
-
-rho == gamma*rho1 + (scalar(1) - gamma)*rho2;

applications/solvers/multiphase/interDyMFoam/interDyMFoam.C

@@ -41,7 +41,6 @@ Description
 #include "twoPhaseMixture.H"
 #include "incompressible/RASModel/RASModel.H"
 #include "probes.H"
-#include "EulerDdtScheme.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //