From a8eef3be878f173cd3b3f5d816b93d7a4b1c09e3 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Tue, 18 May 2021 13:31:20 +0100 Subject: [PATCH] codedFvModel: Removed unnecessary and inconsistent "name" entry The name of the codedFvModel is now set to the key name of the sub-dictionary in the fvModels dictionary that defines it. --- src/fvModels/general/codedFvModel/codedFvModel.C | 4 +--- src/fvModels/general/codedFvModel/codedFvModel.H | 4 ---- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/fvModels/general/codedFvModel/codedFvModel.C b/src/fvModels/general/codedFvModel/codedFvModel.C index b04fcf4de9..71e481b7ac 100644 --- a/src/fvModels/general/codedFvModel/codedFvModel.C +++ b/src/fvModels/general/codedFvModel/codedFvModel.C @@ -60,8 +60,6 @@ void Foam::fv::codedFvModel::readCoeffs() { fieldName_ = coeffs().lookup("field"); - name_ = coeffs().lookup("name"); - if (fieldPrimitiveTypeName() != word::null) { updateLibrary(); @@ -89,7 +87,7 @@ void Foam::fv::codedFvModel::prepare const word primitiveTypeName = fieldPrimitiveTypeName(); // Set additional rewrite rules - dynCode.setFilterVariable("typeName", name_); + dynCode.setFilterVariable("typeName", name()); dynCode.setFilterVariable("TemplateType", primitiveTypeName); dynCode.setFilterVariable("SourceType", primitiveTypeName + "Source"); diff --git a/src/fvModels/general/codedFvModel/codedFvModel.H b/src/fvModels/general/codedFvModel/codedFvModel.H index 025ab37718..9817b989a8 100644 --- a/src/fvModels/general/codedFvModel/codedFvModel.H +++ b/src/fvModels/general/codedFvModel/codedFvModel.H @@ -33,7 +33,6 @@ Usage energySource { type codedFvModel; - name sourceTime; selectionMode all; @@ -104,9 +103,6 @@ class codedFvModel //- The set of cells the fvConstraint applies to fvCellSet set_; - //- The name - word name_; - //- The name of the field that this fvModel applies to word fieldName_;