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

functionObjects: Replaced 'name' with 'patch', 'faceZone' or 'cellZone' as appropriate

Browse Source 
for consistency with the rest of OpenFOAM and to allow 'name' to be used as the
keyword to name the functionObject.
This commit is contained in:
Henry Weller
2023-02-01 11:54:36 +00:00
parent 189c52389f
commit 574165dc13
5 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/functionObjects/field/fieldValues/fieldValue/fieldValue.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -54,7 +54,7 @@ Foam::functionObjects::fieldValue::fieldValue
dict_(dict),
valueType_(valueType),
regionName_(word::null),
resultDict_(fileName("name"), dictionary::null)
resultDict_(fileName("result"), dictionary::null)
{
read(dict);
}
@ -73,7 +73,7 @@ Foam::functionObjects::fieldValue::fieldValue
dict_(dict),
valueType_(valueType),
regionName_(word::null),
resultDict_(fileName("name"), dictionary::null)
resultDict_(fileName("result"), dictionary::null)
{
read(dict);
}

6
src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2011-2022 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2011-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -418,13 +418,13 @@ void Foam::functionObjects::fieldValues::surfaceFieldValue::initialise
{
case regionTypes::faceZone:
{
dict.lookup("name") >> regionName_;
dict.lookupBackwardsCompatible({"faceZone", "name"}) >> regionName_;
setFaceZoneFaces();
break;
}
case regionTypes::patch:
{
dict.lookup("name") >> regionName_;
dict.lookupBackwardsCompatible({"patch", "name"}) >> regionName_;
setPatchFaces();
break;
}

14
src/functionObjects/field/uniform/uniform.C
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -51,7 +51,7 @@ Foam::functionObjects::uniform::uniform
:
fvMeshFunctionObject(name, runTime, dict),
fieldType_(word::null),
name_(word::null),
fieldName_(word::null),
dimensions_(dimless)
{
read(dict);
@ -71,7 +71,7 @@ bool Foam::functionObjects::uniform::read(const dictionary& dict)
fvMeshFunctionObject::read(dict);
fieldType_ = dict.lookup<word>("fieldType");
name_ = dict.lookup<word>("name");
fieldName_ = dict.lookupBackwardsCompatible<word>({"field", "name"});
dimensions_.reset(dict.lookup<dimensionSet>("dimensions"));
bool ok = false;
@ -114,10 +114,10 @@ bool Foam::functionObjects::uniform::execute()
{ \
store \
( \
name_, \
fieldName_, \
GeoField<Type>::New \
( \
name_, \
fieldName_, \
mesh_, \
dimensioned<Type>(dimensions_, Type##Value_) \
) \
@ -133,13 +133,13 @@ bool Foam::functionObjects::uniform::execute()
bool Foam::functionObjects::uniform::write()
{
return writeObject(name_);
return writeObject(fieldName_);
}
bool Foam::functionObjects::uniform::clear()
{
return clearObject(name_);
return clearObject(fieldName_);
}

4
src/functionObjects/field/uniform/uniform.H
View File

@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration | Website: https://openfoam.org
\\ / A nd | Copyright (C) 2021 OpenFOAM Foundation
\\ / A nd | Copyright (C) 2021-2023 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
@ -63,7 +63,7 @@ class uniform
word fieldType_;
//- The field's name
word name_;
word fieldName_;
//- The field's dimensions
dimensionSet dimensions_;