songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

applications/solvers: Added -postProcess option

Browse Source 
See also commit cc455173ff
This commit is contained in:
Henry Weller 2016-05-09 14:08:15 +01:00
parent 6c275f2aa6
commit 7dca6b6a21
40 changed files with 104 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/solvers/electromagnetics/mhdFoam/createControl.H Normal file
View File

@ -0,0 +1,2 @@
pisoControl piso(mesh);
pisoControl bpiso(mesh, "BPISO");

84
applications/solvers/electromagnetics/mhdFoam/createPhiB.H
View File

@ -1,47 +1,49 @@
IOobject phiBHeader
IOobject phiBHeader
(
"phiB",
runTime.timeName(),
mesh,
IOobject::NO_READ
);
surfaceScalarField* phiBPtr = NULL;
if (phiBHeader.headerOk())
{
Info<< "Reading face flux ";
phiBPtr = new surfaceScalarField
(
"phiB",
runTime.timeName(),
mesh,
IOobject::NO_READ
IOobject
(
"phiB",
runTime.timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
);
}
else
{
Info<< "Calculating face flux ";
surfaceScalarField* phiBPtr;
if (phiBHeader.headerOk())
{
Info<< "Reading field phiB\n" << endl;
phiBPtr = new surfaceScalarField
phiBPtr = new surfaceScalarField
(
IOobject
(
IOobject
(
"phiB",
runTime.timeName(),
mesh,
IOobject::MUST_READ,
IOobject::AUTO_WRITE
),
mesh
);
}
else
{
Info<< "Calculating face flux\n" << endl;
"phiB",
runTime.timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
fvc::flux(B)
);
}
phiBPtr = new surfaceScalarField
(
IOobject
(
"phiB",
runTime.timeName(),
mesh,
IOobject::NO_READ,
IOobject::AUTO_WRITE
),
fvc::flux(B)
);
}
surfaceScalarField& phiB = *phiBPtr;
surfaceScalarField& phiB = *phiBPtr;
Info<< phiB.name() << nl << endl;

8
applications/solvers/electromagnetics/mhdFoam/mhdFoam.C
View File

@ -55,14 +55,12 @@ Description
int main(int argc, char *argv[])
{
#include "setRootCase.H"
#include "postProcess.H"
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
pisoControl piso(mesh);
pisoControl bpiso(mesh, "BPISO");
#include "createControl.H"
#include "createFields.H"
#include "initContinuityErrs.H"

6
applications/solvers/financial/financialFoam/financialFoam.C
View File

@ -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
@ -37,8 +37,10 @@ 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"

1
applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/SRFPimpleFoam.C
View File

@ -44,6 +44,7 @@ Description
int main(int argc, char *argv[])
{
#include "postProcess.H"
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"

1
applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createControls.H
View File

@ -1,3 +1,4 @@
#include "createControl.H"
#include "createTimeControls.H"
bool correctPhi

3
applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/pimpleDyMFoam.C
View File

@ -50,12 +50,11 @@ int main(int argc, char *argv[])
#include "createTime.H"
#include "createDynamicFvMesh.H"
#include "initContinuityErrs.H"
#include "createControl.H"
#include "createControls.H"
#include "createFields.H"
#include "createUf.H"
#include "createMRF.H"
#include "createFvOptions.H"
#include "createControls.H"
#include "CourantNo.H"
#include "setInitialDeltaT.H"

1
applications/solvers/incompressible/pisoFoam/createControl.H
View File

@ -1 +0,0 @@
pisoControl piso(mesh);

1
applications/solvers/incompressible/shallowWaterFoam/createControl.H
View File

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

1
applications/solvers/incompressible/simpleFoam/createControl.H
View File

@ -1 +0,0 @@
simpleControl simple(mesh);

1
applications/solvers/multiphase/cavitatingFoam/createControl.H
View File

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

1
applications/solvers/multiphase/compressibleInterFoam/createControl.H
View File

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

1
applications/solvers/multiphase/compressibleMultiphaseInterFoam/createControl.H
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

1
applications/solvers/stressAnalysis/solidDisplacementFoam/Make/options
View File

@ -1,4 +1,5 @@
EXE_INC = \
-I. \
-ItractionDisplacement/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude

3
applications/solvers/stressAnalysis/solidDisplacementFoam/createSolidDisplacementFoamControls.H → applications/solvers/stressAnalysis/solidDisplacementFoam/createControl.H
View File

@ -1,6 +1,3 @@
const dictionary& stressControl = mesh.solutionDict().subDict("stressAnalysis");
int nCorr = stressControl.lookupOrDefault<int>("nCorrectors", 1);
scalar convergenceTolerance(readScalar(stressControl.lookup("D")));
Switch compactNormalStress(stressControl.lookup("compactNormalStress"));

5
applications/solvers/stressAnalysis/solidDisplacementFoam/createControls.H Normal file
View File

@ -0,0 +1,5 @@
#include "createControl.H"
int nCorr = stressControl.lookupOrDefault<int>("nCorrectors", 1);
scalar convergenceTolerance(readScalar(stressControl.lookup("D")));

3
applications/solvers/stressAnalysis/solidDisplacementFoam/createFields.H
View File

@ -1,3 +1,6 @@
#include "readMechanicalProperties.H"
#include "readThermalProperties.H"
Info<< "Reading field D\n" << endl;
volVectorField D
(

9
applications/solvers/stressAnalysis/solidDisplacementFoam/solidDisplacementFoam.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,13 +42,12 @@ Description
int main(int argc, char *argv[])
{
#include "setRootCase.H"
#include "postProcess.H"
#include "setRootCase.H"
#include "createTime.H"
#include "createMesh.H"
#include "readMechanicalProperties.H"
#include "readThermalProperties.H"
#include "createSolidDisplacementFoamControls.H"
#include "createControls.H"
#include "createFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

1
applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/Make/options
View File

@ -1,4 +1,5 @@
EXE_INC = \
-I. \
-I../solidDisplacementFoam \
-ItractionDisplacementCorrectionStress \
-I$(LIB_SRC)/finiteVolume/lnInclude \

1
applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/createControls.H Normal file
View File

@ -0,0 +1 @@
const dictionary& stressControl = mesh.solutionDict().subDict("stressAnalysis");

2
applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/createFields.H
View File

@ -1,3 +1,5 @@
#include "readMechanicalProperties.H"
Info<< "Reading displacement field D\n" << endl;
volVectorField D
(

2
applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/readSteadyStressFoamControls.H
View File

@ -1,3 +1 @@
const dictionary& stressControl = mesh.solutionDict().subDict("stressAnalysis");
scalar accFac(readScalar(stressControl.lookup("accelerationFactor")));

8
applications/solvers/stressAnalysis/solidEquilibriumDisplacementFoam/solidEquilibriumDisplacementFoam.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,11 +42,13 @@ 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 "readMechanicalProperties.H"
#include "createControls.H"
#include "createFields.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

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

@ -39,15 +39,15 @@ Description
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
#ifndef CREATE_MESH
#define CREATE_MESH createMesh.H
#define CREATE_MESH createMesh.H
#endif
#ifndef CREATE_FIELDS
#define CREATE_FIELDS createFields.H
#define CREATE_FIELDS createFields.H
#endif
#ifndef CREATE_CONTROL
#define CREATE_CONTROL createControl.H
#define CREATE_CONTROL createControl.H
#endif
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -55,6 +55,8 @@ Description
#define INCLUDE_FILE(X) INCLUDE_FILE2(X)
#define INCLUDE_FILE2(X) #X
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
Foam::argList::addBoolOption
(
argList::postProcessOptionName,
@ -71,7 +73,10 @@ if (argList::postProcess(argc, argv))
#include "createTime.H"
Foam::instantList timeDirs = Foam::timeSelector::select0(runTime, args);
#include INCLUDE_FILE(CREATE_MESH)
#ifndef NO_CONTROL
#include INCLUDE_FILE(CREATE_CONTROL)
#endif
// Externally stored dictionary for functionObjectList
// if not constructed from runTime

0
applications/solvers/incompressible/pimpleFoam/createControl.H → src/finiteVolume/cfdTools/general/include/createPimpleControl.H
View File

0
applications/solvers/incompressible/nonNewtonianIcoFoam/createControl.H → src/finiteVolume/cfdTools/general/include/createPisoControl.H
View File

0
applications/solvers/incompressible/adjointShapeOptimizationFoam/createControl.H → src/finiteVolume/cfdTools/general/include/createSimpleControl.H
View File

8
src/finiteVolume/cfdTools/general/solutionControl/createControl.H Normal file
View File

@ -0,0 +1,8 @@
#if defined(NO_CONTROL)
#elif defined(PISO_CONTROL)
#include "createPisoControl.H"
#elif defined(PIMPLE_CONTROL)
#include "createPimpleControl.H"
#elif defined(SIMPLE_CONTROL)
#include "createSimpleControl.H"
#endif

5
src/finiteVolume/cfdTools/general/solutionControl/pimpleControl/pimpleControl.H
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
@ -38,6 +38,9 @@ Description
#include "solutionControl.H"
//- Declare that pimpleControl will be used
#define PIMPLE_CONTROL
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam

4
src/finiteVolume/cfdTools/general/solutionControl/pisoControl/pisoControl.H
View File

@ -34,6 +34,10 @@ Description
#include "pimpleControl.H"
//- Declare that pisoControl will be used
#define PISO_CONTROL
#undef PIMPLE_CONTROL
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam

3
src/finiteVolume/cfdTools/general/solutionControl/simpleControl/simpleControl.H
View File

@ -35,6 +35,9 @@ Description
#include "solutionControl.H"
//- Declare that pimpleControl will be used
#define SIMPLE_CONTROL
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
namespace Foam