From ffe930843290f69f3d8227921db5e0c4862546f7 Mon Sep 17 00:00:00 2001
From: henry <Henry Weller h.weller@opencfd.co.uk>
Date: Wed, 3 Sep 2008 08:34:04 +0100
Subject: [PATCH] Minor updates.
---
.../multiphase/interDyMFoam/Make/options | 2 ++
.../solvers/multiphase/interDyMFoam/UEqn.H | 34 ------------------
.../multiphase/interDyMFoam/gammaEqn.H | 35 -------------------
.../interDyMFoam/gammaEqnSubCycle.H | 35 -------------------
.../multiphase/interDyMFoam/interDyMFoam.C | 1 -
5 files changed, 2 insertions(+), 105 deletions(-)
delete mode 100644 applications/solvers/multiphase/interDyMFoam/UEqn.H
delete mode 100644 applications/solvers/multiphase/interDyMFoam/gammaEqn.H
delete mode 100644 applications/solvers/multiphase/interDyMFoam/gammaEqnSubCycle.H
diff --git a/applications/solvers/multiphase/interDyMFoam/Make/options b/applications/solvers/multiphase/interDyMFoam/Make/options
index 24d71bc7eef..6755d5bc592 100644
--- a/applications/solvers/multiphase/interDyMFoam/Make/options
+++ b/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 \
diff --git a/applications/solvers/multiphase/interDyMFoam/UEqn.H b/applications/solvers/multiphase/interDyMFoam/UEqn.H
deleted file mode 100644
index 4c14afe1a64..00000000000
--- a/applications/solvers/multiphase/interDyMFoam/UEqn.H
+++ /dev/null
@@ -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()
- )
- );
-}
diff --git a/applications/solvers/multiphase/interDyMFoam/gammaEqn.H b/applications/solvers/multiphase/interDyMFoam/gammaEqn.H
deleted file mode 100644
index 8978d1d2930..00000000000
--- a/applications/solvers/multiphase/interDyMFoam/gammaEqn.H
+++ /dev/null
@@ -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;
-}
diff --git a/applications/solvers/multiphase/interDyMFoam/gammaEqnSubCycle.H b/applications/solvers/multiphase/interDyMFoam/gammaEqnSubCycle.H
deleted file mode 100644
index f762bac8ca7..00000000000
--- a/applications/solvers/multiphase/interDyMFoam/gammaEqnSubCycle.H
+++ /dev/null
@@ -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;
diff --git a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
index a126edaa92d..915fee9a973 100644
--- a/applications/solvers/multiphase/interDyMFoam/interDyMFoam.C
+++ b/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"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--
GitLab