zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: use singleton method for accessing runtime selection

Browse Source 
STYLE: use alias to mark partialFaceAreaWeightAMI deprecation after v2012
This commit is contained in:
Mark Olesen
2021-10-12 19:44:00 +02:00
parent 4fc6ec1d1d
commit ba8d6bddcc
337 changed files with 1555 additions and 1542 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/functionObjects/field/DMD/DMDModels/DMDModel/DMDModelNew.C
View File

@ -38,9 +38,9 @@ Foam::autoPtr<Foam::DMDModel> Foam::DMDModel::New
{
const word modelType(dict.get<word>("DMDModel"));
auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
auto* ctorPtr = dictionaryConstructorTable(modelType);
if (!cstrIter.found())
if (!ctorPtr)
{
FatalIOErrorInLookup
(
@ -51,7 +51,7 @@ Foam::autoPtr<Foam::DMDModel> Foam::DMDModel::New
) << exit(FatalIOError);
}
return autoPtr<DMDModel>(cstrIter()(mesh, name, dict));
return autoPtr<DMDModel>(ctorPtr(mesh, name, dict));
}

8
src/functionObjects/field/fieldValues/fieldValue/fieldValueNew.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2012-2016 OpenFOAM Foundation
Copyright (C) 2019 OpenCFD Ltd.
Copyright (C) 2019-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -46,9 +46,9 @@ Foam::functionObjects::fieldValue::New
Info<< "Selecting " << typeName << ' ' << modelType << endl;
}
auto cstrIter = runTimeConstructorTablePtr_->cfind(modelType);
auto* ctorPtr = runTimeConstructorTable(modelType);
if (!cstrIter.found())
if (!ctorPtr)
{
FatalIOErrorInLookup
(
@ -59,7 +59,7 @@ Foam::functionObjects::fieldValue::New
) << exit(FatalIOError);
}
return autoPtr<fieldValue>(cstrIter()(name, runTime, dict));
return autoPtr<fieldValue>(ctorPtr(name, runTime, dict));
}

8
src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/heatTransferCoeffModel/heatTransferCoeffModelNew.C
View File

@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2017-2019 OpenCFD Ltd.
Copyright (C) 2017-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -42,9 +42,9 @@ Foam::autoPtr<Foam::heatTransferCoeffModel> Foam::heatTransferCoeffModel::New
Info<< "Selecting heat transfer coefficient model " << modelType << endl;
auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
auto* ctorPtr = dictionaryConstructorTable(modelType);
if (!cstrIter.found())
if (!ctorPtr)
{
FatalIOErrorInLookup
(
@ -55,7 +55,7 @@ Foam::autoPtr<Foam::heatTransferCoeffModel> Foam::heatTransferCoeffModel::New
) << exit(FatalIOError);
}
return autoPtr<heatTransferCoeffModel>(cstrIter()(dict, mesh, TName));
return autoPtr<heatTransferCoeffModel>(ctorPtr(dict, mesh, TName));
}

8
src/functionObjects/utilities/runTimeControl/runTimeCondition/runTimeCondition/runTimeConditionNew.C
View File

@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2015 OpenFOAM Foundation
Copyright (C) 2015-2019 OpenCFD Ltd.
Copyright (C) 2015-2021 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@ -43,9 +43,9 @@ Foam::functionObjects::runTimeControls::runTimeCondition::New
Info<< "Selecting runTimeCondition " << modelType << endl;
auto cstrIter = dictionaryConstructorTablePtr_->cfind(modelType);
auto* ctorPtr = dictionaryConstructorTable(modelType);
if (!cstrIter.found())
if (!ctorPtr)
{
FatalIOErrorInLookup
(
@ -59,7 +59,7 @@ Foam::functionObjects::runTimeControls::runTimeCondition::New
return
autoPtr<runTimeCondition>
(
cstrIter()(conditionName, obr, dict, state)
ctorPtr(conditionName, obr, dict, state)
);
}