From 51281bdf8e85959398d0b1e648f6e762e17a2790 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 8 May 2016 14:32:23 +0100
Subject: [PATCH] interFoam: Added -postProcess option See also commit
30e2f912e54a54a370509685197509e846ef3a9a Resolves bug-report
http://www.openfoam.org/mantisbt/view.php?id=1301
---
.../solvers/multiphase/interFoam/createControls.H | 1 +
applications/solvers/multiphase/interFoam/createFields.H | 2 ++
.../multiphase/interFoam/interDyMFoam/Make/options | 1 +
.../{createControls.H => createDyMControls.H} | 2 --
.../multiphase/interFoam/interDyMFoam/interDyMFoam.C | 8 ++++----
applications/solvers/multiphase/interFoam/interFoam.C | 7 +++----
.../multiphase/interFoam/interMixingFoam/Make/options | 1 +
.../multiphase/interFoam/interMixingFoam/createFields.H | 2 ++
.../interFoam/interMixingFoam/interMixingFoam.C | 7 +++----
9 files changed, 17 insertions(+), 14 deletions(-)
create mode 100644 applications/solvers/multiphase/interFoam/createControls.H
rename applications/solvers/multiphase/interFoam/interDyMFoam/{createControls.H => createDyMControls.H} (89%)
diff --git a/applications/solvers/multiphase/interFoam/createControls.H b/applications/solvers/multiphase/interFoam/createControls.H
new file mode 100644
index 0000000000..cf82a59b35
--- /dev/null
+++ b/applications/solvers/multiphase/interFoam/createControls.H
@@ -0,0 +1 @@
+pimpleControl pimple(mesh);
diff --git a/applications/solvers/multiphase/interFoam/createFields.H b/applications/solvers/multiphase/interFoam/createFields.H
index e4891edba5..77cabdc4c1 100644
--- a/applications/solvers/multiphase/interFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/createFields.H
@@ -135,3 +135,5 @@ surfaceScalarField alphaPhi
// MULES Correction
tmp<surfaceScalarField> talphaPhiCorr0;
+
+#include "createMRF.H"
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options b/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
index 33aac0ab4a..bceea20c81 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/Make/options
@@ -1,4 +1,5 @@
EXE_INC = \
+ -I. \
-I.. \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/createControls.H b/applications/solvers/multiphase/interFoam/interDyMFoam/createDyMControls.H
similarity index 89%
rename from applications/solvers/multiphase/interFoam/interDyMFoam/createControls.H
rename to applications/solvers/multiphase/interFoam/interDyMFoam/createDyMControls.H
index f1930cdfc0..5055ac090a 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/createControls.H
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/createDyMControls.H
@@ -1,5 +1,3 @@
-#include "createTimeControls.H"
-
bool correctPhi
(
pimple.dict().lookupOrDefault<Switch>("correctPhi", true)
diff --git a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
index efebaff8b1..15707219a4 100644
--- a/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
+++ b/applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
@@ -51,17 +51,17 @@ Description
int main(int argc, char *argv[])
{
+ #include "postProcess.H"
+
#include "setRootCase.H"
#include "createTime.H"
#include "createDynamicFvMesh.H"
#include "initContinuityErrs.H"
-
- pimpleControl pimple(mesh);
-
#include "createControls.H"
+ #include "createTimeControls.H"
+ #include "createDyMControls.H"
#include "createRDeltaT.H"
#include "createFields.H"
- #include "createMRF.H"
#include "createFvOptions.H"
volScalarField rAU
diff --git a/applications/solvers/multiphase/interFoam/interFoam.C b/applications/solvers/multiphase/interFoam/interFoam.C
index a341b64e12..8e8c78fff4 100644
--- a/applications/solvers/multiphase/interFoam/interFoam.C
+++ b/applications/solvers/multiphase/interFoam/interFoam.C
@@ -55,17 +55,16 @@ Description
int main(int argc, char *argv[])
{
+ #include "postProcess.H"
+
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
-
- pimpleControl pimple(mesh);
-
+ #include "createControls.H"
#include "createTimeControls.H"
#include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "createFields.H"
- #include "createMRF.H"
#include "createFvOptions.H"
#include "correctPhi.H"
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
index 53234dcaee..ce7222ff1b 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/Make/options
@@ -1,4 +1,5 @@
EXE_INC = \
+ -I. \
-I.. \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-IimmiscibleIncompressibleThreePhaseMixture \
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
index 4d9f0e7f01..07e174717b 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/createFields.H
@@ -121,3 +121,5 @@ if (p_rgh.needReference())
mesh.setFluxRequired(p_rgh.name());
mesh.setFluxRequired(alpha2.name());
+
+#include "createMRF.H"
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
index 24c292b870..8b59f1ad4f 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
@@ -45,17 +45,16 @@ Description
int main(int argc, char *argv[])
{
+ #include "postProcess.H"
+
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
-
- pimpleControl pimple(mesh);
-
+ #include "createControls.H"
#include "createTimeControls.H"
#include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "createFields.H"
- #include "createMRF.H"
#include "createFvOptions.H"
#include "correctPhi.H"
--
GitLab