diff --git a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
index 7a17daacf5b92f105661fe6518074e33391b18c5..bb1062c93dbddb531df80b9a555fa77b589d479f 100644
--- a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2016 OpenFOAM Foundation
- Copyright (C) 2016-2019 OpenCFD Ltd.
+ Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -60,7 +60,7 @@ SourceFiles
namespace Foam
{
-// Forward declarations
+// Forward Declarations
class objectRegistry;
namespace functionObjects
@@ -206,6 +206,7 @@ public:
//- Deprecated(2018-10)
// \deprecated(2018-10) - use findObject() method
template<class ObjectType>
+ FOAM_DEPRECATED_FOR(2018-10, "findObject / cfindObject() methods")
const ObjectType* lookupObjectPtr(const word& fieldName) const
{
return this->cfindObject<ObjectType>(fieldName);
@@ -214,6 +215,7 @@ public:
//- Deprecated(2018-10)
// \deprecated(2018-10) - use getObjectPtr() method
template<class ObjectType>
+ FOAM_DEPRECATED_FOR(2018-10, "getObjectPtr() method")
ObjectType* lookupObjectRefPtr(const word& fieldName) const
{
return this->getObjectPtr<ObjectType>(fieldName);
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index fda27b6543b49264b10703d37b4967dbf6f3136f..578391a1d68039e62eddf1ee89485c90a1d7ff4d 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -537,6 +537,7 @@ public:
//- Deprecated(2018-10) find object
// \deprecated(2018-10) - use findObject() method
template<class Type>
+ FOAM_DEPRECATED_FOR(2018-10, "findObject / cfindObject() methods")
const Type* lookupObjectPtr
(
const word& name,
@@ -549,6 +550,7 @@ public:
//- Deprecated(2018-10) get object pointer, ignoring constness
// \deprecated(2018-10) - use getObjectPtr() method
template<class Type>
+ FOAM_DEPRECATED_FOR(2018-10, "getObjectPtr() method")
Type* lookupObjectRefPtr
(
const word& name,
diff --git a/src/functionObjects/field/columnAverage/columnAverage.C b/src/functionObjects/field/columnAverage/columnAverage.C
index b2543fcf193e7e1f73280f85dd2a1182e49fe2a8..f1eb09e2508a3a8522a3ee0dee6d2e67834ca299 100644
--- a/src/functionObjects/field/columnAverage/columnAverage.C
+++ b/src/functionObjects/field/columnAverage/columnAverage.C
@@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2018 OpenCFD Ltd.
+ Copyright (C) 2018-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -172,7 +172,7 @@ bool Foam::functionObjects::columnAverage::write()
{
const word resultName("columnAverage(" + fieldName + ")");
const regIOobject* obj =
- obr_.lookupObjectPtr<regIOobject>(averageName(fieldName));
+ obr_.cfindObject<regIOobject>(averageName(fieldName));
if (obj)
{
diff --git a/src/functionObjects/field/columnAverage/columnAverage.H b/src/functionObjects/field/columnAverage/columnAverage.H
index ef1bb8e28bb3adecc58ee404bc75e3f54cdb72ab..e97366e68bf747ac3070829ee8ac07e701faa4f0 100644
--- a/src/functionObjects/field/columnAverage/columnAverage.H
+++ b/src/functionObjects/field/columnAverage/columnAverage.H
@@ -94,7 +94,7 @@ class columnAverage
:
public fvMeshFunctionObject
{
- // Private data
+ // Private Data
//- Patches on which to collapse the fields
labelHashSet patchSet_;
@@ -145,7 +145,7 @@ public:
// Member Functions
//- Read the settings
- virtual bool read(const dictionary&);
+ virtual bool read(const dictionary& dict);
//- Execute, currently does nothing
virtual bool execute();
diff --git a/src/functionObjects/field/columnAverage/columnAverageTemplates.C b/src/functionObjects/field/columnAverage/columnAverageTemplates.C
index ab9aef1f5295e50d8ec5ecac4368d780c409d50f..bb928a0a055cc0e710e27590d7440dccf94a0b24 100644
--- a/src/functionObjects/field/columnAverage/columnAverageTemplates.C
+++ b/src/functionObjects/field/columnAverage/columnAverageTemplates.C
@@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2018-2019 OpenCFD Ltd.
+ Copyright (C) 2018-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -39,7 +39,7 @@ bool Foam::functionObjects::columnAverage::columnAverageField
{
typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
- const fieldType* fldPtr = lookupObjectPtr<fieldType>(fieldName);
+ const fieldType* fldPtr = cfindObject<fieldType>(fieldName);
if (fldPtr)
{
@@ -47,9 +47,11 @@ bool Foam::functionObjects::columnAverage::columnAverageField
const word resultName(averageName(fieldName));
- if (!obr_.foundObject<fieldType>(resultName))
+ fieldType* resPtr = obr_.getObjectPtr<fieldType>(resultName);
+
+ if (!resPtr)
{
- fieldType* ptr = new fieldType
+ resPtr = new fieldType
(
IOobject
(
@@ -61,10 +63,9 @@ bool Foam::functionObjects::columnAverage::columnAverageField
),
fld
);
- obr_.objectRegistry::store(ptr);
+ obr_.objectRegistry::store(resPtr);
}
-
- fieldType& res = obr_.lookupObjectRef<fieldType>(resultName);
+ fieldType& res = *resPtr;
const meshStructure& ms = meshAddressing(fld.mesh());
if (globalFaces_().empty())
diff --git a/src/functionObjects/field/continuityError/continuityError.C b/src/functionObjects/field/continuityError/continuityError.C
index 36e40ac54b8336114236c9eb533a4b7d1d1c3627..c0364e98380dfea6966185f939c5d18d17fa79b7 100644
--- a/src/functionObjects/field/continuityError/continuityError.C
+++ b/src/functionObjects/field/continuityError/continuityError.C
@@ -5,7 +5,7 @@
\\ / A nd | www.openfoam.com
\\/ M anipulation |
-------------------------------------------------------------------------------
- Copyright (C) 2019 OpenCFD Ltd.
+ Copyright (C) 2019-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -101,7 +101,7 @@ bool Foam::functionObjects::continuityError::execute()
bool Foam::functionObjects::continuityError::write()
{
- const auto phiPtr = mesh_.lookupObjectPtr<surfaceScalarField>(phiName_);
+ const auto* phiPtr = mesh_.cfindObject<surfaceScalarField>(phiName_);
if (!phiPtr)
{
diff --git a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C
index 31a2019c86173db1e91fd061854cb1b1fa33056d..2562c4407e79c83ebde2bb1ce7b05f4677c9c9fc 100644
--- a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C
+++ b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C
@@ -149,14 +149,12 @@ Foam::heatTransferCoeffModels::ReynoldsAnalogy::devReff() const
return -nu*dev(twoSymm(fvc::grad(U)));
}
- else
- {
- FatalErrorInFunction
- << "No valid model for viscous stress calculation"
- << exit(FatalError);
- return volSymmTensorField::null();
- }
+ FatalErrorInFunction
+ << "No valid model for viscous stress calculation"
+ << exit(FatalError);
+
+ return nullptr;
}
diff --git a/src/functionObjects/field/pressure/pressure.C b/src/functionObjects/field/pressure/pressure.C
index a9cddd414991635554d7210448bc45a3541b475d..3e6fad918e5a1a3e933ef160b58e23a4b5268f3e 100644
--- a/src/functionObjects/field/pressure/pressure.C
+++ b/src/functionObjects/field/pressure/pressure.C
@@ -263,7 +263,7 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::pressure::calcPressure
if (mode_ & ISENTROPIC)
{
const basicThermo* thermoPtr =
- p.mesh().lookupObjectPtr<basicThermo>(basicThermo::dictName);
+ p.mesh().cfindObject<basicThermo>(basicThermo::dictName);
if (!thermoPtr)
{
diff --git a/src/functionObjects/utilities/writeDictionary/writeDictionary.C b/src/functionObjects/utilities/writeDictionary/writeDictionary.C
index 20afdfad196c90bc98ae82c51edfacfb7249f801..3b1f52301e7e0e4f916e08828cf5e99562f77c6e 100644
--- a/src/functionObjects/utilities/writeDictionary/writeDictionary.C
+++ b/src/functionObjects/utilities/writeDictionary/writeDictionary.C
@@ -6,7 +6,7 @@
\\/ M anipulation |
-------------------------------------------------------------------------------
Copyright (C) 2013-2017 OpenFOAM Foundation
- Copyright (C) 2016-2019 OpenCFD Ltd.
+ Copyright (C) 2016-2020 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -174,7 +174,7 @@ bool Foam::functionObjects::writeDictionary::write()
forAll(dictNames_, dicti)
{
const IOdictionary* dictptr =
- obr_.lookupObjectPtr<IOdictionary>(dictNames_[dicti]);
+ obr_.cfindObject<IOdictionary>(dictNames_[dicti]);
if (dictptr)
{