zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

applications/solvers/multiphase: Added -postProcess option

Browse Source 
See also commit cc455173ff
This commit is contained in:
Henry Weller
2016-05-08 20:57:08 +01:00
parent 7bbad53240
commit 38916e66bb
50 changed files with 160 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/SRFSimpleFoam.C
View File

@ -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"

0
applications/solvers/incompressible/simpleFoam/createControls.H → applications/solvers/incompressible/simpleFoam/createControl.H
View File

2
applications/solvers/incompressible/simpleFoam/porousSimpleFoam/porousSimpleFoam.C
View File

@ -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"

2
applications/solvers/incompressible/simpleFoam/simpleFoam.C
View File

@ -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"

10
applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/cavitatingDyMFoam.C
View File

@ -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"

10
applications/solvers/multiphase/cavitatingFoam/cavitatingFoam.C
View File

@ -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"

0
applications/solvers/multiphase/interFoam/createControls.H → applications/solvers/multiphase/cavitatingFoam/createControl.H
View File

2
applications/solvers/multiphase/cavitatingFoam/createFields.H
View File

@ -1,3 +1,5 @@
#include "readThermodynamicProperties.H"
Info<< "Reading field p\n" << endl;
volScalarField p
(

11
applications/solvers/multiphase/compressibleInterFoam/compressibleInterDyMFoam/compressibleInterDyMFoam.C
View File

@ -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();
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

11
applications/solvers/multiphase/compressibleInterFoam/compressibleInterFoam.C
View File

@ -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();
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

0
applications/solvers/multiphase/interPhaseChangeFoam/createControls.H → applications/solvers/multiphase/compressibleInterFoam/createControl.H
View File

4
applications/solvers/multiphase/compressibleInterFoam/createFields.H
View File

@ -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
(

1
applications/solvers/multiphase/compressibleMultiphaseInterFoam/Make/options
View File

@ -1,4 +1,5 @@
EXE_INC = \
-I. \
-I../interFoam \
-ImultiphaseMixtureThermo/lnInclude \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \

9
applications/solvers/multiphase/compressibleMultiphaseInterFoam/compressibleMultiphaseInterFoam.C
View File

@ -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();
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

0
applications/solvers/multiphase/potentialFreeSurfaceFoam/createControls.H → applications/solvers/multiphase/compressibleMultiphaseInterFoam/createControl.H
View File

3
applications/solvers/multiphase/compressibleMultiphaseInterFoam/createFields.H
View File

@ -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

1
applications/solvers/multiphase/driftFluxFoam/createControl.H Normal file
View File

@ -0,0 +1 @@
pimpleControl pimple(mesh);

6
applications/solvers/multiphase/driftFluxFoam/createFields.H
View File

@ -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

12
applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
View File

@ -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();
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

1
applications/solvers/multiphase/interFoam/createControl.H Normal file
View File

@ -0,0 +1 @@
pimpleControl pimple(mesh);

2
applications/solvers/multiphase/interFoam/interDyMFoam/interDyMFoam.C
View File

@ -57,7 +57,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createDynamicFvMesh.H"
#include "initContinuityErrs.H"
#include "createControls.H"
#include "createControl.H"
#include "createTimeControls.H"
#include "createDyMControls.H"
#include "createRDeltaT.H"

2
applications/solvers/multiphase/interFoam/interFoam.C
View File

@ -60,7 +60,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
#include "createControls.H"
#include "createControl.H"
#include "createTimeControls.H"
#include "createRDeltaT.H"
#include "initContinuityErrs.H"

2
applications/solvers/multiphase/interFoam/interMixingFoam/interMixingFoam.C
View File

@ -50,7 +50,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
#include "createControls.H"
#include "createControl.H"
#include "createTimeControls.H"
#include "createRDeltaT.H"
#include "initContinuityErrs.H"

1
applications/solvers/multiphase/interPhaseChangeFoam/createControl.H Normal file
View File

@ -0,0 +1 @@
pimpleControl pimple(mesh);

2
applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeDyMFoam/interPhaseChangeDyMFoam.C
View File

@ -61,7 +61,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createDynamicFvMesh.H"
#include "createControls.H"
#include "createControl.H"
#include "createTimeControls.H"
#include "../interFoam/interDyMFoam/createDyMControls.H"
#include "initContinuityErrs.H"

2
applications/solvers/multiphase/interPhaseChangeFoam/interPhaseChangeFoam.C
View File

@ -58,7 +58,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 "createTimeControls.H"

1
applications/solvers/multiphase/multiphaseEulerFoam/createControl.H Normal file
View File

@ -0,0 +1 @@
pimpleControl pimple(mesh);

15
applications/solvers/multiphase/multiphaseEulerFoam/createFields.H
View File

@ -51,18 +51,6 @@ forAllIter(PtrDictionary<phaseModel>, fluid.phases(), iter)
phi += fvc::interpolate(alpha)*phase.phi();
}
scalar slamDampCoeff
(
fluid.lookupOrDefault<scalar>("slamDampCoeff", 1)
);
dimensionedScalar maxSlamVelocity
(
"maxSlamVelocity",
dimVelocity,
fluid.lookupOrDefault<scalar>("maxSlamVelocity", GREAT)
);
volScalarField rho
(
@ -114,3 +102,6 @@ setRefCell
pRefValue
);
mesh.setFluxRequired(p_rgh.name());
#include "createMRFZones.H"

20
applications/solvers/multiphase/multiphaseEulerFoam/multiphaseEulerFoam.C
View File

@ -45,21 +45,31 @@ 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 "createFields.H"
#include "createMRFZones.H"
#include "initContinuityErrs.H"
#include "createTimeControls.H"
#include "correctPhi.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"
scalar slamDampCoeff
(
fluid.lookupOrDefault<scalar>("slamDampCoeff", 1)
);
dimensionedScalar maxSlamVelocity
(
"maxSlamVelocity",
dimVelocity,
fluid.lookupOrDefault<scalar>("maxSlamVelocity", GREAT)
);
turbulence->validate();
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

2
applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterDyMFoam/multiphaseInterDyMFoam.C
View File

@ -50,7 +50,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createDynamicFvMesh.H"
#include "initContinuityErrs.H"
#include "createControls.H"
#include "createControl.H"
#include "createTimeControls.H"
#include "createDyMControls.H"
#include "createFields.H"

2
applications/solvers/multiphase/multiphaseInterFoam/multiphaseInterFoam.C
View File

@ -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 "initContinuityErrs.H"
#include "createFields.H"
#include "createMRF.H"

1
applications/solvers/multiphase/potentialFreeSurfaceFoam/createControl.H Normal file
View File

@ -0,0 +1 @@
pimpleControl pimple(mesh);

2
applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceDyMFoam/potentialFreeSurfaceDyMFoam.C
View File

@ -55,7 +55,7 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createDynamicFvMesh.H"
#include "initContinuityErrs.H"
#include "createControls.H"
#include "createControl.H"
#include "createTimeControls.H"
#include "createDyMControls.H"
#include "createFields.H"

2
applications/solvers/multiphase/potentialFreeSurfaceFoam/potentialFreeSurfaceFoam.C
View File

@ -49,7 +49,7 @@ int main(int argc, char *argv[])
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
#include "createControls.H"
#include "createControl.H"
#include "createTimeControls.H"
#include "createFields.H"
#include "createMRF.H"

1
applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createControl.H Normal file
View File

@ -0,0 +1 @@
pimpleControl pimple(mesh);

4
applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFieldRefs.H Normal file
View File

@ -0,0 +1,4 @@
surfaceScalarField& phi = fluid.phi();
const IOMRFZoneList& MRF = fluid.MRF();
fv::options& fvOptions = fluid.fvOptions();

5
applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/createFields.H
View File

@ -10,8 +10,6 @@ autoPtr<multiphaseSystem> fluidPtr
multiphaseSystem& fluid = fluidPtr();
multiphaseSystem::phaseModelList& phases = fluid.phases();
surfaceScalarField& phi = fluid.phi();
dimensionedScalar pMin
(
"pMin",
@ -48,6 +46,3 @@ setRefCell
pRefValue
);
mesh.setFluxRequired(p_rgh.name());
const IOMRFZoneList& MRF = fluid.MRF();
fv::options& fvOptions = fluid.fvOptions();

8
applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/reactingMultiphaseEulerFoam.C
View File

@ -43,16 +43,16 @@ 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 "createRDeltaT.H"
#include "createFields.H"
#include "createFieldRefs.H"
if (!LTS)
{

1
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createControl.H Normal file
View File

@ -0,0 +1 @@
pimpleControl pimple(mesh);

28
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFieldRefs.H Normal file
View File

@ -0,0 +1,28 @@
phaseModel& phase1 = fluid.phase1();
phaseModel& phase2 = fluid.phase2();
volScalarField& alpha1 = phase1;
volScalarField& alpha2 = phase2;
volVectorField& U1 = phase1.U();
surfaceScalarField& phi1 = phase1.phi();
surfaceScalarField& alphaPhi1 = phase1.alphaPhi();
surfaceScalarField& alphaRhoPhi1 = phase1.alphaRhoPhi();
volVectorField& U2 = phase2.U();
surfaceScalarField& phi2 = phase2.phi();
surfaceScalarField& alphaPhi2 = phase2.alphaPhi();
surfaceScalarField& alphaRhoPhi2 = phase2.alphaRhoPhi();
surfaceScalarField& phi = fluid.phi();
rhoThermo& thermo1 = phase1.thermo();
rhoThermo& thermo2 = phase2.thermo();
volScalarField& rho1 = thermo1.rho();
const volScalarField& psi1 = thermo1.psi();
volScalarField& rho2 = thermo2.rho();
const volScalarField& psi2 = thermo2.psi();
const IOMRFZoneList& MRF = fluid.MRF();
fv::options& fvOptions = fluid.fvOptions();

32
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/createFields.H
View File

@ -9,24 +9,6 @@ autoPtr<twoPhaseSystem> fluidPtr
);
twoPhaseSystem& fluid = fluidPtr();
phaseModel& phase1 = fluid.phase1();
phaseModel& phase2 = fluid.phase2();
volScalarField& alpha1 = phase1;
volScalarField& alpha2 = phase2;
volVectorField& U1 = phase1.U();
surfaceScalarField& phi1 = phase1.phi();
surfaceScalarField& alphaPhi1 = phase1.alphaPhi();
surfaceScalarField& alphaRhoPhi1 = phase1.alphaRhoPhi();
volVectorField& U2 = phase2.U();
surfaceScalarField& phi2 = phase2.phi();
surfaceScalarField& alphaPhi2 = phase2.alphaPhi();
surfaceScalarField& alphaRhoPhi2 = phase2.alphaRhoPhi();
surfaceScalarField& phi = fluid.phi();
dimensionedScalar pMin
(
"pMin",
@ -36,16 +18,7 @@ dimensionedScalar pMin
#include "gh.H"
rhoThermo& thermo1 = phase1.thermo();
rhoThermo& thermo2 = phase2.thermo();
volScalarField& p = thermo1.p();
volScalarField& rho1 = thermo1.rho();
const volScalarField& psi1 = thermo1.psi();
volScalarField& rho2 = thermo2.rho();
const volScalarField& psi2 = thermo2.psi();
volScalarField& p = fluid.phase1().thermo().p();
Info<< "Reading field p_rgh\n" << endl;
volScalarField p_rgh
@ -72,6 +45,3 @@ setRefCell
pRefValue
);
mesh.setFluxRequired(p_rgh.name());
const IOMRFZoneList& MRF = fluid.MRF();
fv::options& fvOptions = fluid.fvOptions();

8
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/reactingTwoPhaseEulerFoam.C
View File

@ -44,16 +44,16 @@ 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 "createRDeltaT.H"
#include "createFields.H"
#include "createFieldRefs.H"
if (!LTS)
{

1
applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
View File

@ -1,4 +1,5 @@
EXE_INC = \
-I. \
-I../interFoam \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \

1
applications/solvers/multiphase/twoLiquidMixingFoam/createControl.H Normal file
View File

@ -0,0 +1 @@
pimpleControl pimple(mesh);

6
applications/solvers/multiphase/twoLiquidMixingFoam/twoLiquidMixingFoam.C
View File

@ -42,12 +42,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 "initContinuityErrs.H"
#include "createFields.H"
#include "createTimeControls.H"

1
applications/solvers/multiphase/twoPhaseEulerFoam/createControl.H Normal file
View File

@ -0,0 +1 @@
pimpleControl pimple(mesh);

20
applications/solvers/multiphase/twoPhaseEulerFoam/createFieldRefs.H Normal file
View File

@ -0,0 +1,20 @@
volScalarField& alpha2 = phase2;
surfaceScalarField& phi1 = phase1.phi();
surfaceScalarField& alphaPhi1 = phase1.alphaPhi();
surfaceScalarField& alphaRhoPhi1 = phase1.alphaRhoPhi();
surfaceScalarField& phi2 = phase2.phi();
surfaceScalarField& alphaPhi2 = phase2.alphaPhi();
surfaceScalarField& alphaRhoPhi2 = phase2.alphaRhoPhi();
surfaceScalarField& phi = fluid.phi();
rhoThermo& thermo1 = phase1.thermo();
rhoThermo& thermo2 = phase2.thermo();
volScalarField& rho1 = thermo1.rho();
const volScalarField& psi1 = thermo1.psi();
volScalarField& rho2 = thermo2.rho();
const volScalarField& psi2 = thermo2.psi();

24
applications/solvers/multiphase/twoPhaseEulerFoam/createFields.H
View File

@ -9,19 +9,10 @@ phaseModel& phase1 = fluid.phase1();
phaseModel& phase2 = fluid.phase2();
volScalarField& alpha1 = phase1;
volScalarField& alpha2 = phase2;
volVectorField& U1 = phase1.U();
surfaceScalarField& phi1 = phase1.phi();
surfaceScalarField& alphaPhi1 = phase1.alphaPhi();
surfaceScalarField& alphaRhoPhi1 = phase1.alphaRhoPhi();
volVectorField& U2 = phase2.U();
surfaceScalarField& phi2 = phase2.phi();
surfaceScalarField& alphaPhi2 = phase2.alphaPhi();
surfaceScalarField& alphaRhoPhi2 = phase2.alphaRhoPhi();
surfaceScalarField& phi = fluid.phi();
volScalarField& p = phase1.thermo().p();
dimensionedScalar pMin
(
@ -32,17 +23,6 @@ dimensionedScalar pMin
#include "gh.H"
rhoThermo& thermo1 = phase1.thermo();
rhoThermo& thermo2 = phase2.thermo();
volScalarField& p = thermo1.p();
volScalarField& rho1 = thermo1.rho();
const volScalarField& psi1 = thermo1.psi();
volScalarField& rho2 = thermo2.rho();
const volScalarField& psi2 = thermo2.psi();
Info<< "Reading field p_rgh\n" << endl;
volScalarField p_rgh
(
@ -100,3 +80,5 @@ volScalarField dpdt
Info<< "Creating field kinetic energy K\n" << endl;
volScalarField K1(IOobject::groupName("K", phase1.name()), 0.5*magSqr(U1));
volScalarField K2(IOobject::groupName("K", phase2.name()), 0.5*magSqr(U2));
#include "createMRF.H"

9
applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseEulerFoam.C
View File

@ -41,15 +41,14 @@ 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 "createFields.H"
#include "createMRF.H"
#include "createFieldRefs.H"
#include "createFvOptions.H"
#include "createTimeControls.H"
#include "CourantNos.H"

16
src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H
View File

@ -42,12 +42,12 @@ Description
#define CREATE_MESH createMesh.H
#endif
#ifndef CREATE_FIELDS_1
#define CREATE_FIELDS_1 createFields.H
#ifndef CREATE_FIELDS
#define CREATE_FIELDS createFields.H
#endif
#ifndef CREATE_CONTROLS
#define CREATE_CONTROLS createControls.H
#ifndef CREATE_CONTROL
#define CREATE_CONTROL createControl.H
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -71,7 +71,7 @@ if (argList::postProcess(argc, argv))
#include "createTime.H"
Foam::instantList timeDirs = Foam::timeSelector::select0(runTime, args);
#include INCLUDE_FILE(CREATE_MESH)
#include INCLUDE_FILE(CREATE_CONTROLS)
#include INCLUDE_FILE(CREATE_CONTROL)
// Externally stored dictionary for functionObjectList
// if not constructed from runTime
@ -96,7 +96,7 @@ if (argList::postProcess(argc, argv))
functionObjectList::New(args, runTime, functionObjectsDict);
}
#include INCLUDE_FILE(CREATE_FIELDS_1)
#include INCLUDE_FILE(CREATE_FIELDS)
#ifdef CREATE_FIELDS_2
#include INCLUDE_FILE(CREATE_FIELDS_2)
@ -132,7 +132,7 @@ if (argList::postProcess(argc, argv))
#undef INCLUDE_FILE2
#undef CREATE_MESH
#undef CREATE_FIELDS_1
#undef CREATE_CONTROLS
#undef CREATE_FIELDS
#undef CREATE_CONTROL
// ************************************************************************* //