diff --git a/src/finiteVolume/functionObjects/volRegion/volRegion.C b/src/finiteVolume/functionObjects/volRegion/volRegion.C index 32139b300d..9c47cd425a 100644 --- a/src/finiteVolume/functionObjects/volRegion/volRegion.C +++ b/src/finiteVolume/functionObjects/volRegion/volRegion.C @@ -2,7 +2,7 @@ ========= | \\ / F ield | OpenFOAM: The Open Source CFD Toolbox \\ / O peration | Website: https://openfoam.org - \\ / A nd | Copyright (C) 2016-2018 OpenFOAM Foundation + \\ / A nd | Copyright (C) 2016-2023 OpenFOAM Foundation \\/ M anipulation | ------------------------------------------------------------------------------- License @@ -110,7 +110,7 @@ bool Foam::functionObjects::volRegion::read { case vrtCellZone: { - dict.lookup("name") >> regionName_; + dict.lookupBackwardsCompatible({"cellZone", "name"}) >> regionName_; regionID_ = mesh_.cellZones().findZoneID(regionName_); diff --git a/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C b/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C index 0de8f6aa7f..7263188743 100644 --- a/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C +++ b/src/functionObjects/field/fieldValues/fieldValue/fieldValue.C @@ -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); } diff --git a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C index 98c86b3e1a..62c0c2695d 100644 --- a/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C +++ b/src/functionObjects/field/fieldValues/surfaceFieldValue/surfaceFieldValue.C @@ -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; } diff --git a/src/functionObjects/field/uniform/uniform.C b/src/functionObjects/field/uniform/uniform.C index c0c7fec111..eeb765c72d 100644 --- a/src/functionObjects/field/uniform/uniform.C +++ b/src/functionObjects/field/uniform/uniform.C @@ -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("fieldType"); - name_ = dict.lookup("name"); + fieldName_ = dict.lookupBackwardsCompatible({"field", "name"}); dimensions_.reset(dict.lookup("dimensions")); bool ok = false; @@ -114,10 +114,10 @@ bool Foam::functionObjects::uniform::execute() { \ store \ ( \ - name_, \ + fieldName_, \ GeoField::New \ ( \ - name_, \ + fieldName_, \ mesh_, \ dimensioned(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_); } diff --git a/src/functionObjects/field/uniform/uniform.H b/src/functionObjects/field/uniform/uniform.H index 3f14cbdba0..224ec00868 100644 --- a/src/functionObjects/field/uniform/uniform.H +++ b/src/functionObjects/field/uniform/uniform.H @@ -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_;