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

codedFvModel: Removed unnecessary and inconsistent "name" entry

Browse Source 
The name of the codedFvModel is now set to the key name of the sub-dictionary in
the fvModels dictionary that defines it.
This commit is contained in:
Henry Weller
2021-05-18 13:31:20 +01:00
parent 58afe5dccb
commit a8eef3be87
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/fvModels/general/codedFvModel/codedFvModel.C
View File

@ -60,8 +60,6 @@ void Foam::fv::codedFvModel::readCoeffs()
{ {
fieldName_ = coeffs().lookup<word>("field"); fieldName_ = coeffs().lookup<word>("field");
name_ = coeffs().lookup<word>("name");
if (fieldPrimitiveTypeName() != word::null) if (fieldPrimitiveTypeName() != word::null)
{ {
updateLibrary(); updateLibrary();
@ -89,7 +87,7 @@ void Foam::fv::codedFvModel::prepare
const word primitiveTypeName = fieldPrimitiveTypeName(); const word primitiveTypeName = fieldPrimitiveTypeName();
// Set additional rewrite rules // Set additional rewrite rules
dynCode.setFilterVariable("typeName", name_); dynCode.setFilterVariable("typeName", name());
dynCode.setFilterVariable("TemplateType", primitiveTypeName); dynCode.setFilterVariable("TemplateType", primitiveTypeName);
dynCode.setFilterVariable("SourceType", primitiveTypeName + "Source"); dynCode.setFilterVariable("SourceType", primitiveTypeName + "Source");

4
src/fvModels/general/codedFvModel/codedFvModel.H
View File

@ -33,7 +33,6 @@ Usage
energySource energySource
{ {
type codedFvModel; type codedFvModel;
name sourceTime;
selectionMode all; selectionMode all;
@ -104,9 +103,6 @@ class codedFvModel
//- The set of cells the fvConstraint applies to //- The set of cells the fvConstraint applies to
fvCellSet set_; fvCellSet set_;
//- The name
word name_;
//- The name of the field that this fvModel applies to //- The name of the field that this fvModel applies to
word fieldName_; word fieldName_;