From 0478ebf1718b54b5ec65ce0ae2ae2d08a42f8dad Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Mon, 9 May 2016 15:16:22 +0100
Subject: [PATCH] applications/solvers/compressible: Added -postProcess option
See also commit 30e2f912e54a54a370509685197509e846ef3a9a
---
.../compressible/rhoCentralFoam/createFieldRefs.H | 10 ++++++++++
.../compressible/rhoCentralFoam/createFields.H | 10 ----------
.../rhoCentralDyMFoam/rhoCentralDyMFoam.C | 4 ++++
.../compressible/rhoCentralFoam/rhoCentralFoam.C | 5 ++++-
.../compressible/rhoPimpleFoam/createFieldRefs.H | 1 +
.../compressible/rhoPimpleFoam/createFields.H | 3 ++-
.../rhoPimpleDyMFoam/rhoPimpleDyMFoam.C | 10 +++++-----
.../compressible/rhoPimpleFoam/rhoPimpleFoam.C | 10 +++++-----
.../compressible/rhoSimpleFoam/createFieldRefs.H | 1 +
.../compressible/rhoSimpleFoam/createFields.H | 3 ++-
.../rhoSimpleFoam/rhoPorousSimpleFoam/Make/options | 1 +
.../rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H | 2 ++
.../rhoPorousSimpleFoam/rhoPorousSimpleFoam.C | 9 ++++-----
.../compressible/rhoSimpleFoam/rhoSimpleFoam.C | 10 +++++-----
.../solvers/compressible/sonicFoam/createFieldRefs.H | 2 ++
.../solvers/compressible/sonicFoam/createFields.H | 4 ++--
.../sonicFoam/sonicDyMFoam/sonicDyMFoam.C | 12 ++++++------
.../solvers/compressible/sonicFoam/sonicFoam.C | 10 +++++-----
.../sonicFoam/sonicLiquidFoam/createFields.H | 3 +++
.../sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C | 8 +++-----
20 files changed, 67 insertions(+), 51 deletions(-)
create mode 100644 applications/solvers/compressible/rhoCentralFoam/createFieldRefs.H
create mode 100644 applications/solvers/compressible/rhoPimpleFoam/createFieldRefs.H
create mode 100644 applications/solvers/compressible/rhoSimpleFoam/createFieldRefs.H
create mode 100644 applications/solvers/compressible/sonicFoam/createFieldRefs.H
diff --git a/applications/solvers/compressible/rhoCentralFoam/createFieldRefs.H b/applications/solvers/compressible/rhoCentralFoam/createFieldRefs.H
new file mode 100644
index 0000000000..5522ccd6aa
--- /dev/null
+++ b/applications/solvers/compressible/rhoCentralFoam/createFieldRefs.H
@@ -0,0 +1,10 @@
+volScalarField& p = thermo.p();
+const volScalarField& T = thermo.T();
+const volScalarField& psi = thermo.psi();
+const volScalarField& mu = thermo.mu();
+
+bool inviscid(true);
+if (max(mu.primitiveField()) > 0.0)
+{
+ inviscid = false;
+}
diff --git a/applications/solvers/compressible/rhoCentralFoam/createFields.H b/applications/solvers/compressible/rhoCentralFoam/createFields.H
index 6ea26ef404..d425593810 100644
--- a/applications/solvers/compressible/rhoCentralFoam/createFields.H
+++ b/applications/solvers/compressible/rhoCentralFoam/createFields.H
@@ -6,17 +6,7 @@ autoPtr<psiThermo> pThermo
);
psiThermo& thermo = pThermo();
-volScalarField& p = thermo.p();
volScalarField& e = thermo.he();
-const volScalarField& T = thermo.T();
-const volScalarField& psi = thermo.psi();
-const volScalarField& mu = thermo.mu();
-
-bool inviscid(true);
-if (max(mu.primitiveField()) > 0.0)
-{
- inviscid = false;
-}
Info<< "Reading field U\n" << endl;
volVectorField U
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
index a64bfc9a04..06ed69c553 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralDyMFoam/rhoCentralDyMFoam.C
@@ -42,10 +42,14 @@ Description
int main(int argc, char *argv[])
{
+ #define NO_CONTROL
+ #include "postProcess.H"
+
#include "setRootCase.H"
#include "createTime.H"
#include "createDynamicFvMesh.H"
#include "createFields.H"
+ #include "createFieldRefs.H"
#include "createTimeControls.H"
turbulence->validate();
diff --git a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
index ea16c6ba61..242802143b 100644
--- a/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
+++ b/applications/solvers/compressible/rhoCentralFoam/rhoCentralFoam.C
@@ -42,11 +42,14 @@ Description
int main(int argc, char *argv[])
{
- #include "setRootCase.H"
+ #define NO_CONTROL
+ #include "postProcess.H"
+ #include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
#include "createFields.H"
+ #include "createFieldRefs.H"
#include "createTimeControls.H"
#include "createRDeltaT.H"
diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFieldRefs.H b/applications/solvers/compressible/rhoPimpleFoam/createFieldRefs.H
new file mode 100644
index 0000000000..502b3b4230
--- /dev/null
+++ b/applications/solvers/compressible/rhoPimpleFoam/createFieldRefs.H
@@ -0,0 +1 @@
+const volScalarField& psi = thermo.psi();
diff --git a/applications/solvers/compressible/rhoPimpleFoam/createFields.H b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
index 96a8ea8421..8d1ccb82fd 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoPimpleFoam/createFields.H
@@ -8,7 +8,6 @@ psiThermo& thermo = pThermo();
thermo.validate(args.executable(), "h", "e");
volScalarField& p = thermo.p();
-const volScalarField& psi = thermo.psi();
volScalarField rho
(
@@ -90,3 +89,5 @@ volScalarField dpdt
Info<< "Creating field kinetic energy K\n" << endl;
volScalarField K("K", 0.5*magSqr(U));
+
+#include "createMRF.H"
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
index 667d78cd30..7f67d1ecb3 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleDyMFoam/rhoPimpleDyMFoam.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
@@ -51,16 +51,16 @@ Description
int main(int argc, char *argv[])
{
+ #include "postProcess.H"
+
#include "setRootCase.H"
#include "createTime.H"
#include "createDynamicFvMesh.H"
-
- pimpleControl pimple(mesh);
-
+ #include "createControl.H"
#include "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "createFields.H"
- #include "createMRF.H"
+ #include "createFieldRefs.H"
#include "createFvOptions.H"
#include "createRhoUf.H"
#include "createControls.H"
diff --git a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
index dd05b57895..8a258789ba 100644
--- a/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.C
+++ b/applications/solvers/compressible/rhoPimpleFoam/rhoPimpleFoam.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
@@ -46,17 +46,17 @@ 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 "createRDeltaT.H"
#include "initContinuityErrs.H"
#include "createFields.H"
- #include "createMRF.H"
+ #include "createFieldRefs.H"
#include "createFvOptions.H"
turbulence->validate();
diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFieldRefs.H b/applications/solvers/compressible/rhoSimpleFoam/createFieldRefs.H
new file mode 100644
index 0000000000..502b3b4230
--- /dev/null
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFieldRefs.H
@@ -0,0 +1 @@
+const volScalarField& psi = thermo.psi();
diff --git a/applications/solvers/compressible/rhoSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
index 61cea5c2e5..e8c2ce6d54 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/createFields.H
@@ -21,7 +21,6 @@ volScalarField rho
);
volScalarField& p = thermo.p();
-const volScalarField& psi = thermo.psi();
Info<< "Reading field U\n" << endl;
volVectorField U
@@ -81,3 +80,5 @@ autoPtr<compressible::turbulenceModel> turbulence
);
dimensionedScalar initialMass = fvc::domainIntegrate(rho);
+
+#include "createMRF.H"
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
index 0c899c3171..02ddee5132 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/Make/options
@@ -1,4 +1,5 @@
EXE_INC = \
+ -I. \
-I.. \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
index 2fe0e53dbc..e7136c52d0 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/createFields.H
@@ -80,3 +80,5 @@ autoPtr<compressible::turbulenceModel> turbulence
);
dimensionedScalar initialMass = fvc::domainIntegrate(rho);
+
+#include "createMRF.H"
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
index 38ed77a2bd..62d239f60c 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousSimpleFoam/rhoPorousSimpleFoam.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
@@ -42,14 +42,13 @@ Description
int main(int argc, char *argv[])
{
+ #include "postProcess.H"
+
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
-
- simpleControl simple(mesh);
-
+ #include "createControl.H"
#include "createFields.H"
- #include "createMRF.H"
#include "createFvOptions.H"
#include "createZones.H"
#include "initContinuityErrs.H"
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
index fc4dc8cee8..f86d3466c8 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoSimpleFoam.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
@@ -40,14 +40,14 @@ Description
int main(int argc, char *argv[])
{
+ #include "postProcess.H"
+
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
-
- simpleControl simple(mesh);
-
+ #include "createControl.H"
#include "createFields.H"
- #include "createMRF.H"
+ #include "createFieldRefs.H"
#include "createFvOptions.H"
#include "initContinuityErrs.H"
diff --git a/applications/solvers/compressible/sonicFoam/createFieldRefs.H b/applications/solvers/compressible/sonicFoam/createFieldRefs.H
new file mode 100644
index 0000000000..a14057e9bc
--- /dev/null
+++ b/applications/solvers/compressible/sonicFoam/createFieldRefs.H
@@ -0,0 +1,2 @@
+volScalarField& e = thermo.he();
+const volScalarField& psi = thermo.psi();
diff --git a/applications/solvers/compressible/sonicFoam/createFields.H b/applications/solvers/compressible/sonicFoam/createFields.H
index ad4b4a3019..1b54f4a912 100644
--- a/applications/solvers/compressible/sonicFoam/createFields.H
+++ b/applications/solvers/compressible/sonicFoam/createFields.H
@@ -8,8 +8,6 @@ psiThermo& thermo = pThermo();
thermo.validate(args.executable(), "e");
volScalarField& p = thermo.p();
-volScalarField& e = thermo.he();
-const volScalarField& psi = thermo.psi();
volScalarField rho
(
@@ -54,3 +52,5 @@ autoPtr<compressible::turbulenceModel> turbulence
Info<< "Creating field kinetic energy K\n" << endl;
volScalarField K("K", 0.5*magSqr(U));
+
+#include "createMRF.H"
diff --git a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
index ac2614c2dd..f955bdc200 100644
--- a/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicDyMFoam/sonicDyMFoam.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
@@ -45,20 +45,20 @@ 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 "createControls.H"
#include "createFields.H"
- #include "createMRF.H"
+ #include "createFieldRefs.H"
#include "createFvOptions.H"
#include "createRhoUf.H"
#include "compressibleCourantNo.H"
#include "setInitialDeltaT.H"
+ #include "initContinuityErrs.H"
turbulence->validate();
diff --git a/applications/solvers/compressible/sonicFoam/sonicFoam.C b/applications/solvers/compressible/sonicFoam/sonicFoam.C
index 8abeef1614..b5da74de7d 100644
--- a/applications/solvers/compressible/sonicFoam/sonicFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicFoam.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,14 +43,14 @@ 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 "createFields.H"
- #include "createMRF.H"
+ #include "createFieldRefs.H"
#include "createFvOptions.H"
#include "initContinuityErrs.H"
diff --git a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/createFields.H b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/createFields.H
index 54f26a90c0..d94b173fee 100644
--- a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/createFields.H
+++ b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/createFields.H
@@ -1,3 +1,6 @@
+#include "readThermodynamicProperties.H"
+#include "readTransportProperties.H"
+
Info<< "Reading field p\n" << endl;
volScalarField p
(
diff --git a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
index eb147db6c0..3622d2dd70 100644
--- a/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
+++ b/applications/solvers/compressible/sonicFoam/sonicLiquidFoam/sonicLiquidFoam.C
@@ -37,14 +37,12 @@ Description
int main(int argc, char *argv[])
{
+ #include "postProcess.H"
+
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
-
- pimpleControl pimple(mesh);
-
- #include "readThermodynamicProperties.H"
- #include "readTransportProperties.H"
+ #include "createControl.H"
#include "createFields.H"
#include "initContinuityErrs.H"
--
GitLab