From 4c4f68c283e48dc396412ab663bff6f3a17ac6cb Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Sun, 8 May 2016 22:40:42 +0100
Subject: [PATCH] applications/solvers/incompressible: Added -postProcess
option See also commit 30e2f912e54a54a370509685197509e846ef3a9a
---
.../adjointShapeOptimizationFoam.C | 7 +++----
.../adjointShapeOptimizationFoam/createControl.H | 1 +
.../adjointShapeOptimizationFoam/createPhia.H | 8 +-------
.../incompressible/nonNewtonianIcoFoam/createControl.H | 1 +
.../nonNewtonianIcoFoam/nonNewtonianIcoFoam.C | 6 +++---
.../incompressible/pimpleFoam/SRFPimpleFoam/Make/options | 2 ++
.../pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C | 7 +++----
.../solvers/incompressible/pimpleFoam/createControl.H | 1 +
.../incompressible/pimpleFoam/pimpleDyMFoam/Make/options | 1 +
.../pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C | 6 +++---
.../solvers/incompressible/pimpleFoam/pimpleFoam.C | 6 +++---
.../solvers/incompressible/pisoFoam/createControl.H | 1 +
applications/solvers/incompressible/pisoFoam/pisoFoam.C | 8 ++++----
.../incompressible/shallowWaterFoam/createControl.H | 1 +
.../incompressible/shallowWaterFoam/createFields.H | 2 ++
.../solvers/incompressible/shallowWaterFoam/createPhi.H | 8 +-------
.../incompressible/shallowWaterFoam/shallowWaterFoam.C | 7 +++----
17 files changed, 34 insertions(+), 39 deletions(-)
create mode 100644 applications/solvers/incompressible/adjointShapeOptimizationFoam/createControl.H
create mode 100644 applications/solvers/incompressible/nonNewtonianIcoFoam/createControl.H
create mode 100644 applications/solvers/incompressible/pimpleFoam/createControl.H
create mode 100644 applications/solvers/incompressible/pisoFoam/createControl.H
create mode 100644 applications/solvers/incompressible/shallowWaterFoam/createControl.H
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
index c062af0364..9b839241a1 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/adjointShapeOptimizationFoam.C
@@ -69,13 +69,12 @@ void zeroCells
int main(int argc, char *argv[])
{
- #include "setRootCase.H"
+ #include "postProcess.H"
+ #include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
-
- simpleControl simple(mesh);
-
+ #include "createControl.H"
#include "createFields.H"
#include "createFvOptions.H"
#include "initContinuityErrs.H"
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createControl.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createControl.H
new file mode 100644
index 0000000000..36ebed126c
--- /dev/null
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createControl.H
@@ -0,0 +1 @@
+simpleControl simple(mesh);
diff --git a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createPhia.H b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createPhia.H
index a4fd56d670..f0d6d667b4 100644
--- a/applications/solvers/incompressible/adjointShapeOptimizationFoam/createPhia.H
+++ b/applications/solvers/incompressible/adjointShapeOptimizationFoam/createPhia.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,9 +29,6 @@ Description
\*---------------------------------------------------------------------------*/
-#ifndef createPhia_H
-#define createPhia_H
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "Reading/calculating face flux field phia\n" << endl;
@@ -49,8 +46,5 @@ surfaceScalarField phia
linearInterpolate(Ua) & mesh.Sf()
);
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
// ************************************************************************* //
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/createControl.H b/applications/solvers/incompressible/nonNewtonianIcoFoam/createControl.H
new file mode 100644
index 0000000000..a721b74052
--- /dev/null
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/createControl.H
@@ -0,0 +1 @@
+pisoControl piso(mesh);
diff --git a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
index bdac3f8336..82179a9686 100644
--- a/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
+++ b/applications/solvers/incompressible/nonNewtonianIcoFoam/nonNewtonianIcoFoam.C
@@ -37,12 +37,12 @@ Description
int main(int argc, char *argv[])
{
+ #include "postProcess.H"
+
#include "setRootCase.H"
#include "createTime.H"
#include "createMeshNoClear.H"
-
- pisoControl piso(mesh);
-
+ #include "createControl.H"
#include "createFields.H"
#include "initContinuityErrs.H"
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options
index 9af500124c..4c2a78fa5a 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/Make/options
@@ -1,4 +1,6 @@
EXE_INC = \
+ -I. \
+ -I.. \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels \
diff --git a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
index 94d7657b25..d1b8bc1976 100644
--- a/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -43,12 +43,11 @@ Description
int main(int argc, char *argv[])
{
+ #include "postProcess.H"
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
-
- pimpleControl pimple(mesh);
-
+ #include "createControl.H"
#include "createTimeControls.H"
#include "createFields.H"
#include "createFvOptions.H"
diff --git a/applications/solvers/incompressible/pimpleFoam/createControl.H b/applications/solvers/incompressible/pimpleFoam/createControl.H
new file mode 100644
index 0000000000..cf82a59b35
--- /dev/null
+++ b/applications/solvers/incompressible/pimpleFoam/createControl.H
@@ -0,0 +1 @@
+pimpleControl pimple(mesh);
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options
index 41aeca934c..b22f523550 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/Make/options
@@ -1,4 +1,5 @@
EXE_INC = \
+ -I. \
-I.. \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
index 9db6844761..23bc0e0618 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
@@ -44,13 +44,13 @@ 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 "createControl.H"
#include "createFields.H"
#include "createUf.H"
#include "createMRF.H"
diff --git a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
index a065bcbd3c..86c9ed0bd6 100644
--- a/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
+++ b/applications/solvers/incompressible/pimpleFoam/pimpleFoam.C
@@ -44,12 +44,12 @@ Description
int main(int argc, char *argv[])
{
+ #include "postProcess.H"
+
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
-
- pimpleControl pimple(mesh);
-
+ #include "createControl.H"
#include "createTimeControls.H"
#include "createFields.H"
#include "createMRF.H"
diff --git a/applications/solvers/incompressible/pisoFoam/createControl.H b/applications/solvers/incompressible/pisoFoam/createControl.H
new file mode 100644
index 0000000000..a721b74052
--- /dev/null
+++ b/applications/solvers/incompressible/pisoFoam/createControl.H
@@ -0,0 +1 @@
+pisoControl piso(mesh);
diff --git a/applications/solvers/incompressible/pisoFoam/pisoFoam.C b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
index 7d18261528..5529e23492 100644
--- a/applications/solvers/incompressible/pisoFoam/pisoFoam.C
+++ b/applications/solvers/incompressible/pisoFoam/pisoFoam.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -43,12 +43,12 @@ Description
int main(int argc, char *argv[])
{
+ #include "postProcess.H"
+
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
-
- pisoControl piso(mesh);
-
+ #include "createControl.H"
#include "createFields.H"
#include "createMRF.H"
#include "createFvOptions.H"
diff --git a/applications/solvers/incompressible/shallowWaterFoam/createControl.H b/applications/solvers/incompressible/shallowWaterFoam/createControl.H
new file mode 100644
index 0000000000..cf82a59b35
--- /dev/null
+++ b/applications/solvers/incompressible/shallowWaterFoam/createControl.H
@@ -0,0 +1 @@
+pimpleControl pimple(mesh);
diff --git a/applications/solvers/incompressible/shallowWaterFoam/createFields.H b/applications/solvers/incompressible/shallowWaterFoam/createFields.H
index 2716b87132..2e987664ec 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/createFields.H
+++ b/applications/solvers/incompressible/shallowWaterFoam/createFields.H
@@ -1,3 +1,5 @@
+#include "readGravitationalAcceleration.H"
+
Info<< "Reading field h\n" << endl;
volScalarField h
(
diff --git a/applications/solvers/incompressible/shallowWaterFoam/createPhi.H b/applications/solvers/incompressible/shallowWaterFoam/createPhi.H
index dca0c91a62..5a1b4c803f 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/createPhi.H
+++ b/applications/solvers/incompressible/shallowWaterFoam/createPhi.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2016 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@@ -29,9 +29,6 @@ Description
\*---------------------------------------------------------------------------*/
-#ifndef createPhi_H
-#define createPhi_H
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Info<< "Reading/calculating face flux field phi\n" << endl;
@@ -49,8 +46,5 @@ surfaceScalarField phi
linearInterpolate(hU) & mesh.Sf()
);
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
// ************************************************************************* //
diff --git a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
index 6575a09f05..a29f31a761 100644
--- a/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
+++ b/applications/solvers/incompressible/shallowWaterFoam/shallowWaterFoam.C
@@ -39,13 +39,12 @@ Description
int main(int argc, char *argv[])
{
+ #include "postProcess.H"
+
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
-
- pimpleControl pimple(mesh);
-
- #include "readGravitationalAcceleration.H"
+ #include "createControl.H"
#include "createFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
--
GitLab