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

functionObjects: Cleanup, reorganize and simplify

Browse Source
This commit is contained in:
Henry Weller
2016-05-21 23:12:12 +01:00
parent 8e04042137
commit 8f68a493e8
15 changed files with 224 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/postProcessing/functionObjects/field/Lambda2/Lambda2.C
View File

@ -24,8 +24,6 @@ License
\*---------------------------------------------------------------------------*/
#include "Lambda2.H"
#include "volFields.H"
#include "zeroGradientFvPatchFields.H"
#include "fvcGrad.H"
#include "addToRunTimeSelectionTable.H"
@ -56,29 +54,8 @@ Foam::functionObjects::Lambda2::Lambda2
const dictionary& dict
)
:
fvMeshFunctionObject(name, runTime, dict)
{
read(dict);
volScalarField* Lambda2Ptr
(
new volScalarField
(
IOobject
(
type(),
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::NO_WRITE
),
mesh_,
dimensionedScalar("0", dimless/sqr(dimTime), 0.0)
)
);
mesh_.objectRegistry::store(Lambda2Ptr);
}
fieldExpression(name, runTime, dict, "U", "Lambda2")
{}
// * * * * * * * * * * * * * * * * Destructor * * * * * * * * * * * * * * * //
@ -89,51 +66,30 @@ Foam::functionObjects::Lambda2::~Lambda2()
// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
bool Foam::functionObjects::Lambda2::read(const dictionary& dict)
{
UName_ = dict.lookupOrDefault<word>("U", "U");
return true;
}
bool Foam::functionObjects::Lambda2::execute(const bool postProcess)
{
const volVectorField& U =
mesh_.lookupObject<volVectorField>(UName_);
if (foundField<volVectorField>(fieldName_))
{
const volVectorField& U = lookupField<volVectorField>(fieldName_);
const tmp<volTensorField> tgradU(fvc::grad(U));
const volTensorField& gradU = tgradU();
const volTensorField gradU(fvc::grad(U));
const volTensorField SSplusWW
(
(symm(gradU) & symm(gradU))
+ (skew(gradU) & skew(gradU))
);
volScalarField& Lambda2 =
const_cast<volScalarField&>
const volTensorField SSplusWW
(
mesh_.lookupObject<volScalarField>(type())
(symm(gradU) & symm(gradU))
+ (skew(gradU) & skew(gradU))
);
Lambda2 = -eigenValues(SSplusWW)().component(vector::Y);
return true;
}
bool Foam::functionObjects::Lambda2::write(const bool postProcess)
{
const volScalarField& Lambda2 =
obr_.lookupObject<volScalarField>(type());
Info<< type() << " " << name() << " output:" << nl
<< " writing field " << Lambda2.name() << nl
<< endl;
Lambda2.write();
return true;
return store
(
resultName_,
-eigenValues(SSplusWW)().component(vector::Y)
);
}
else
{
return false;
}
}

28
src/postProcessing/functionObjects/field/Lambda2/Lambda2.H
View File

@ -33,6 +33,7 @@ Description
the velocity gradient tensor.
SeeAlso
Foam::functionObjects::fieldExpression
Foam::functionObjects::fvMeshFunctionObject
SourceFiles
@ -43,8 +44,7 @@ SourceFiles
#ifndef functionObjects_Lambda2_H
#define functionObjects_Lambda2_H
#include "fvMeshFunctionObject.H"
#include "volFieldsFwd.H"
#include "fieldExpression.H"
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@ -59,22 +59,8 @@ namespace functionObjects
class Lambda2
:
public fvMeshFunctionObject
public fieldExpression
{
// Private data
//- Name of velocity field, default is "U"
word UName_;
// Private Member Functions
//- Disallow default bitwise copy construct
Lambda2(const Lambda2&);
//- Disallow default bitwise assignment
void operator=(const Lambda2&);
public:
@ -99,14 +85,8 @@ public:
// Member Functions
//- Read the Lambda2 data
virtual bool read(const dictionary&);
//- Calculate Lambda2
//- Calculate the Lambda2 field
virtual bool execute(const bool postProcess = false);
//- Write Lambda2
virtual bool write(const bool postProcess = false);
};