zhyang-dev/OpenFOAM-12
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fluxRequired: Added setFluxRequired function to fvSchemes class

Browse Source 
Added calls to setFluxRequired for p in all incompressible solvers which
avoids the need to add fluxRequired entries in fvSchemes dictionary.

Will add calls to setFluxRequired to the rest of the solvers.
This commit is contained in:
Henry Weller
2015-07-15 15:04:51 +01:00
parent 3599b8918b
commit 65d9aacd22
54 changed files with 403 additions and 628 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
applications/solvers/basic/potentialFoam/createFields.H
View File

@ -96,3 +96,4 @@
PhiRefCell,
PhiRefValue
);
mesh.setFluxRequired(Phi.name());

2
applications/solvers/incompressible/adjointShapeOptimizationFoam/createFields.H
View File

@ -32,6 +32,7 @@
label pRefCell = 0;
scalar pRefValue = 0.0;
setRefCell(p, simple.dict(), pRefCell, pRefValue);
mesh.setFluxRequired(p.name());
Info<< "Reading field pa\n" << endl;
@ -74,6 +75,7 @@
paRefCell,
paRefValue
);
mesh.setFluxRequired(pa.name());
singlePhaseTransportModel laminarTransport(U, phi);

1
applications/solvers/incompressible/icoFoam/createFields.H
View File

@ -53,3 +53,4 @@
label pRefCell = 0;
scalar pRefValue = 0.0;
setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
mesh.setFluxRequired(p.name());

1
applications/solvers/incompressible/nonNewtonianIcoFoam/createFields.H
View File

@ -37,3 +37,4 @@
label pRefCell = 0;
scalar pRefValue = 0.0;
setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
mesh.setFluxRequired(p.name());

1
applications/solvers/incompressible/pimpleFoam/SRFPimpleFoam/createFields.H
View File

@ -43,6 +43,7 @@ surfaceScalarField phi
label pRefCell = 0;
scalar pRefValue = 0.0;
setRefCell(p, pimple.dict(), pRefCell, pRefValue);
mesh.setFluxRequired(p.name());
singlePhaseTransportModel laminarTransport(Urel, phi);

1
applications/solvers/incompressible/pimpleFoam/createFields.H
View File

@ -32,6 +32,7 @@ volVectorField U
label pRefCell = 0;
scalar pRefValue = 0.0;
setRefCell(p, pimple.dict(), pRefCell, pRefValue);
mesh.setFluxRequired(p.name());
singlePhaseTransportModel laminarTransport(U, phi);

2
applications/solvers/incompressible/pimpleFoam/pimpleDyMFoam/createFields.H Normal file
View File

@ -0,0 +1,2 @@
#include "../createFields.H"
mesh.setFluxRequired("pcorr");

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

@ -32,6 +32,7 @@
label pRefCell = 0;
scalar pRefValue = 0.0;
setRefCell(p, piso.dict(), pRefCell, pRefValue);
mesh.setFluxRequired(p.name());
singlePhaseTransportModel laminarTransport(U, phi);

2
applications/solvers/incompressible/shallowWaterFoam/createFields.H
View File

@ -73,3 +73,5 @@ hTotal.write();
Info<< "Creating Coriolis Force" << endl;
const dimensionedVector F("F", ((2.0*Omega) & gHat)*gHat);
mesh.setFluxRequired(h.name());

1
applications/solvers/incompressible/simpleFoam/SRFSimpleFoam/createFields.H
View File

@ -43,6 +43,7 @@
label pRefCell = 0;
scalar pRefValue = 0.0;
setRefCell(p, simple.dict(), pRefCell, pRefValue);
mesh.setFluxRequired(p.name());
singlePhaseTransportModel laminarTransport(Urel, phi);

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

@ -32,6 +32,7 @@
label pRefCell = 0;
scalar pRefValue = 0.0;
setRefCell(p, simple.dict(), pRefCell, pRefValue);
mesh.setFluxRequired(p.name());
singlePhaseTransportModel laminarTransport(U, phi);

19
src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -42,13 +42,13 @@ void Foam::fvSchemes::clear()
defaultD2dt2Scheme_.clear();
interpolationSchemes_.clear();
defaultInterpolationScheme_.clear();
divSchemes_.clear(); // optional
divSchemes_.clear();
defaultDivScheme_.clear();
gradSchemes_.clear(); // optional
gradSchemes_.clear();
defaultGradScheme_.clear();
snGradSchemes_.clear();
defaultSnGradScheme_.clear();
laplacianSchemes_.clear(); // optional
laplacianSchemes_.clear();
defaultLaplacianScheme_.clear();
fluxRequired_.clear();
defaultFluxRequired_ = false;
@ -558,6 +558,17 @@ Foam::ITstream& Foam::fvSchemes::laplacianScheme(const word& name) const
}
void Foam::fvSchemes::setFluxRequired(const word& name)
{
if (debug)
{
Info<< "Setting fluxRequired for " << name << endl;
}
fluxRequired_.add(name, true);
}
bool Foam::fvSchemes::fluxRequired(const word& name) const
{
if (debug)

4
src/finiteVolume/finiteVolume/fvSchemes/fvSchemes.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2011-2014 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2015 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -130,6 +130,8 @@ public:
ITstream& laplacianScheme(const word& name) const;
void setFluxRequired(const word& name);
bool fluxRequired(const word& name) const;
//- Return true if the default ddtScheme is steadyState

6
tutorials/basic/potentialFoam/cylinder/system/fvSchemes
View File

@ -47,11 +47,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
Phi ;
}
// ************************************************************************* //

6
tutorials/basic/potentialFoam/pitzDaily/system/fvSchemes
View File

@ -47,11 +47,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
Phi ;
}
// ************************************************************************* //

6
tutorials/incompressible/SRFPimpleFoam/rotor2D/system/fvSchemes
View File

@ -49,11 +49,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

6
tutorials/incompressible/SRFSimpleFoam/mixer/system/fvSchemes
View File

@ -54,12 +54,6 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
wallDist
{
method meshWave;

6
tutorials/incompressible/adjointShapeOptimizationFoam/pitzDaily/system/fvSchemes
View File

@ -53,11 +53,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p;
pa;
}
// ************************************************************************* //

6
tutorials/incompressible/icoFoam/cavity/system/fvSchemes
View File

@ -47,11 +47,5 @@ snGradSchemes
default orthogonal;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

6
tutorials/incompressible/icoFoam/cavityClipped/system/fvSchemes
View File

@ -46,11 +46,5 @@ snGradSchemes
default orthogonal;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

6
tutorials/incompressible/icoFoam/cavityGrade/system/fvSchemes
View File

@ -46,11 +46,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

6
tutorials/incompressible/icoFoam/elbow/system/fvSchemes
View File

@ -46,11 +46,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

6
tutorials/incompressible/nonNewtonianIcoFoam/offsetCylinder/system/fvSchemes
View File

@ -47,11 +47,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

7
tutorials/incompressible/pimpleDyMFoam/mixerVesselAMI2D/system/fvSchemes
View File

@ -50,12 +50,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
pcorr ;
p ;
}
// ************************************************************************* //

7
tutorials/incompressible/pimpleDyMFoam/movingCone/system/fvSchemes
View File

@ -50,12 +50,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
pcorr ;
p ;
}
// ************************************************************************* //

7
tutorials/incompressible/pimpleDyMFoam/oscillatingInletACMI2D/system/fvSchemes
View File

@ -52,12 +52,5 @@ snGradSchemes
default limited corrected 0.33;
}
fluxRequired
{
default no;
pcorr ;
p ;
}
// ************************************************************************* //

7
tutorials/incompressible/pimpleDyMFoam/propeller/system/fvSchemes
View File

@ -52,12 +52,5 @@ snGradSchemes
default limited corrected 0.33;
}
fluxRequired
{
default no;
pcorr ;
p ;
}
// ************************************************************************* //

7
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_pimpleDyMFoam/system/fvSchemes
View File

@ -50,13 +50,6 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
pcorr ;
p;
}
wallDist
{
method meshWave;

6
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion2D_simpleFoam/system/fvSchemes
View File

@ -50,12 +50,6 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p;
}
wallDist
{
method meshWave;

6
tutorials/incompressible/pimpleDyMFoam/wingMotion/wingMotion_snappyHexMesh/system/fvSchemes
View File

@ -54,11 +54,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p;
}
// ************************************************************************* //

6
tutorials/incompressible/pimpleFoam/TJunction/system/fvSchemes
View File

@ -52,11 +52,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

6
tutorials/incompressible/pimpleFoam/TJunctionFan/system/fvSchemes
View File

@ -52,11 +52,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

6
tutorials/incompressible/pimpleFoam/channel395/system/fvSchemes
View File

@ -51,12 +51,6 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
wallDist
{
method meshWave;

6
tutorials/incompressible/pimpleFoam/elipsekkLOmega/system/fvSchemes
View File

@ -50,12 +50,6 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
wallDist
{
method meshWave;

6
tutorials/incompressible/pimpleFoam/pitzDaily/system/fvSchemes
View File

@ -61,11 +61,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

6
tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSchemes
View File

@ -57,12 +57,6 @@ snGradSchemes
default limited corrected 0.33;
}
fluxRequired
{
default no;
p;
}
wallDist
{
method meshWave;

7
tutorials/incompressible/pisoFoam/les/motorBike/motorBike/system/fvSchemes
View File

@ -52,13 +52,6 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p;
Phi;
}
wallDist
{
method meshWave;

6
tutorials/incompressible/pisoFoam/les/pitzDaily/system/fvSchemes
View File

@ -48,11 +48,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

6
tutorials/incompressible/pisoFoam/les/pitzDailyMapped/system/fvSchemes
View File

@ -51,11 +51,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

6
tutorials/incompressible/pisoFoam/ras/cavity/system/fvSchemes
View File

@ -53,11 +53,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

6
tutorials/incompressible/pisoFoam/ras/cavityCoupledU/system/fvSchemes
View File

@ -52,11 +52,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

6
tutorials/incompressible/porousSimpleFoam/angledDuctExplicit/system/fvSchemes
View File

@ -50,11 +50,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

6
tutorials/incompressible/porousSimpleFoam/angledDuctImplicit/system/fvSchemes
View File

@ -50,11 +50,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

6
tutorials/incompressible/porousSimpleFoam/straightDuctImplicit/system/fvSchemes
View File

@ -50,11 +50,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

5
tutorials/incompressible/shallowWaterFoam/squareBump/system/fvSchemes
View File

@ -45,10 +45,5 @@ snGradSchemes
default uncorrected;
}
fluxRequired
{
h;
}
// ************************************************************************* //

6
tutorials/incompressible/simpleFoam/airFoil2D/system/fvSchemes
View File

@ -48,12 +48,6 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
wallDist
{
method meshWave;

6
tutorials/incompressible/simpleFoam/mixerVessel2D/system/fvSchemes
View File

@ -49,11 +49,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

7
tutorials/incompressible/simpleFoam/motorBike/system/fvSchemes
View File

@ -49,13 +49,6 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p;
Phi;
}
wallDist
{
method meshWave;

6
tutorials/incompressible/simpleFoam/pipeCyclic/system/fvSchemes
View File

@ -52,11 +52,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

6
tutorials/incompressible/simpleFoam/pitzDaily/system/fvSchemes
View File

@ -52,12 +52,6 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
wallDist
{
method meshWave;

6
tutorials/incompressible/simpleFoam/pitzDailyExptInlet/system/fvSchemes
View File

@ -52,11 +52,5 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
// ************************************************************************* //

6
tutorials/incompressible/simpleFoam/rotorDisk/system/fvSchemes
View File

@ -58,12 +58,6 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
wallDist
{
method meshWave;

6
tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes
View File

@ -50,11 +50,5 @@ snGradSchemes
default limited corrected 0.333;
}
fluxRequired
{
default no;
p;
}
// ************************************************************************* //

6
tutorials/incompressible/simpleFoam/windAroundBuildings/system/fvSchemes
View File

@ -57,12 +57,6 @@ snGradSchemes
default corrected;
}
fluxRequired
{
default no;
p ;
}
wallDist
{
method meshWave;