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

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
mattijs
2012-03-12 10:33:22 +00:00
parent 0a8167203f f849409c20
commit fc3908810c
3 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
applications/utilities/postProcessing/velocityField/Q/Q.C
View File

@ -2,7 +2,7 @@
========= | ========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | \\ / O peration |
\\ / A nd | Copyright (C) 2011 OpenFOAM Foundation \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
\\/ M anipulation | \\/ M anipulation |
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
License License
@ -27,6 +27,8 @@ Application
Description Description
Calculates and writes the second invariant of the velocity gradient tensor. Calculates and writes the second invariant of the velocity gradient tensor.
Q = 0.5*(sqr(tr(gradU)) - tr(((gradU)&(gradU)))) [1/s^2]
The -noWrite option just outputs the max/min values without writing The -noWrite option just outputs the max/min values without writing
the field. the field.

27
src/postProcessing/functionObjects/utilities/pressureCoefficient/pressureCoefficient.C
View File

@ -34,9 +34,16 @@ defineTypeNameAndDebug(Foam::pressureCoefficient, 0);
// * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * //
Foam::tmp<Foam::volScalarField> Foam::pressureCoefficient::rho() const Foam::tmp<Foam::volScalarField> Foam::pressureCoefficient::rho
(
const volScalarField& p
) const
{ {
if (rhoName_ == "rhoInf") if (p.dimensions() == dimPressure)
{
return(obr_.lookupObject<volScalarField>(rhoName_));
}
else
{ {
const fvMesh& mesh = refCast<const fvMesh>(obr_); const fvMesh& mesh = refCast<const fvMesh>(obr_);
@ -51,14 +58,10 @@ Foam::tmp<Foam::volScalarField> Foam::pressureCoefficient::rho() const
mesh mesh
), ),
mesh, mesh,
dimensionedScalar("rho", dimDensity, rhoRef_) dimensionedScalar("rho", dimless, 1.0)
) )
); );
} }
else
{
return(obr_.lookupObject<volScalarField>(rhoName_));
}
} }
@ -76,8 +79,7 @@ Foam::pressureCoefficient::pressureCoefficient
obr_(obr), obr_(obr),
active_(true), active_(true),
pName_("p"), pName_("p"),
rhoName_(word::null), rhoName_("rho"),
rhoRef_(-GREAT),
magUinf_(0.0) magUinf_(0.0)
{ {
// Check if the available mesh is an fvMesh, otherwise deactivate // Check if the available mesh is an fvMesh, otherwise deactivate
@ -114,12 +116,7 @@ void Foam::pressureCoefficient::read(const dictionary& dict)
if (active_) if (active_)
{ {
pName_ = dict.lookupOrDefault<word>("pName", "p"); pName_ = dict.lookupOrDefault<word>("pName", "p");
rhoName_ = dict.lookupOrDefault<word>("rhoName", "rho"); rhoName_ = dict.lookupOrDefault<word>("rhoName", "rho");
if (rhoName_ == "rhoInf")
{
dict.lookup("rhoInf") >> rhoRef_;
}
dict.lookup("magUinf") >> magUinf_; dict.lookup("magUinf") >> magUinf_;
} }
@ -153,7 +150,7 @@ void Foam::pressureCoefficient::write()
obr_, obr_,
IOobject::NO_READ IOobject::NO_READ
), ),
p/(0.5*rho()*sqr(magUinf_)) p/(0.5*rho(p)*sqr(magUinf_))
); );
pressureCoefficient.write(); pressureCoefficient.write();

12
src/postProcessing/functionObjects/utilities/pressureCoefficient/pressureCoefficient.H
View File

@ -77,21 +77,15 @@ class pressureCoefficient
//- Name of density field (optional) //- Name of density field (optional)
word rhoName_; word rhoName_;
//- Reference density needed for incompressible calculations [kg/m3]
scalar rhoRef_;
//- Free stream velocity magnitude [m/s] //- Free stream velocity magnitude [m/s]
scalar magUinf_; scalar magUinf_;
// Private Member Functions // Private Member Functions
//- Return rho if rhoName is specified otherwise rhoRef //- Return 1 if the pressure field is kinematic, i.e. p/rho
tmp<volScalarField> rho() const; // otherwise return rho from database
tmp<volScalarField> rho(const volScalarField& p) const;
//- Return rhoRef if the pressure field is dynamic, i.e. p/rho
// otherwise return 1
scalar rho(const volScalarField& p) const;
//- Disallow default bitwise copy construct //- Disallow default bitwise copy construct
pressureCoefficient(const pressureCoefficient&); pressureCoefficient(const pressureCoefficient&);