applications/solvers/multiphase: Added -postProcess option

See also commit 30e2f912

applications/solvers/multiphase: Added -postProcess option
See also commit 30e2f912
4cadaeb3 · Henry Weller · ed3af8df · 4cadaeb3 · 4cadaeb3 · 4cadaeb3
Commit 4cadaeb3 authored 8 years ago by Henry Weller
--- a/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
    #include "setRootCase.H"
    #include "createTime.H"
    #include "createMesh.H"
-    #include "createControls.H"
+    #include "createControl.H"
    #include "createFields.H"
    #include "createFvOptions.H"
    #include "initContinuityErrs.H"

--- a/applications/solvers/incompressible/simpleFoam/createControls.H
+++ b/applications/solvers/incompressible/simpleFoam/createControls.H
--- a/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
@@ -48,7 +48,7 @@ int main(int argc, char *argv[])
    #include "setRootCase.H"
    #include "createTime.H"
    #include "createMesh.H"
-    #include "createControls.H"
+    #include "createControl.H"
    #include "createFields.H"
    #include "createPorousZones.H"
    #include "createFvOptions.H"

--- a/applications/solvers/incompressible/simpleFoam/simpleFoam.C
+++ b/applications/solvers/incompressible/simpleFoam/simpleFoam.C
@@ -44,7 +44,7 @@ int main(int argc, char *argv[])
    #include "setRootCase.H"
    #include "createTime.H"
    #include "createMesh.H"
-    #include "createControls.H"
+    #include "createControl.H"
    #include "createFields.H"
    #include "createFvOptions.H"
    #include "initContinuityErrs.H"

--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
@@ -2,7 +2,7 @@
  =========                 |
  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012-2015 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
     \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,14 +44,12 @@ Description

 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #include "postProcess.H"

+    #include "setRootCase.H"
    #include "createTime.H"
    #include "createDynamicFvMesh.H"
-
-    pimpleControl pimple(mesh);
-
-    #include "readThermodynamicProperties.H"
+    #include "createControl.H"
    #include "createControls.H"
    #include "createFields.H"
    #include "createUf.H"

--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.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,12 @@ Description

 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #include "postProcess.H"

+    #include "setRootCase.H"
    #include "createTime.H"
    #include "createMesh.H"
-
-    pimpleControl pimple(mesh);
-
-    #include "readThermodynamicProperties.H"
+    #include "createControl.H"
    #include "createControls.H"
    #include "createFields.H"
    #include "CourantNo.H"

--- a/applications/solvers/multiphase/interFoam/createControls.H
+++ b/applications/solvers/multiphase/interFoam/createControls.H
--- a/applications/solvers/multiphase/cavitatingFoam/createFields.H
+++ b/applications/solvers/multiphase/cavitatingFoam/createFields.H
+#include "readThermodynamicProperties.H"
+
 Info<< "Reading field p\n" << endl;
 volScalarField p
 (

--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
@@ -52,19 +52,24 @@ 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 "createControls.H"
    #include "CourantNo.H"
    #include "setInitialDeltaT.H"

+    volScalarField& p = mixture.p();
+    volScalarField& T = mixture.T();
+    const volScalarField& psi1 = mixture.thermo1().psi();
+    const volScalarField& psi2 = mixture.thermo2().psi();
+
    turbulence->validate();

    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
@@ -49,17 +49,22 @@ 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 "CourantNo.H"
    #include "setInitialDeltaT.H"

+    volScalarField& p = mixture.p();
+    volScalarField& T = mixture.T();
+    const volScalarField& psi1 = mixture.thermo1().psi();
+    const volScalarField& psi2 = mixture.thermo2().psi();
+
    turbulence->validate();

    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/multiphase/interPhaseChangeFoam/createControls.H
+++ b/applications/solvers/multiphase/interPhaseChangeFoam/createControls.H
--- a/applications/solvers/multiphase/compressibleInterFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleInterFoam/createFields.H
@@ -36,12 +36,8 @@ volScalarField& alpha2(mixture.alpha2());

 Info<< "Reading thermophysical properties\n" << endl;

-volScalarField& p = mixture.p();
-volScalarField& T = mixture.T();
 volScalarField& rho1 = mixture.thermo1().rho();
-const volScalarField& psi1 = mixture.thermo1().psi();
 volScalarField& rho2 = mixture.thermo2().rho();
-const volScalarField& psi2 = mixture.thermo2().psi();

 volScalarField rho
 (

--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
 EXE_INC = \
+    -I. \
    -I../interFoam \
    -ImultiphaseMixtureThermo/lnInclude \
    -I$(LIB_SRC)/transportModels/compressible/lnInclude \

--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C
@@ -44,17 +44,20 @@ 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 "CourantNo.H"
    #include "setInitialDeltaT.H"

+    volScalarField& p = mixture.p();
+    volScalarField& T = mixture.T();
+
    turbulence->validate();

    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/multiphase/potentialFreeSurfaceFoam/createControls.H
+++ b/applications/solvers/multiphase/potentialFreeSurfaceFoam/createControls.H
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H
+++ b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H
@@ -31,9 +31,6 @@ volVectorField U
 Info<< "Constructing multiphaseMixtureThermo\n" << endl;
 multiphaseMixtureThermo mixture(U, phi);

-volScalarField& p = mixture.p();
-volScalarField& T = mixture.T();
-
 volScalarField rho
 (
    IOobject

--- a/applications/solvers/multiphase/driftFluxFoam/createControl.H
+++ b/applications/solvers/multiphase/driftFluxFoam/createControl.H
+pimpleControl pimple(mesh);
--- a/applications/solvers/multiphase/driftFluxFoam/createFields.H
+++ b/applications/solvers/multiphase/driftFluxFoam/createFields.H
@@ -33,10 +33,6 @@ Info<< "Reading incompressibleTwoPhaseInteractingMixture\n" << endl;
 incompressibleTwoPhaseInteractingMixture mixture(U, phi);

 volScalarField& alpha1(mixture.alpha1());
-volScalarField& alpha2(mixture.alpha2());
-
-const dimensionedScalar& rho1 = mixture.rhod();
-const dimensionedScalar& rho2 = mixture.rhoc();

 // Mixture density
 volScalarField rho
@@ -77,8 +73,6 @@ autoPtr<relativeVelocityModel> UdmModelPtr
    )
 );

-relativeVelocityModel& UdmModel(UdmModelPtr());
-

 // Construct compressible turbulence model
 autoPtr

--- a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
+++ b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
@@ -49,19 +49,23 @@ Description

 int main(int argc, char *argv[])
 {
-    #include "setRootCase.H"
+    #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"
    #include "createFvOptions.H"
    #include "initContinuityErrs.H"

+    volScalarField& alpha2(mixture.alpha2());
+    const dimensionedScalar& rho1 = mixture.rhod();
+    const dimensionedScalar& rho2 = mixture.rhoc();
+    relativeVelocityModel& UdmModel(UdmModelPtr());
+
    turbulence->validate();

    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

--- a/applications/solvers/multiphase/interFoam/createControl.H
+++ b/applications/solvers/multiphase/interFoam/createControl.H
+pimpleControl pimple(mesh);