diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C index 1357a3348c..7ecff13d5d 100644 --- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C +++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C @@ -53,7 +53,7 @@ Foam::word Foam::functionObject::scopedName(const word& name) const return IOobject::scopedName(name_, name); } - return name_; + return name; } diff --git a/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C index 7578c6ced5..c9718a9d7a 100644 --- a/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C +++ b/src/finiteVolume/fields/fvPatchFields/derived/electrostaticDeposition/electrostaticDepositionFvPatchScalarField.C @@ -107,7 +107,7 @@ void Foam::electrostaticDepositionFvPatchScalarField::writeFilmFields() const ( IOobject ( - IOobject::scopedName(word("electrostaticDeposition"), "h"), + IOobject::scopedName("electrostaticDeposition", "h"), mesh.time().timeName(), mesh, IOobject::NO_READ, diff --git a/src/functionObjects/field/momentum/momentum.H b/src/functionObjects/field/momentum/momentum.H index 12472f8a00..2367e6d566 100644 --- a/src/functionObjects/field/momentum/momentum.H +++ b/src/functionObjects/field/momentum/momentum.H @@ -5,7 +5,7 @@ \\ / A nd | www.openfoam.com \\/ M anipulation | ------------------------------------------------------------------------------- - Copyright (C) 2018-2020 OpenCFD Ltd. + Copyright (C) 2018-2021 OpenCFD Ltd. ------------------------------------------------------------------------------- License This file is part of OpenFOAM. @@ -225,15 +225,6 @@ protected: //- Write momentum data void writeValues(Ostream& os); - // Protected Member Functions - - //- Return a scoped name - // TODO - revisit issue #1675 - word scopedName(const word& base) const - { - return IOobject::scopedName(this->name(), base); - } - public: