From 360604b1044476a8f1f73e2e18603972be6ce31c Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 12 Jun 2015 09:42:19 +0100
Subject: [PATCH] twoPhaseEulerFoam: Minor reorganization
---
.../solvers/multiphase/twoPhaseEulerFoam/pU/UEqns.H | 2 ++
.../solvers/multiphase/twoPhaseEulerFoam/pUf/UEqns.H | 2 ++
.../solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H | 2 --
.../multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C | 6 +++---
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pU/UEqns.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pU/UEqns.H
index 8e4af081129..bc8ad0f556e 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pU/UEqns.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pU/UEqns.H
@@ -1,3 +1,5 @@
+Info<< "Constructing momentum equations" << endl;
+
MRF.correctBoundaryVelocity(U1);
MRF.correctBoundaryVelocity(U2);
MRF.correctBoundaryVelocity(U);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/UEqns.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/UEqns.H
index 7fccb4098e4..257008f7ad8 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/UEqns.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/UEqns.H
@@ -1,3 +1,5 @@
+Info<< "Constructing face momentum equations" << endl;
+
MRF.correctBoundaryVelocity(U1);
MRF.correctBoundaryVelocity(U2);
MRF.correctBoundaryVelocity(U);
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H b/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H
index d2695775912..ab9a23197cd 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/pUf/pEqn.H
@@ -358,5 +358,3 @@ if (thermo1.dpdt() || thermo2.dpdt())
{
dpdt = fvc::ddt(p);
}
-
-#include "pUf/DDtU.H"
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
index ffdbd2c0f92..f2bd6d9a9c7 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
@@ -93,18 +93,18 @@ int main(int argc, char *argv[])
fluid.correct();
#include "contErrs.H"
- #include "EEqns.H"
if (faceMomentum)
{
- Info<< "Constructing face momentum equations" << endl;
#include "pUf/UEqns.H"
+ #include "EEqns.H"
#include "pUf/pEqn.H"
+ #include "pUf/DDtU.H"
}
else
{
- Info<< "Constructing momentum equations" << endl;
#include "pU/UEqns.H"
+ #include "EEqns.H"
#include "pU/pEqn.H"
#include "pU/DDtU.H"
}
--
GitLab