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

ENH: function objects - apply scoped name when registering objects

Browse Source
This commit is contained in:
Andrew Heather
2021-11-19 11:30:08 +00:00
committed by Mark Olesen
parent 9194cd5203
commit c233961d45
23 changed files with 116 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/functionObjects/forces/forceCoeffs/forceCoeffs.C
View File

@ -287,7 +287,7 @@ bool Foam::functionObjects::forceCoeffs::read(const dictionary& dict)
(
IOobject
(
fieldName("forceCoeff"),
scopedName("forceCoeff"),
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
@ -306,7 +306,7 @@ bool Foam::functionObjects::forceCoeffs::read(const dictionary& dict)
(
IOobject
(
fieldName("momentCoeff"),
scopedName("momentCoeff"),
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
@ -467,16 +467,16 @@ bool Foam::functionObjects::forceCoeffs::execute()
if (writeFields_)
{
const volVectorField& force =
lookupObject<volVectorField>(fieldName("force"));
lookupObject<volVectorField>(scopedName("force"));
const volVectorField& moment =
lookupObject<volVectorField>(fieldName("moment"));
lookupObject<volVectorField>(scopedName("moment"));
volVectorField& forceCoeff =
lookupObjectRef<volVectorField>(fieldName("forceCoeff"));
lookupObjectRef<volVectorField>(scopedName("forceCoeff"));
volVectorField& momentCoeff =
lookupObjectRef<volVectorField>(fieldName("momentCoeff"));
lookupObjectRef<volVectorField>(scopedName("momentCoeff"));
dimensionedScalar f0("f0", dimForce, Aref_*pDyn);
dimensionedScalar m0("m0", dimForce*dimLength, Aref_*lRef_*pDyn);
@ -494,10 +494,10 @@ bool Foam::functionObjects::forceCoeffs::write()
if (writeFields_)
{
const volVectorField& forceCoeff =
lookupObject<volVectorField>(fieldName("forceCoeff"));
lookupObject<volVectorField>(scopedName("forceCoeff"));
const volVectorField& momentCoeff =
lookupObject<volVectorField>(fieldName("momentCoeff"));
lookupObject<volVectorField>(scopedName("momentCoeff"));
forceCoeff.write();
momentCoeff.write();

26
src/functionObjects/forces/forces/forces.C
View File

@ -48,12 +48,6 @@ namespace functionObjects
// * * * * * * * * * * * * Protected Member Functions * * * * * * * * * * * //
Foam::word Foam::functionObjects::forces::fieldName(const word& name) const
{
return this->name() + ":" + name;
}
void Foam::functionObjects::forces::createFiles()
{
// Note: Only possible to create bin files after bins have been initialised
@ -332,12 +326,12 @@ void Foam::functionObjects::forces::resetFields()
if (writeFields_)
{
volVectorField& force =
lookupObjectRef<volVectorField>(fieldName("force"));
lookupObjectRef<volVectorField>(scopedName("force"));
force == dimensionedVector(force.dimensions(), Zero);
volVectorField& moment =
lookupObjectRef<volVectorField>(fieldName("moment"));
lookupObjectRef<volVectorField>(scopedName("moment"));
moment == dimensionedVector(moment.dimensions(), Zero);
}
@ -526,11 +520,11 @@ void Foam::functionObjects::forces::addToFields
return;
}
auto& force = lookupObjectRef<volVectorField>(fieldName("force"));
auto& force = lookupObjectRef<volVectorField>(scopedName("force"));
vectorField& pf = force.boundaryFieldRef()[patchi];
pf += fN + fT + fP;
auto& moment = lookupObjectRef<volVectorField>(fieldName("moment"));
auto& moment = lookupObjectRef<volVectorField>(scopedName("moment"));
vectorField& pm = moment.boundaryFieldRef()[patchi];
pm = Md^pf;
}
@ -550,8 +544,8 @@ void Foam::functionObjects::forces::addToFields
return;
}
auto& force = lookupObjectRef<volVectorField>(fieldName("force"));
auto& moment = lookupObjectRef<volVectorField>(fieldName("moment"));
auto& force = lookupObjectRef<volVectorField>(scopedName("force"));
auto& moment = lookupObjectRef<volVectorField>(scopedName("moment"));
forAll(cellIDs, i)
{
@ -913,7 +907,7 @@ bool Foam::functionObjects::forces::read(const dictionary& dict)
(
IOobject
(
fieldName("force"),
scopedName("force"),
time_.timeName(),
mesh_,
IOobject::NO_READ,
@ -932,7 +926,7 @@ bool Foam::functionObjects::forces::read(const dictionary& dict)
(
IOobject
(
fieldName("moment"),
scopedName("moment"),
time_.timeName(),
mesh_,
IOobject::NO_READ,
@ -1120,8 +1114,8 @@ bool Foam::functionObjects::forces::write()
{
if (writeFields_)
{
lookupObject<volVectorField>(fieldName("force")).write();
lookupObject<volVectorField>(fieldName("moment")).write();
lookupObject<volVectorField>(scopedName("force")).write();
lookupObject<volVectorField>(scopedName("moment")).write();
}
return true;

3
src/functionObjects/forces/forces/forces.H
View File

@ -256,9 +256,6 @@ protected:
// Protected Member Functions
//- Create a field name
word fieldName(const word& name) const;
//- Create the output files
void createFiles();