diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.H b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.H
index 031587beebb047eaad96bf39bce5f6ac761ff671..932b3a3f8e6ead58bfb7805ff4fe5580708dde2a 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.H
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/phaseSystem/phaseSystem.H
@@ -260,13 +260,7 @@ public:
virtual volScalarField& he()
{
NotImplemented;
- return
- (
- const_cast<volScalarField&>
- (
- volScalarField::null()
- )
- );
+ return const_cast<volScalarField&>(volScalarField::null());
}
//- Return access to the inernal energy field [J/Kg]
@@ -274,10 +268,7 @@ public:
virtual const volScalarField& he() const
{
NotImplemented;
- return
- (
- volScalarField::null()
- );
+ return volScalarField::null();
}
//- Enthalpy/Internal energy
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
index 0a2377b2f3761988f803c1ac39d74b5cfbeb2be7..dfd3a346cc16f2302a75267d29b7972ed452c076 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/PhaseSystems/ThermalPhaseChangePhaseSystem/ThermalPhaseChangePhaseSystem.C
@@ -131,19 +131,15 @@ Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::heatTransfer() const
dimensionedScalar(dimensionSet(1,-1,-3,0,0), Zero)
);
- if
- (
- otherPhase.mesh().foundObject<volScalarField>
+ const volScalarField* alphatPtr =
+ otherPhase.mesh().findObject<volScalarField>
(
"alphat." + otherPhase.name()
- )
- )
+ );
+
+ if (alphatPtr)
{
- const volScalarField& alphat =
- otherPhase.mesh().lookupObject<volScalarField>
- (
- "alphat." + otherPhase.name()
- );
+ const volScalarField& alphat = *alphatPtr;
const fvPatchList& patches = this->mesh().boundary();
forAll(patches, patchi)
@@ -427,19 +423,15 @@ void Foam::ThermalPhaseChangePhaseSystem<BasePhaseSystem>::correctThermo()
dimensionedScalar(dimDensity/dimTime, Zero)
);
- if
- (
- phase2.mesh().foundObject<volScalarField>
+ const volScalarField* alphatPtr =
+ phase2.mesh().findObject<volScalarField>
(
- "alphat." + phase2.name()
- )
- )
+ "alphat." + phase2.name()
+ );
+
+ if (alphatPtr)
{
- const volScalarField& alphat =
- phase2.mesh().lookupObject<volScalarField>
- (
- "alphat." + phase2.name()
- );
+ const volScalarField& alphat = *alphatPtr;
const fvPatchList& patches = this->mesh().boundary();
forAll(patches, patchi)
diff --git a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.C b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.C
index 21508c38bf1aa64995b1c200477355f5de771de3..90bdee1e34e0a5e330c2533b4985f770c6e63c12 100644
--- a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.C
+++ b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.C
@@ -52,10 +52,8 @@ Foam::functionObjects::regionFunctionObject::whichSubRegistry
{
return obr.lookupObject<objectRegistry>(subName);
}
- else
- {
- return obr;
- }
+
+ return obr;
}
@@ -71,22 +69,19 @@ bool Foam::functionObjects::regionFunctionObject::writeObject
const word& fieldName
)
{
- const regIOobject* objPtr =
- this->lookupObjectPtr<regIOobject>(fieldName);
+ const regIOobject* obj = this->findObject<regIOobject>(fieldName);
- if (objPtr)
+ if (obj)
{
Log << " functionObjects::" << type() << " " << name()
- << " writing field: " << objPtr->name() << endl;
+ << " writing field: " << obj->name() << endl;
- objPtr->write();
+ obj->write();
return true;
}
- else
- {
- return false;
- }
+
+ return false;
}
@@ -95,12 +90,14 @@ bool Foam::functionObjects::regionFunctionObject::clearObject
const word& fieldName
)
{
- regIOobject* objPtr = lookupObjectRefPtr<regIOobject>(fieldName);
- if (objPtr)
+ // Same as getObjectPtr, since the object is already non-const
+ regIOobject* obj = this->findObject<regIOobject>(fieldName);
+
+ if (obj)
{
- if (objPtr->ownedByRegistry())
+ if (obj->ownedByRegistry())
{
- return objPtr->checkOut();
+ return obj->checkOut();
}
else
{
diff --git a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
index 8ce0f95b864b856eb1f23e5ffeac878f05d312e8..f8a83ee5bf5e91819621aac50ce27c60590ad182 100644
--- a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2016-2017 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2016-2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -94,25 +94,42 @@ protected:
template<class ObjectType>
bool foundObject(const word& fieldName) const;
- //- Lookup and return object (eg, a field) from the (sub) objectRegistry
+ //- Return const pointer to the object (eg, a field) in the
+ //- (sub) objectRegistry.
+ //
+ // \return nullptr if the object was not found or had incorrect type.
template<class ObjectType>
- const ObjectType& lookupObject(const word& fieldName) const;
+ const ObjectType* cfindObject(const word& fieldName) const;
- //- Lookup and return object (eg, a field) from the (sub) objectRegistry
+ //- Return const pointer to the object (eg, a field) in the
+ //- (sub) objectRegistry.
+ //
+ // \return nullptr if the object was not found or had incorrect type.
template<class ObjectType>
- ObjectType& lookupObjectRef(const word& fieldName) const;
+ const ObjectType* findObject(const word& fieldName) const;
- //- Lookup and return pointer to the object,
- // otherwise nullptr if the object was not found,
- // or had the incorrect type.
+ //- Return non-const pointer to the object of the given Type,
+ //- (sub) objectRegistry.
+ //
+ // \return nullptr if the object was not found or had incorrect type.
+ template<class ObjectType>
+ ObjectType* findObject(const word& fieldName);
+
+ //- Return non-const pointer to the object of the given Type,
+ //- using a const-cast to have it behave like a mutable.
+ // Exercise caution when using.
+ //
+ // \return nullptr if the object was not found or had incorrect type.
+ template<class ObjectType>
+ ObjectType* getObjectPtr(const word& fieldName) const;
+
+ //- Lookup and return object (eg, a field) from the (sub) objectRegistry
template<class ObjectType>
- const ObjectType* lookupObjectPtr(const word& fieldName) const;
+ const ObjectType& lookupObject(const word& fieldName) const;
- //- Lookup and return non-const pointer to the object,
- // otherwise nullptr if the object was not found,
- // or had the incorrect type.
+ //- Lookup and return object (eg, a field) from the (sub) objectRegistry
template<class ObjectType>
- ObjectType* lookupObjectRefPtr(const word& fieldName) const;
+ ObjectType& lookupObjectRef(const word& fieldName) const;
//- Store the field in the (sub) objectRegistry under the given name
// Note: sets the fieldName to tfield().name() if not already set
@@ -177,6 +194,25 @@ public:
//- Read optional controls
virtual bool read(const dictionary& dict);
+
+
+ // Housekeeping
+
+ //- Same as findObject
+ // \deprecated use findObject (OCT-2018)
+ template<class ObjectType>
+ const ObjectType* lookupObjectPtr(const word& fieldName) const
+ {
+ return this->cfindObject<ObjectType>(fieldName);
+ }
+
+ //- Same as getObjectPtr
+ // \deprecated use getObjectPtr (OCT-2018)
+ template<class ObjectType>
+ ObjectType* lookupObjectRefPtr(const word& fieldName) const
+ {
+ return this->getObjectPtr<ObjectType>(fieldName);
+ }
};
diff --git a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObjectTemplates.C b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObjectTemplates.C
index a18bff7070c76e3cac602392969e2c70045f55d2..fee651ea89cd34cfd9d8fad2655a27964f5f695e 100644
--- a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObjectTemplates.C
+++ b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObjectTemplates.C
@@ -3,7 +3,7 @@
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
\\ / A nd | Copyright (C) 2016 OpenFOAM Foundation
- \\/ M anipulation | Copyright (C) 2016 OpenCFD Ltd.
+ \\/ M anipulation | Copyright (C) 2016-2018 OpenCFD Ltd.
-------------------------------------------------------------------------------
License
This file is part of OpenFOAM.
@@ -39,42 +39,63 @@ bool Foam::functionObjects::regionFunctionObject::foundObject
template<class ObjectType>
-const ObjectType& Foam::functionObjects::regionFunctionObject::lookupObject
+const ObjectType* Foam::functionObjects::regionFunctionObject::cfindObject
(
const word& fieldName
) const
{
- return obr().lookupObject<ObjectType>(fieldName);
+ return obr().cfindObject<ObjectType>(fieldName);
}
template<class ObjectType>
-ObjectType& Foam::functionObjects::regionFunctionObject::lookupObjectRef
+const ObjectType* Foam::functionObjects::regionFunctionObject::findObject
(
const word& fieldName
) const
{
- return obr().lookupObjectRef<ObjectType>(fieldName);
+ return obr().findObject<ObjectType>(fieldName);
+}
+
+
+template<class ObjectType>
+ObjectType* Foam::functionObjects::regionFunctionObject::findObject
+(
+ const word& fieldName
+)
+{
+ // Need getObjectPtr to bypass const access on the objectRegistry
+ return obr().getObjectPtr<ObjectType>(fieldName);
}
template<class ObjectType>
-const ObjectType* Foam::functionObjects::regionFunctionObject::lookupObjectPtr
+ObjectType* Foam::functionObjects::regionFunctionObject::getObjectPtr
(
const word& fieldName
) const
{
- return obr().lookupObjectPtr<ObjectType>(fieldName);
+ return obr().getObjectPtr<ObjectType>(fieldName);
}
template<class ObjectType>
-ObjectType* Foam::functionObjects::regionFunctionObject::lookupObjectRefPtr
+const ObjectType& Foam::functionObjects::regionFunctionObject::lookupObject
+(
+ const word& fieldName
+) const
+{
+ return obr().lookupObject<ObjectType>(fieldName);
+}
+
+
+template<class ObjectType>
+ObjectType& Foam::functionObjects::regionFunctionObject::lookupObjectRef
(
const word& fieldName
) const
{
- return obr().lookupObjectRefPtr<ObjectType>(fieldName);
+ return obr().lookupObjectRef<ObjectType>(fieldName);
}
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index c4a021308f7e3799dce28059e8c2a1ece8055e57..042eef2448fe98fb9363f555b254116e093d80db 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -231,8 +231,9 @@ public:
// Lookup
//- Lookup and return a const sub-objectRegistry.
- // Optionally create it if it does not exist.
- // If recursive, search parent registries.
+ //
+ // \param forceCreate create it if it does not exist.
+ // \param recursive search parent registries.
const objectRegistry& subRegistry
(
const word& name,
@@ -250,7 +251,8 @@ public:
HashTable<Type*> lookupClass(const bool strict = false);
//- Is the named Type found?
- // If recursive, search parent registries.
+ //
+ // \param recursive search parent registries
template<class Type>
bool foundObject
(
@@ -258,43 +260,73 @@ public:
const bool recursive = false
) const;
- //- Lookup and return the object of the given Type.
- // If recursive, search parent registries.
+ //- Find const pointer to the object of the given Type.
+ //
+ // \param recursive search parent registries
+ //
+ // \return nullptr if the object was not found or had incorrect type.
template<class Type>
- const Type& lookupObject
+ const Type* cfindObject
(
const word& name,
const bool recursive = false
) const;
- //- Lookup and return the object of the given Type.
- // If recursive, search parent registries.
+ //- Return const pointer to the object of the given Type.
+ //
+ // \param recursive search parent registries
+ //
+ // \return nullptr if the object was not found or had incorrect type.
template<class Type>
- Type& lookupObjectRef
+ const Type* findObject
(
const word& name,
const bool recursive = false
) const;
- //- Lookup and return pointer to the object of the given Type,
- // otherwise nullptr if the object was not found,
- // or had the incorrect type.
- // If recursive, search parent registries.
+ //- Return non-const pointer to the object of the given Type.
+ //
+ // \param recursive search parent registries
+ //
+ // \return nullptr if the object was not found or had incorrect type.
template<class Type>
- const Type* lookupObjectPtr
+ Type* findObject
+ (
+ const word& name,
+ const bool recursive = false
+ );
+
+ //- Return non-const pointer to the object of the given Type,
+ //- using a const-cast to have it behave like a mutable.
+ // Exercise caution when using.
+ //
+ // \param recursive search parent registries.
+ //
+ // \return nullptr if the object was not found or had incorrect type.
+ template<class Type>
+ Type* getObjectPtr
(
const word& name,
const bool recursive = false
) const;
+ //- Lookup and return const reference to the object
+ //- of the given Type. Fatal if not found or the wrong type.
+ //
+ // \param recursive search parent registries.
+ template<class Type>
+ const Type& lookupObject
+ (
+ const word& name,
+ const bool recursive = false
+ ) const;
- //- Lookup and return non-const pointer to the object
- // of the given Type,
- // otherwise nullptr if the object was not found,
- // or had the incorrect type.
- // If recursive, search parent registries.
+ //- Lookup and return non-const reference to the object
+ //- of the given Type. Fatal if not found or the wrong type.
+ //
+ // \param recursive search parent registries.
template<class Type>
- Type* lookupObjectRefPtr
+ Type& lookupObjectRef
(
const word& name,
const bool recursive = false
@@ -349,6 +381,34 @@ public:
IOstream::compressionType cmp,
const bool valid
) const;
+
+
+ // Housekeeping
+
+ //- Same as findObject
+ // \deprecated use findObject (OCT-2018)
+ template<class Type>
+ const Type* lookupObjectPtr
+ (
+ const word& name,
+ bool recursive = false
+ ) const
+ {
+ return this->cfindObject<Type>(name, recursive);
+ }
+
+ //- Same as getObjectPtr
+ //
+ // \deprecated use getObjectPtr (OCT-2018)
+ template<class Type>
+ Type* lookupObjectRefPtr
+ (
+ const word& name,
+ bool recursive = false
+ ) const
+ {
+ return this->getObjectPtr<Type>(name, recursive);
+ }
};
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
index 551f4055be5e5982bb78933c106edc894157e760..6cc9eba56a36f920675709e8532a960cd6a26ec2 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
@@ -156,7 +156,7 @@ Foam::HashTable<const Type*> Foam::objectRegistry::lookupClass
forAllConstIters(*this, iter)
{
- if (strict ? isType<Type>(*iter()) : isA<Type>(*iter()))
+ if (strict ? isType<Type>(*iter()) : bool(isA<Type>(*iter())))
{
objectsOfClass.insert
(
@@ -180,7 +180,7 @@ Foam::HashTable<Type*> Foam::objectRegistry::lookupClass
forAllIters(*this, iter)
{
- if (strict ? isType<Type>(*iter()) : isA<Type>(*iter()))
+ if (strict ? isType<Type>(*iter()) : bool(isA<Type>(*iter())))
{
objectsOfClass.insert
(
@@ -201,25 +201,18 @@ bool Foam::objectRegistry::foundObject
const bool recursive
) const
{
- const Type* ptr = this->lookupObjectPtr<Type>(name, recursive);
-
- if (ptr)
- {
- return true;
- }
-
- return false;
+ return this->cfindObject<Type>(name, recursive);
}
template<class Type>
-const Type& Foam::objectRegistry::lookupObject
+const Type* Foam::objectRegistry::cfindObject
(
const word& name,
const bool recursive
) const
{
- const_iterator iter = find(name);
+ const_iterator iter = cfind(name);
if (iter.found())
{
@@ -227,57 +220,63 @@ const Type& Foam::objectRegistry::lookupObject
if (ptr)
{
- return *ptr;
+ return ptr;
}
-
- FatalErrorInFunction
- << nl
- << " lookup of " << name << " from objectRegistry "
- << this->name()
- << " successful\n but it is not a " << Type::typeName
- << ", it is a " << iter()->type()
- << abort(FatalError);
}
else if (recursive && this->parentNotTime())
{
- return parent_.lookupObject<Type>(name, recursive);
+ return parent_.cfindObject<Type>(name, recursive);
}
- FatalErrorInFunction
- << nl
- << " request for " << Type::typeName
- << " " << name << " from objectRegistry " << this->name()
- << " failed\n available objects of type " << Type::typeName
- << " are" << nl
- << names<Type>()
- << abort(FatalError);
+ return nullptr;
+}
- return NullObjectRef<Type>();
+
+template<class Type>
+const Type* Foam::objectRegistry::findObject
+(
+ const word& name,
+ const bool recursive
+) const
+{
+ return this->cfindObject<Type>(name, recursive);
}
template<class Type>
-Type& Foam::objectRegistry::lookupObjectRef
+Type* Foam::objectRegistry::findObject
+(
+ const word& name,
+ const bool recursive
+)
+{
+ const Type* ptr = this->cfindObject<Type>(name, recursive);
+
+ return const_cast<Type*>(ptr);
+}
+
+
+template<class Type>
+Type* Foam::objectRegistry::getObjectPtr
(
const word& name,
const bool recursive
) const
{
- const Type& ref = this->lookupObject<Type>(name, recursive);
- // The above will already fail if things didn't work
+ const Type* ptr = this->cfindObject<Type>(name, recursive);
- return const_cast<Type&>(ref);
+ return const_cast<Type*>(ptr);
}
template<class Type>
-const Type* Foam::objectRegistry::lookupObjectPtr
+const Type& Foam::objectRegistry::lookupObject
(
const word& name,
const bool recursive
) const
{
- const_iterator iter = find(name);
+ const_iterator iter = cfind(name);
if (iter.found())
{
@@ -285,28 +284,46 @@ const Type* Foam::objectRegistry::lookupObjectPtr
if (ptr)
{
- return ptr;
+ return *ptr;
}
+
+ FatalErrorInFunction
+ << nl
+ << " lookup of " << name << " from objectRegistry "
+ << this->name()
+ << " successful\n but it is not a " << Type::typeName
+ << ", it is a " << iter()->type()
+ << abort(FatalError);
}
else if (recursive && this->parentNotTime())
{
- return parent_.lookupObjectPtr<Type>(name, recursive);
+ return parent_.lookupObject<Type>(name, recursive);
}
- return nullptr;
+ FatalErrorInFunction
+ << nl
+ << " request for " << Type::typeName
+ << " " << name << " from objectRegistry " << this->name()
+ << " failed\n available objects of type " << Type::typeName
+ << " are" << nl
+ << names<Type>()
+ << abort(FatalError);
+
+ return NullObjectRef<Type>();
}
template<class Type>
-Type* Foam::objectRegistry::lookupObjectRefPtr
+Type& Foam::objectRegistry::lookupObjectRef
(
const word& name,
const bool recursive
) const
{
- const Type* ptr = this->lookupObjectPtr<Type>(name, recursive);
+ const Type& ref = this->lookupObject<Type>(name, recursive);
+ // The above will already fail if things didn't work
- return const_cast<Type*>(ptr);
+ return const_cast<Type&>(ref);
}
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
index e7a7beb6b4443248d392daf6094231b1223b7799..63f51c4d31b5dcbf88719225c90a412bf725f541 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.C
@@ -338,12 +338,12 @@ void Foam::lduMatrix::setResidualField
}
IOField<scalar>* residualPtr =
- lduMesh_.thisDb().lookupObjectRefPtr<IOField<scalar>>(lookupName);
+ lduMesh_.thisDb().getObjectPtr<IOField<scalar>>(lookupName);
if (residualPtr)
{
const IOdictionary* dataPtr =
- lduMesh_.thisDb().lookupObjectPtr<IOdictionary>("data");
+ lduMesh_.thisDb().findObject<IOdictionary>("data");
if (dataPtr)
{
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
index 0e4f3e24a33e014a5063d003c4a91a0139ed4652..a870da6462d11f760d7ff3868d4785529f09b9f9 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/outletMachNumberPressure/outletMachNumberPressureFvPatchScalarField.C
@@ -165,7 +165,7 @@ void Foam::outletMachNumberPressureFvPatchScalarField::updateCoeffs()
}
const fluidThermo* thermoPtr =
- db().lookupObjectPtr<fluidThermo>(basicThermo::dictName);
+ db().findObject<fluidThermo>(basicThermo::dictName);
const volVectorField& U = db().lookupObject<volVectorField>(UName_);
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
index 2a761d2a49f47568b4e5875e3ed095bb0404efc0..2fa1e33b8161e8b9244c4500136795e06a560504 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/turbulentTemperatureRadCoupledMixed/turbulentTemperatureRadCoupledMixedFvPatchScalarField.C
@@ -240,7 +240,7 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
{
const basicThermo* thermo =
- nbrMesh.lookupObjectPtr<basicThermo>(basicThermo::dictName);
+ nbrMesh.findObject<basicThermo>(basicThermo::dictName);
if (thermo)
{
@@ -269,7 +269,7 @@ void turbulentTemperatureRadCoupledMixedFvPatchScalarField::updateCoeffs()
// Local inertia therm
{
const basicThermo* thermo =
- mesh.lookupObjectPtr<basicThermo>(basicThermo::dictName);
+ mesh.findObject<basicThermo>(basicThermo::dictName);
if (thermo)
{
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
index c50aab9cb4e14639b5cb2e08a02aefeffdb7d5b6..f5ccaf54f0de8d03705b47fa63cfb13c19c929a8 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -448,11 +448,7 @@ void Foam::epsilonWallFunctionFvPatchScalarField::updateCoeffs()
typedef DimensionedField<scalar, volMesh> FieldType;
- FieldType& G =
- const_cast<FieldType&>
- (
- db().lookupObject<FieldType>(turbModel.GName())
- );
+ FieldType& G = db().lookupObjectRef<FieldType>(turbModel.GName());
FieldType& epsilon = const_cast<FieldType&>(internalField());
diff --git a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C
index a25277ed9ccba7204ddbe70a175aadecd4daccb4..440d1707282f7c4e62e073c5775a688da851c23f 100644
--- a/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C
+++ b/src/dynamicFvMesh/dynamicInkJetFvMesh/dynamicInkJetFvMesh.C
@@ -117,9 +117,7 @@ bool Foam::dynamicInkJetFvMesh::update()
fvMesh::movePoints(newPoints);
- volVectorField& U =
- const_cast<volVectorField&>(lookupObject<volVectorField>("U"));
- U.correctBoundaryConditions();
+ lookupObjectRef<volVectorField>("U").correctBoundaryConditions();
return true;
}
diff --git a/src/dynamicFvMesh/dynamicMotionSolverListFvMesh/dynamicMotionSolverListFvMesh.C b/src/dynamicFvMesh/dynamicMotionSolverListFvMesh/dynamicMotionSolverListFvMesh.C
index 2b75caa5fce6edc6d4cbb3288c62208151f1e3ee..5874a32a1736c1ca5a102e224a9d79b57d369451 100644
--- a/src/dynamicFvMesh/dynamicMotionSolverListFvMesh/dynamicMotionSolverListFvMesh.C
+++ b/src/dynamicFvMesh/dynamicMotionSolverListFvMesh/dynamicMotionSolverListFvMesh.C
@@ -91,10 +91,11 @@ bool Foam::dynamicMotionSolverListFvMesh::update()
fvMesh::movePoints(points() + disp);
- if (foundObject<volVectorField>("U"))
+ volVectorField* Uptr = getObjectPtr<volVectorField>("U");
+
+ if (Uptr)
{
- const_cast<volVectorField&>(lookupObject<volVectorField>("U"))
- .correctBoundaryConditions();
+ Uptr->correctBoundaryConditions();
}
}
diff --git a/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C b/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C
index 1309e0e99ed89198fd3278ef3aa0180441b37cb8..2f93ca2fb29cf6cb10471b4317b30fbd421c55fa 100644
--- a/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C
+++ b/src/dynamicFvMesh/dynamicMultiMotionSolverFvMesh/dynamicMultiMotionSolverFvMesh.C
@@ -182,8 +182,7 @@ bool Foam::dynamicMultiMotionSolverFvMesh::update()
if (foundObject<volVectorField>("U"))
{
- const_cast<volVectorField&>(lookupObject<volVectorField>("U"))
- .correctBoundaryConditions();
+ lookupObjectRef<volVectorField>("U").correctBoundaryConditions();
}
else if (!hasWarned)
{
diff --git a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C
index 583ddde3242fc288d2ce4345499b82184dae77d3..7a9100e3cc9b8a4e70b16bfea9cfe496337fa39a 100644
--- a/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C
+++ b/src/engine/engineMesh/fvMotionSolverEngineMesh/fvMotionSolverEngineMesh.C
@@ -91,8 +91,7 @@ void Foam::fvMotionSolverEngineMesh::move()
if (engineDB_.foundObject<surfaceScalarField>("phi"))
{
surfaceScalarField& phi =
- const_cast<surfaceScalarField&>
- (engineDB_.lookupObject<surfaceScalarField>("phi"));
+ engineDB_.lookupObjectRef<surfaceScalarField>("phi");
const volScalarField& rho =
engineDB_.lookupObject<volScalarField>("rho");
diff --git a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
index 390994257ca569115547876235f58d2d49d20ffa..cd09b47d42ef8eee732b46fb03f453a6fca20746 100644
--- a/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
+++ b/src/engine/engineMesh/layeredEngineMesh/layeredEngineMesh.C
@@ -86,8 +86,7 @@ void Foam::layeredEngineMesh::move()
if (engineDB_.foundObject<surfaceScalarField>("phi"))
{
surfaceScalarField& phi =
- const_cast<surfaceScalarField&>
- (engineDB_.lookupObject<surfaceScalarField>("phi"));
+ engineDB_.lookupObjectRef<surfaceScalarField>("phi");
const volScalarField& rho =
engineDB_.lookupObject<volScalarField>("rho");
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
index 0db2d9b5205651403210ecfc3b0b47ef916d457a..246e4b51850acaef029b767ce9d3d18e647f790d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressurePIDControlInletVelocity/pressurePIDControlInletVelocityFvPatchVectorField.C
@@ -37,27 +37,19 @@ License
const Foam::surfaceScalarField&
Foam::pressurePIDControlInletVelocityFvPatchVectorField::facePressure() const
{
- const volScalarField& p(db().lookupObject<volScalarField>(pName_));
-
const word pfName(pName_ + "f");
- if (!db().foundObject<surfaceScalarField>(pfName))
- {
- surfaceScalarField* pfPtr
- (
- new surfaceScalarField(pfName, linearInterpolate(p))
- );
+ const volScalarField& p = db().lookupObject<volScalarField>(pName_);
+
+ surfaceScalarField* pfPtr = db().getObjectPtr<surfaceScalarField>(pfName);
+ if (!pfPtr)
+ {
+ pfPtr = new surfaceScalarField(pfName, linearInterpolate(p));
pfPtr->store();
}
- surfaceScalarField& pf
- (
- const_cast<surfaceScalarField&>
- (
- db().lookupObject<surfaceScalarField>(pfName)
- )
- );
+ surfaceScalarField& pf = *pfPtr;
if (!pf.upToDate(p))
{
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
index 440c1e285955b9dad2f7bb24c74888ef8311feb5..65985dab41cba7d5905ddb9badef507e8419fcfb 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveSurfacePressure/waveSurfacePressureFvPatchScalarField.C
@@ -144,11 +144,7 @@ void Foam::waveSurfacePressureFvPatchScalarField::updateCoeffs()
const scalar dt = db().time().deltaTValue();
// retrieve non-const access to zeta field from the database
- volVectorField& zeta =
- const_cast<volVectorField&>
- (
- db().lookupObject<volVectorField>(zetaName_)
- );
+ volVectorField& zeta = db().lookupObjectRef<volVectorField>(zetaName_);
vectorField& zetap = zeta.boundaryFieldRef()[patchi];
// lookup d/dt scheme from database for zeta
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index 6d6f2061b593464b8017491e0a56d3284e2a4fdf..8331fad013ca01b3c7bac9d99ea32bbe99487493 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
@@ -171,10 +171,7 @@ CrankNicolsonDdtScheme<Type>::ddt0_
DDt0Field<GeoField>& ddt0 = static_cast<DDt0Field<GeoField>&>
(
- const_cast<GeoField&>
- (
- mesh().objectRegistry::template lookupObject<GeoField>(name)
- )
+ mesh().objectRegistry::template lookupObjectRef<GeoField>(name)
);
return ddt0;
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
index 414fe7b8ce6506506d8851b0915e8ecac255f22d..cb7207785ce5e65d6f0c2517e80e231348dc35ad 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
+++ b/src/finiteVolume/finiteVolume/gradSchemes/gradScheme/gradScheme.C
@@ -103,10 +103,11 @@ Foam::fv::gradScheme<Type>::grad
}
solution::cachePrintMessage("Retrieving", name, vsf);
- GradFieldType& gGrad = const_cast<GradFieldType&>
- (
- mesh().objectRegistry::template lookupObject<GradFieldType>(name)
- );
+ GradFieldType& gGrad =
+ mesh().objectRegistry::template lookupObjectRef<GradFieldType>
+ (
+ name
+ );
if (gGrad.upToDate(vsf))
{
@@ -123,13 +124,11 @@ Foam::fv::gradScheme<Type>::grad
solution::cachePrintMessage("Storing", name, vsf);
regIOobject::store(tgGrad.ptr());
- GradFieldType& gGrad = const_cast<GradFieldType&>
- (
- mesh().objectRegistry::template lookupObject<GradFieldType>
+ GradFieldType& gGrad =
+ mesh().objectRegistry::template lookupObjectRef<GradFieldType>
(
name
- )
- );
+ );
return gGrad;
}
@@ -138,13 +137,11 @@ Foam::fv::gradScheme<Type>::grad
{
if (mesh().objectRegistry::template foundObject<GradFieldType>(name))
{
- GradFieldType& gGrad = const_cast<GradFieldType&>
- (
- mesh().objectRegistry::template lookupObject<GradFieldType>
+ GradFieldType& gGrad =
+ mesh().objectRegistry::template lookupObjectRef<GradFieldType>
(
name
- )
- );
+ );
if (gGrad.ownedByRegistry())
{
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
index 9c19472a1fdc2242df5da8ae0cf6a264c0ac1f3c..22fa5d698c6aa5b34a46d164a30c40219ff2bf09 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/LimitedScheme/LimitedScheme.C
@@ -171,13 +171,7 @@ Foam::LimitedScheme<Type, Limiter, LimitFunc>::limiter
}
surfaceScalarField& limiterField =
- const_cast<surfaceScalarField&>
- (
- mesh.lookupObject<surfaceScalarField>
- (
- limiterFieldName
- )
- );
+ mesh.lookupObjectRef<surfaceScalarField>(limiterFieldName);
calcLimiter(phi, limiterField);
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
index 3a2c6e12a62a5ff2b031cffea3f72562e1dcd686..0139613742f7e3a0e7a4871e63c9a6bd77c9dd32 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
@@ -372,20 +372,17 @@ Foam::volPointInterpolation::interpolate
const pointMesh& pm = pointMesh::New(vf.mesh());
// Construct tmp<pointField>
- tmp<GeometricField<Type, pointPatchField, pointMesh>> tpf
+ auto tpf = tmp<GeometricField<Type, pointPatchField, pointMesh>>::New
(
- new GeometricField<Type, pointPatchField, pointMesh>
+ IOobject
(
- IOobject
- (
- "volPointInterpolate(" + vf.name() + ')',
- vf.instance(),
- pm.thisDb()
- ),
- pm,
- vf.dimensions(),
- patchFieldTypes
- )
+ "volPointInterpolate(" + vf.name() + ')',
+ vf.instance(),
+ pm.thisDb()
+ ),
+ pm,
+ vf.dimensions(),
+ patchFieldTypes
);
interpolateInternalField(vf, tpf.ref());
@@ -427,73 +424,60 @@ Foam::volPointInterpolation::interpolate
const pointMesh& pm = pointMesh::New(vf.mesh());
const objectRegistry& db = pm.thisDb();
+ PointFieldType* pfPtr =
+ db.objectRegistry::template getObjectPtr<PointFieldType>(name);
+
if (!cache || vf.mesh().changing())
{
// Delete any old occurrences to avoid double registration
- if (db.objectRegistry::template foundObject<PointFieldType>(name))
+ if (pfPtr && pfPtr->ownedByRegistry())
{
- PointFieldType& pf = const_cast<PointFieldType&>
- (
- db.objectRegistry::template lookupObject<PointFieldType>(name)
- );
-
- if (pf.ownedByRegistry())
- {
- solution::cachePrintMessage("Deleting", name, vf);
- pf.release();
- delete &pf;
- }
+ solution::cachePrintMessage("Deleting", name, vf);
+ pfPtr->release();
+ delete pfPtr;
}
-
- tmp<GeometricField<Type, pointPatchField, pointMesh>> tpf
+ auto tpf = tmp<GeometricField<Type, pointPatchField, pointMesh>>::New
(
- new GeometricField<Type, pointPatchField, pointMesh>
+ IOobject
(
- IOobject
- (
- name,
- vf.instance(),
- pm.thisDb()
- ),
- pm,
- vf.dimensions()
- )
+ name,
+ vf.instance(),
+ pm.thisDb()
+ ),
+ pm,
+ vf.dimensions()
);
interpolate(vf, tpf.ref());
return tpf;
}
+
+
+ if (!pfPtr)
+ {
+ solution::cachePrintMessage("Calculating and caching", name, vf);
+
+ pfPtr = interpolate(vf, name, false).ptr();
+ regIOobject::store(pfPtr);
+ }
else
{
- if (!db.objectRegistry::template foundObject<PointFieldType>(name))
+ PointFieldType& pf = *pfPtr;
+
+ if (pf.upToDate(vf)) //TBD: , vf.mesh().points()))
{
- solution::cachePrintMessage("Calculating and caching", name, vf);
- tmp<PointFieldType> tpf = interpolate(vf, name, false);
- PointFieldType* pfPtr = tpf.ptr();
- regIOobject::store(pfPtr);
- return *pfPtr;
+ solution::cachePrintMessage("Reusing", name, vf);
}
else
{
- PointFieldType& pf = const_cast<PointFieldType&>
- (
- db.objectRegistry::template lookupObject<PointFieldType>(name)
- );
-
- if (pf.upToDate(vf)) //TBD: , vf.mesh().points()))
- {
- solution::cachePrintMessage("Reusing", name, vf);
- }
- else
- {
- solution::cachePrintMessage("Updating", name, vf);
- interpolate(vf, pf);
- }
- return pf;
+ solution::cachePrintMessage("Updating", name, vf);
+ interpolate(vf, pf);
}
}
+
+ return *pfPtr;
}
@@ -537,74 +521,61 @@ Foam::volPointInterpolation::interpolate
const pointMesh& pm = pointMesh::New(vf.mesh());
const objectRegistry& db = pm.thisDb();
+
+ PointFieldType* pfPtr =
+ db.objectRegistry::template getObjectPtr<PointFieldType>(name);
+
if (!cache || vf.mesh().changing())
{
// Delete any old occurrences to avoid double registration
- if (db.objectRegistry::template foundObject<PointFieldType>(name))
+ if (pfPtr && pfPtr->ownedByRegistry())
{
- PointFieldType& pf = const_cast<PointFieldType&>
- (
- db.objectRegistry::template lookupObject<PointFieldType>(name)
- );
-
- if (pf.ownedByRegistry())
- {
- solution::cachePrintMessage("Deleting", name, vf);
- pf.release();
- delete &pf;
- }
+ solution::cachePrintMessage("Deleting", name, vf);
+ pfPtr->release();
+ delete pfPtr;
}
-
- tmp<DimensionedField<Type, pointMesh>> tpf
+ auto tpf = tmp<DimensionedField<Type, pointMesh>>::New
(
- new DimensionedField<Type, pointMesh>
+ IOobject
(
- IOobject
- (
- name,
- vf.instance(),
- pm.thisDb()
- ),
- pm,
- vf.dimensions()
- )
+ name,
+ vf.instance(),
+ pm.thisDb()
+ ),
+ pm,
+ vf.dimensions()
);
interpolateDimensionedInternalField(vf, tpf.ref());
return tpf;
}
+
+
+ if (!pfPtr)
+ {
+ solution::cachePrintMessage("Calculating and caching", name, vf);
+ pfPtr = interpolate(vf, name, false).ptr();
+
+ regIOobject::store(pfPtr);
+ }
else
{
- if (!db.objectRegistry::template foundObject<PointFieldType>(name))
+ PointFieldType& pf = *pfPtr;
+
+ if (pf.upToDate(vf)) //TBD: , vf.mesh().points()))
{
- solution::cachePrintMessage("Calculating and caching", name, vf);
- tmp<PointFieldType> tpf = interpolate(vf, name, false);
- PointFieldType* pfPtr = tpf.ptr();
- regIOobject::store(pfPtr);
- return *pfPtr;
+ solution::cachePrintMessage("Reusing", name, vf);
}
else
{
- PointFieldType& pf = const_cast<PointFieldType&>
- (
- db.objectRegistry::template lookupObject<PointFieldType>(name)
- );
-
- if (pf.upToDate(vf)) //TBD: , vf.mesh().points()))
- {
- solution::cachePrintMessage("Reusing", name, vf);
- }
- else
- {
- solution::cachePrintMessage("Updating", name, vf);
- interpolateDimensionedInternalField(vf, pf);
- }
-
- return pf;
+ solution::cachePrintMessage("Updating", name, vf);
+ interpolateDimensionedInternalField(vf, pf);
}
}
+
+ return *pfPtr;
}
diff --git a/src/functionObjects/field/externalCoupled/externalCoupled.C b/src/functionObjects/field/externalCoupled/externalCoupled.C
index 91450209a95208d7a09d5714c7aa6ab2fffa75e4..0c49fd20ef8de876070c9e22a1cd5f62ca5d2df4 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupled.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupled.C
@@ -415,7 +415,7 @@ void Foam::functionObjects::externalCoupled::initCoupling()
UPtrList<const fvMesh> meshes(regionNames.size());
forAll(regionNames, regi)
{
- meshes.set(regi, time_.lookupObjectPtr<fvMesh>(regionNames[regi]));
+ meshes.set(regi, time_.findObject<fvMesh>(regionNames[regi]));
}
const labelList& groups = regionToGroups_[compName];
@@ -692,7 +692,7 @@ void Foam::functionObjects::externalCoupled::readDataMaster()
UPtrList<const fvMesh> meshes(regionNames.size());
forAll(regionNames, regi)
{
- meshes.set(regi, time_.lookupObjectPtr<fvMesh>(regionNames[regi]));
+ meshes.set(regi, time_.findObject<fvMesh>(regionNames[regi]));
}
const labelList& groups = regionToGroups_[compName];
@@ -736,7 +736,7 @@ void Foam::functionObjects::externalCoupled::writeDataMaster() const
UPtrList<const fvMesh> meshes(regionNames.size());
forAll(regionNames, regi)
{
- meshes.set(regi, time_.lookupObjectPtr<fvMesh>(regionNames[regi]));
+ meshes.set(regi, time_.findObject<fvMesh>(regionNames[regi]));
}
const labelList& groups = regionToGroups_[compName];
diff --git a/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C b/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C
index cd78f475f9f1331ccd6ff3f1c9e957657f3ee31b..6b2f8ddc71e05d6a387b34846f6bfb02e5cc1030 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupledTemplates.C
@@ -82,8 +82,7 @@ bool Foam::functionObjects::externalCoupled::readData
label nFound = 0;
for (const fvMesh& mesh : meshes)
{
- const volFieldType* vfptr =
- mesh.lookupObjectPtr<volFieldType>(fieldName);
+ const volFieldType* vfptr = mesh.findObject<volFieldType>(fieldName);
if (!vfptr)
{
@@ -358,8 +357,7 @@ bool Foam::functionObjects::externalCoupled::writeData
for (const fvMesh& mesh : meshes)
{
- const volFieldType* vfptr =
- mesh.lookupObjectPtr<volFieldType>(fieldName);
+ const volFieldType* vfptr = mesh.findObject<volFieldType>(fieldName);
if (!vfptr)
{
diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemTemplates.C b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemTemplates.C
index f7a752b993d1dfcc87e2106a12bebc61f42c31ed..354b7e9440ee9896257ba5f21de50371a3a92882 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemTemplates.C
+++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemTemplates.C
@@ -37,7 +37,7 @@ bool Foam::functionObjects::fieldAverageItem::calculateMeanField
return false;
}
- const Type* baseFieldPtr = obr.lookupObjectPtr<Type>(fieldName_);
+ const Type* baseFieldPtr = obr.findObject<Type>(fieldName_);
if (!baseFieldPtr)
{
@@ -122,7 +122,7 @@ bool Foam::functionObjects::fieldAverageItem::calculateMeanField
{
const word& fieldName = nameIter();
const scalar dt = timeIter();
- const Type* w = obr.lookupObjectPtr<Type>(fieldName);
+ const Type* w = obr.findObject<Type>(fieldName);
meanField += dt*(*w);
@@ -173,7 +173,7 @@ bool Foam::functionObjects::fieldAverageItem::calculatePrime2MeanField
return false;
}
- const Type1* baseFieldPtr = obr.lookupObjectPtr<Type1>(fieldName_);
+ const Type1* baseFieldPtr = obr.findObject<Type1>(fieldName_);
if (!baseFieldPtr)
{
@@ -258,7 +258,7 @@ bool Foam::functionObjects::fieldAverageItem::calculatePrime2MeanField
{
const word& fieldName = nameIter();
const scalar dt = timeIter();
- const Type1* w = obr.lookupObjectPtr<Type1>(fieldName);
+ const Type1* w = obr.findObject<Type1>(fieldName);
prime2MeanField += dt*(sqr((*w) - meanField));
diff --git a/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C b/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C
index 5f34c9de2a0d7eef98ea1a5d0100527e45823da0..c994a764e55b39baf84cfaa171183d93b3bfec24 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C
+++ b/src/functionObjects/field/fieldAverage/fieldAverageTemplates.C
@@ -119,7 +119,7 @@ void Foam::functionObjects::fieldAverage::restoreWindowFieldsType
const word& fieldName = item.fieldName();
- const Type* fieldPtr = lookupObjectPtr<Type>(fieldName);
+ const Type* fieldPtr = findObject<Type>(fieldName);
if (!fieldPtr)
{
diff --git a/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C b/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C
index 9ea87aef7de36c016d7b5f09c770ad8694e466e2..f478f2eacab34b413e3a4e58338db045ff210951 100644
--- a/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C
+++ b/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C
@@ -54,7 +54,7 @@ void Foam::functionObjects::fieldExtents::calcFieldExtents
typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
const VolFieldType* fieldPtr =
- obr_.lookupObjectPtr<VolFieldType>(fieldName);
+ obr_.findObject<VolFieldType>(fieldName);
if (!fieldPtr)
{
diff --git a/src/functionObjects/field/fluxSummary/fluxSummary.C b/src/functionObjects/field/fluxSummary/fluxSummary.C
index 529c2d48d05e13869a44dc0870ba44444af05969..a001f9b2b7f920ff06e6af9ce05f34462579d905 100644
--- a/src/functionObjects/field/fluxSummary/fluxSummary.C
+++ b/src/functionObjects/field/fluxSummary/fluxSummary.C
@@ -129,7 +129,7 @@ void Foam::functionObjects::fluxSummary::initialiseSurface
DynamicList<boolList>& faceFlip
) const
{
- const surfMesh* sPtr = mesh_.lookupObjectPtr<surfMesh>(surfName);
+ const surfMesh* sPtr = mesh_.findObject<surfMesh>(surfName);
if (!sPtr)
{
FatalErrorInFunction
@@ -154,7 +154,7 @@ void Foam::functionObjects::fluxSummary::initialiseSurfaceAndDirection
DynamicList<boolList>& faceFlip
) const
{
- const surfMesh* sPtr = mesh_.lookupObjectPtr<surfMesh>(surfName);
+ const surfMesh* sPtr = mesh_.findObject<surfMesh>(surfName);
if (!sPtr)
{
FatalErrorInFunction
diff --git a/src/functionObjects/field/readFields/readFieldsTemplates.C b/src/functionObjects/field/readFields/readFieldsTemplates.C
index fa44cd4a4ee634d1343942bcddda2ec4747631a3..cdce885932bc00ce03ecacda5735dbbe9d650ac6 100644
--- a/src/functionObjects/field/readFields/readFieldsTemplates.C
+++ b/src/functionObjects/field/readFields/readFieldsTemplates.C
@@ -47,13 +47,15 @@ bool Foam::functionObjects::readFields::loadField(const word& fieldName)
}
else if (foundObject<SurfaceFieldType>(fieldName))
{
- DebugInfo<< "readFields: " << SurfaceFieldType::typeName
+ DebugInfo
+ << "readFields: " << SurfaceFieldType::typeName
<< " " << fieldName << " already exists in database"
<< " already in database" << endl;
}
else if (foundObject<SurfFieldType>(fieldName))
{
- DebugInfo<< "readFields: " << SurfFieldType::typeName
+ DebugInfo
+ << "readFields: " << SurfFieldType::typeName
<< " " << fieldName << " already exists in database"
<< " already in database" << endl;
}
diff --git a/src/functionObjects/field/reference/referenceTemplates.C b/src/functionObjects/field/reference/referenceTemplates.C
index f32150d23334bcf67a1500c4c0958d8b0aa48913..e09713337df7e08ab182507fea5f14033200b000 100644
--- a/src/functionObjects/field/reference/referenceTemplates.C
+++ b/src/functionObjects/field/reference/referenceTemplates.C
@@ -30,7 +30,7 @@ bool Foam::functionObjects::reference::calcType()
{
typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
- const VolFieldType* vfPtr = lookupObjectPtr<VolFieldType>(fieldName_);
+ const VolFieldType* vfPtr = findObject<VolFieldType>(fieldName_);
if (vfPtr)
{
diff --git a/src/functionObjects/field/setFlow/setFlow.C b/src/functionObjects/field/setFlow/setFlow.C
index 329e2e6b5d738c9571217783d0b702e578da83e1..2f89e687f602caa98ebbcd5ac1f8f4c44d040d16 100644
--- a/src/functionObjects/field/setFlow/setFlow.C
+++ b/src/functionObjects/field/setFlow/setFlow.C
@@ -66,7 +66,7 @@ Foam::functionObjects::setFlow::modeTypeNames
void Foam::functionObjects::setFlow::setPhi(const volVectorField& U)
{
surfaceScalarField* phiptr =
- mesh_.lookupObjectRefPtr<surfaceScalarField>(phiName_);
+ mesh_.getObjectPtr<surfaceScalarField>(phiName_);
if (!phiptr)
{
@@ -76,7 +76,7 @@ void Foam::functionObjects::setFlow::setPhi(const volVectorField& U)
if (rhoName_ != "none")
{
const volScalarField* rhoptr =
- mesh_.lookupObjectPtr<volScalarField>(rhoName_);
+ mesh_.findObject<volScalarField>(rhoName_);
if (rhoptr)
{
@@ -207,10 +207,11 @@ bool Foam::functionObjects::setFlow::read(const dictionary& dict)
bool Foam::functionObjects::setFlow::execute()
{
- volVectorField* Uptr = mesh_.lookupObjectRefPtr<volVectorField>(UName_);
+ volVectorField* Uptr =
+ mesh_.getObjectPtr<volVectorField>(UName_);
surfaceScalarField* phiptr =
- mesh_.lookupObjectRefPtr<surfaceScalarField>(phiName_);
+ mesh_.getObjectPtr<surfaceScalarField>(phiName_);
Log << nl << name() << ":" << nl;
@@ -431,13 +432,13 @@ bool Foam::functionObjects::setFlow::execute()
bool Foam::functionObjects::setFlow::write()
{
- const auto& Uptr = mesh_.lookupObjectRefPtr<volVectorField>(UName_);
+ const auto* Uptr = mesh_.findObject<volVectorField>(UName_);
if (Uptr)
{
Uptr->write();
}
- const auto& phiptr = mesh_.lookupObjectRefPtr<surfaceScalarField>(phiName_);
+ const auto* phiptr = mesh_.findObject<surfaceScalarField>(phiName_);
if (phiptr)
{
phiptr->write();
diff --git a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
index 4e6045f8c15f58c5a74845beb4a16fe636ba49ee..1e0967cdb10a8c503c5fe025723acd13147ffb49 100644
--- a/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
+++ b/src/functionObjects/field/stabilityBlendingFactor/stabilityBlendingFactor.C
@@ -102,8 +102,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::calc()
bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
{
- const IOField<scalar>* residualPtr =
- mesh_.lookupObjectPtr<IOField<scalar>>(residualName_);
+ const auto* residualPtr = mesh_.findObject<IOField<scalar>>(residualName_);
if (residuals_)
{
@@ -164,7 +163,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
}
const volScalarField* nonOrthPtr =
- mesh_.lookupObjectPtr<volScalarField>(nonOrthogonalityName_);
+ mesh_.findObject<volScalarField>(nonOrthogonalityName_);
if (nonOrthogonality_)
{
@@ -200,7 +199,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
}
const volScalarField* skewnessPtr =
- mesh_.lookupObjectPtr<volScalarField>(skewnessName_);
+ mesh_.findObject<volScalarField>(skewnessName_);
if (skewness_)
{
@@ -235,7 +234,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
}
const volScalarField* faceWeightsPtr =
- mesh_.lookupObjectPtr<volScalarField>(faceWeightName_);
+ mesh_.findObject<volScalarField>(faceWeightName_);
if (faceWeight_)
{
@@ -342,7 +341,7 @@ bool Foam::functionObjects::stabilityBlendingFactor::init(bool first)
const volVectorField* UNamePtr =
- mesh_.lookupObjectPtr<volVectorField>(UName_);
+ mesh_.findObject<volVectorField>(UName_);
if (Co_)
{
@@ -520,7 +519,7 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
store(resultName_, faceBlendedPtr);
const volScalarField* nonOrthPtr =
- mesh_.lookupObjectPtr<volScalarField>(nonOrthogonalityName_);
+ mesh_.findObject<volScalarField>(nonOrthogonalityName_);
if (nonOrthogonality_)
{
@@ -552,7 +551,7 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
const volScalarField* faceWeightsPtr =
- mesh_.lookupObjectPtr<volScalarField>(faceWeightName_);
+ mesh_.findObject<volScalarField>(faceWeightName_);
if (faceWeight_)
{
@@ -583,7 +582,7 @@ Foam::functionObjects::stabilityBlendingFactor::stabilityBlendingFactor
}
const volScalarField* skewnessPtr =
- mesh_.lookupObjectPtr<volScalarField>(skewnessName_);
+ mesh_.findObject<volScalarField>(skewnessName_);
if (skewness_)
{
diff --git a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.C b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.C
index 513cce3118631e82d8ec011d93175865424a7930..35ebcc203d9e2d12026b1e87f2905e37267a8a0d 100644
--- a/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.C
+++ b/src/functionObjects/field/surfaceInterpolate/surfaceInterpolate.C
@@ -107,14 +107,12 @@ bool Foam::functionObjects::surfaceInterpolate::write()
{
const word& fieldName = fieldSet_[i].second();
- if (mesh_.foundObject<regIOobject>(fieldName))
+ const regIOobject* ioptr = obr_.findObject<regIOobject>(fieldName);
+
+ if (ioptr)
{
Log << " " << fieldName << nl;
-
- const regIOobject& field =
- obr_.lookupObject<regIOobject>(fieldName);
-
- field.write();
+ ioptr->write();
}
else
{
diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFields.C b/src/functionObjects/field/turbulenceFields/turbulenceFields.C
index 559237b84a137e2ff1de2adba94928d85026adaa..3a257d5da6c8cecf0711f1859105b09c3f2fb706 100644
--- a/src/functionObjects/field/turbulenceFields/turbulenceFields.C
+++ b/src/functionObjects/field/turbulenceFields/turbulenceFields.C
@@ -103,12 +103,10 @@ bool Foam::functionObjects::turbulenceFields::compressible()
{
return false;
}
- else
- {
- FatalErrorInFunction
- << "Turbulence model not found in database, deactivating"
- << exit(FatalError);
- }
+
+ FatalErrorInFunction
+ << "Turbulence model not found in database, deactivating"
+ << exit(FatalError);
return false;
}
diff --git a/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C b/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
index 98613fbc282bad6c8bc9e91afcc3ecc9cdc7edea..3bbbea07e245f4d91414a642d372a0dfd4d838a9 100644
--- a/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
+++ b/src/functionObjects/field/turbulenceFields/turbulenceFieldsTemplates.C
@@ -38,10 +38,11 @@ void Foam::functionObjects::turbulenceFields::processField
const word scopedName = modelName + ':' + fieldName;
- if (obr_.foundObject<FieldType>(scopedName))
+ FieldType* fldPtr = obr_.getObjectPtr<FieldType>(scopedName);
+
+ if (fldPtr)
{
- FieldType& fld = obr_.lookupObjectRef<FieldType>(scopedName);
- fld == tvalue();
+ (*fldPtr) == tvalue();
}
else if (obr_.found(scopedName))
{
diff --git a/src/functionObjects/field/vorticity/vorticity.C b/src/functionObjects/field/vorticity/vorticity.C
index 6fd1d38bbad4b026d6334dbc8b47a46e285e2678..51849e356f93b9385cd830e6e61e973fcb98ef99 100644
--- a/src/functionObjects/field/vorticity/vorticity.C
+++ b/src/functionObjects/field/vorticity/vorticity.C
@@ -57,12 +57,8 @@ bool Foam::functionObjects::vorticity::calc()
fvc::curl(lookupObject<volVectorField>(fieldName_))
);
}
- else
- {
- return false;
- }
- return true;
+ return false;
}
diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.C b/src/functionObjects/field/wallShearStress/wallShearStress.C
index bbf4a3f3940680ef51486818e0e4ea3a4c24838a..0019687c560ac2379313a9c75a11c1a9e66c54f9 100644
--- a/src/functionObjects/field/wallShearStress/wallShearStress.C
+++ b/src/functionObjects/field/wallShearStress/wallShearStress.C
@@ -183,28 +183,48 @@ bool Foam::functionObjects::wallShearStress::execute()
volVectorField& wallShearStress =
mesh_.lookupObjectRef<volVectorField>(type());
- const word& turbModelName = turbulenceModel::propertiesName;
- auto cmpModelPtr =
- mesh_.lookupObjectPtr<compressible::turbulenceModel>(turbModelName);
- auto icoModelPtr =
- mesh_.lookupObjectPtr<incompressible::turbulenceModel>(turbModelName);
+ bool ok = false;
- if (cmpModelPtr)
+ // compressible
+ if (!ok)
{
- calcShearStress(cmpModelPtr->devRhoReff(), wallShearStress);
+ typedef compressible::turbulenceModel turbType;
+
+ const turbType* modelPtr =
+ findObject<turbType>(turbulenceModel::propertiesName);
+
+ ok = modelPtr;
+
+ if (ok)
+ {
+ calcShearStress(modelPtr->devRhoReff(), wallShearStress);
+ }
}
- else if (icoModelPtr)
+
+ // incompressible
+ if (!ok)
{
- calcShearStress(icoModelPtr->devReff(), wallShearStress);
+ typedef incompressible::turbulenceModel turbType;
+
+ const turbType* modelPtr =
+ findObject<turbType>(turbulenceModel::propertiesName);
+
+ ok = modelPtr;
+
+ if (ok)
+ {
+ calcShearStress(modelPtr->devReff(), wallShearStress);
+ }
}
- else
+
+ if (!ok)
{
FatalErrorInFunction
<< "Unable to find turbulence model in the "
<< "database" << exit(FatalError);
}
- return true;
+ return ok;
}
diff --git a/src/functionObjects/field/zeroGradient/zeroGradient.C b/src/functionObjects/field/zeroGradient/zeroGradient.C
index f5b36b79a7d1f2f89d56a0b6b99fc5ced82ca4c4..719b38d900b2f732035f6c18ee01cb7268cd914d 100644
--- a/src/functionObjects/field/zeroGradient/zeroGradient.C
+++ b/src/functionObjects/field/zeroGradient/zeroGradient.C
@@ -176,16 +176,15 @@ bool Foam::functionObjects::zeroGradient::write()
}
// Consistent output order
- const wordList outputList = results_.sortedToc();
- for (const word& fieldName : outputList)
+ for (const word& fieldName : results_.sortedToc())
{
- if (foundObject<regIOobject>(fieldName))
- {
- const regIOobject& io = lookupObject<regIOobject>(fieldName);
+ const regIOobject* ioptr = findObject<regIOobject>(fieldName);
+ if (ioptr)
+ {
Log << " " << fieldName << endl;
- io.write();
+ ioptr->write();
}
}
diff --git a/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C b/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C
index dbcbd464cda98a24d11cd1b0b18a1ee0803599a9..07500761acd37e1fe1dbb9986ffa703cb951a70f 100644
--- a/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C
+++ b/src/functionObjects/lagrangian/vtkCloud/vtkCloud.C
@@ -106,7 +106,7 @@ bool Foam::functionObjects::vtkCloud::writeCloud
const word& cloudName
)
{
- const auto* objPtr = mesh_.lookupObjectPtr<cloud>(cloudName);
+ const auto* objPtr = mesh_.findObject<cloud>(cloudName);
if (!objPtr)
{
return false;
@@ -127,7 +127,7 @@ bool Foam::functionObjects::vtkCloud::writeCloud
objPtr->writeObjects(obrTmp);
- const auto* pointsPtr = obrTmp.lookupObjectPtr<vectorField>("position");
+ const auto* pointsPtr = obrTmp.findObject<vectorField>("position");
if (!pointsPtr)
{
diff --git a/src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C b/src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C
index 16c07da5d597b581eb1ee27e9d22c730ebe02e17..b55d4d315c3ba5bdc05f34b330268b71aacf3e91 100644
--- a/src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C
+++ b/src/functionObjects/lagrangian/vtkCloud/vtkCloudTemplates.C
@@ -52,7 +52,7 @@ Foam::wordList Foam::functionObjects::vtkCloud::writeFields
for (const word& fieldName : fieldNames)
{
- const auto* fldPtr = obrTmp.lookupObjectPtr<IOField<Type>>(fieldName);
+ const auto* fldPtr = obrTmp.findObject<IOField<Type>>(fieldName);
if (Pstream::master())
{
diff --git a/src/functionObjects/solvers/energyTransport/energyTransport.C b/src/functionObjects/solvers/energyTransport/energyTransport.C
index 5fcb5c668e04fe5c2a44e3648c451d03491ce966..931d15e77b72750757354ea20e57228ba7d76768 100644
--- a/src/functionObjects/solvers/energyTransport/energyTransport.C
+++ b/src/functionObjects/solvers/energyTransport/energyTransport.C
@@ -83,7 +83,7 @@ Foam::functionObjects::energyTransport::kappaEff() const
{
typedef incompressible::turbulenceModel turbType;
- const turbType* turbPtr = lookupObjectPtr<turbType>
+ const turbType* turbPtr = findObject<turbType>
(
turbulenceModel::propertiesName
);
@@ -305,7 +305,7 @@ Foam::functionObjects::energyTransport::energyTransport
phases_.set
(
i,
- mesh_.lookupObjectRefPtr<volScalarField>(phaseNames_[i])
+ mesh_.getObjectPtr<volScalarField>(phaseNames_[i])
);
}
diff --git a/src/functionObjects/solvers/scalarTransport/scalarTransport.C b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
index 7b89363a81f8a3762e5c3a639a2d004148d148db..650a8a772311f5589931d0f0994be41beb04948a 100644
--- a/src/functionObjects/solvers/scalarTransport/scalarTransport.C
+++ b/src/functionObjects/solvers/scalarTransport/scalarTransport.C
@@ -88,10 +88,7 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
const surfaceScalarField& phi
) const
{
- typedef incompressible::turbulenceModel icoModel;
- typedef compressible::turbulenceModel cmpModel;
-
- word Dname("D" + s.name());
+ const word Dname("D" + s.name());
if (constantD_)
{
@@ -109,38 +106,49 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::scalarTransport::D
dimensionedScalar(Dname, phi.dimensions()/dimLength, D_)
);
}
- else if (nutName_ != "none")
+
+ if (nutName_ != "none")
{
const volScalarField& nutMean =
mesh_.lookupObject<volScalarField>(nutName_);
return tmp<volScalarField>::New(Dname, nutMean);
}
- else if (foundObject<icoModel>(turbulenceModel::propertiesName))
+
+ // Incompressible
{
- const icoModel& model = lookupObject<icoModel>
- (
- turbulenceModel::propertiesName
- );
+ const auto* turb =
+ findObject<incompressible::turbulenceModel>
+ (
+ turbulenceModel::propertiesName
+ );
- return tmp<volScalarField>::New
- (
- Dname,
- alphaD_*model.nu() + alphaDt_*model.nut()
- );
+ if (turb)
+ {
+ return tmp<volScalarField>::New
+ (
+ Dname,
+ alphaD_ * turb->nu() + alphaDt_ * turb->nut()
+ );
+ }
}
- else if (foundObject<cmpModel>(turbulenceModel::propertiesName))
+
+ // Compressible
{
- const cmpModel& model = lookupObject<cmpModel>
- (
- turbulenceModel::propertiesName
- );
+ const auto* turb =
+ findObject<compressible::turbulenceModel>
+ (
+ turbulenceModel::propertiesName
+ );
- return tmp<volScalarField>::New
- (
- Dname,
- alphaD_*model.mu() + alphaDt_*model.mut()
- );
+ if (turb)
+ {
+ return tmp<volScalarField>::New
+ (
+ Dname,
+ alphaD_ * turb->mu() + alphaDt_ * turb->mut()
+ );
+ }
}
diff --git a/src/functionObjects/utilities/ensightWrite/ensightWriteTemplates.C b/src/functionObjects/utilities/ensightWrite/ensightWriteTemplates.C
index a1da699b44c75e329d8eeace09918a3a761a1912..6958cc7f142dfbbd204efb2d03d501e099ad100f 100644
--- a/src/functionObjects/utilities/ensightWrite/ensightWriteTemplates.C
+++ b/src/functionObjects/utilities/ensightWrite/ensightWriteTemplates.C
@@ -38,10 +38,16 @@ int Foam::functionObjects::ensightWrite::writeVolField
// State: return 0 (not-processed), -1 (skip), +1 ok
typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
- const VolFieldType* fldPtr;
+ // Already done
+ if (state)
+ {
+ return state;
+ }
+
+ const VolFieldType* fldPtr = findObject<VolFieldType>(inputName);
- // Already done, or not available
- if (state || !(fldPtr = lookupObjectPtr<VolFieldType>(inputName)))
+ // Not available
+ if (!fldPtr)
{
return state;
}
diff --git a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C
index 2441d6ab4826a8ea7afcc652bbea4f4870e572e9..be038b55c51a8c7367513a8ec6472cd813ea99ce 100644
--- a/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C
+++ b/src/functionObjects/utilities/removeRegisteredObject/removeRegisteredObject.C
@@ -82,22 +82,18 @@ bool Foam::functionObjects::removeRegisteredObject::read(const dictionary& dict)
bool Foam::functionObjects::removeRegisteredObject::execute()
{
- forAll(objectNames_, i)
+ for (const word& objName : objectNames_)
{
- if (foundObject<regIOobject>(objectNames_[i]))
+ regIOobject* ptr = getObjectPtr<regIOobject>(objName);
+
+ if (ptr && ptr->ownedByRegistry())
{
- const regIOobject& obj =
- lookupObject<regIOobject>(objectNames_[i]);
-
- if (obj.ownedByRegistry())
- {
- Log << type() << " " << name() << " output:" << nl
- << " removing object " << obj.name() << nl
- << endl;
-
- const_cast<regIOobject&>(obj).release();
- delete &obj;
- }
+ Log << type() << " " << name() << " output:" << nl
+ << " removing object " << ptr->name() << nl
+ << endl;
+
+ ptr->release();
+ delete ptr;
}
}
diff --git a/src/functionObjects/utilities/residuals/residuals.C b/src/functionObjects/utilities/residuals/residuals.C
index 907fcdd2058d14508a8f8e9a016dcf4acd4068ec..a4aa02c51e5247c0be1f248bfa3cc1cd22eda715 100644
--- a/src/functionObjects/utilities/residuals/residuals.C
+++ b/src/functionObjects/utilities/residuals/residuals.C
@@ -113,8 +113,7 @@ void Foam::functionObjects::residuals::writeField(const word& fieldName) const
{
const word residualName("initialResidual:" + fieldName);
- const IOField<scalar>* residualPtr =
- mesh_.lookupObjectPtr<IOField<scalar>>(residualName);
+ const auto* residualPtr = mesh_.findObject<IOField<scalar>>(residualName);
if (residualPtr)
{
diff --git a/src/functionObjects/utilities/writeDictionary/writeDictionary.C b/src/functionObjects/utilities/writeDictionary/writeDictionary.C
index a81e5a718b5ee1c2ff27f5740c1e343f60007e37..1dc642d4fb386647fbdb249f42c97737462161f5 100644
--- a/src/functionObjects/utilities/writeDictionary/writeDictionary.C
+++ b/src/functionObjects/utilities/writeDictionary/writeDictionary.C
@@ -160,10 +160,12 @@ bool Foam::functionObjects::writeDictionary::write()
bool firstDict = true;
forAll(dictNames_, i)
{
- if (obr_.foundObject<dictionary>(dictNames_[i]))
+ const dictionary* dictptr =
+ obr_.findObject<dictionary>(dictNames_[i]);
+
+ if (dictptr)
{
- const dictionary& dict =
- obr_.lookupObject<dictionary>(dictNames_[i]);
+ const dictionary& dict = *dictptr;
if (dict.digest() != digests_[i])
{
diff --git a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
index ba7320d68f0103906e8e92b9267d77ee220fb870..5e927a434c07ac0bb565dc890405051f79219444 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/uniformInterpolatedDisplacement/uniformInterpolatedDisplacementPointPatchVectorField.C
@@ -211,13 +211,9 @@ void uniformInterpolatedDisplacementPointPatchVectorField::updateCoeffs()
>(*fieldsCacheIter());
- pointVectorField& d = const_cast<pointVectorField&>
- (
- timeCache.lookupObject<pointVectorField>
- (
- fieldName_
- )
- );
+ pointVectorField& d =
+ timeCache.lookupObjectRef<pointVectorField>(fieldName_);
+
d.correctBoundaryConditions();
}
}
diff --git a/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.C b/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.C
index 6c0f0b0950c87d97731932162567861d6900bbf8..811eab1e625c06a04eb963459bedb88b67aeef97 100644
--- a/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.C
+++ b/src/fvOptions/sources/derived/viscousDissipation/viscousDissipation.C
@@ -106,7 +106,7 @@ Foam::fv::viscousDissipation::viscousDissipation
)
{
const basicThermo* thermoPtr =
- mesh_.lookupObjectPtr<basicThermo>(basicThermo::dictName);
+ mesh_.findObject<basicThermo>(basicThermo::dictName);
if (thermoPtr)
{
@@ -136,7 +136,7 @@ Foam::fv::viscousDissipation::devRhoReff() const
// Incompressible
{
const auto* turbPtr =
- mesh_.lookupObjectPtr<incompressible::turbulenceModel>
+ mesh_.findObject<incompressible::turbulenceModel>
(
turbulenceModel::propertiesName
);
@@ -150,7 +150,7 @@ Foam::fv::viscousDissipation::devRhoReff() const
// Compressible
{
const auto* turbPtr =
- mesh_.lookupObjectPtr<compressible::turbulenceModel>
+ mesh_.findObject<compressible::turbulenceModel>
(
turbulenceModel::propertiesName
);
@@ -196,8 +196,7 @@ void Foam::fv::viscousDissipation::addSup
);
// Cached?
- const GradFieldType* gradUPtr =
- mesh_.lookupObjectPtr<GradFieldType>(gradUName);
+ const GradFieldType* gradUPtr = mesh_.findObject<GradFieldType>(gradUName);
if (gradUPtr)
{
diff --git a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
index 0c0ee7252d2be97011887b06f6dfce2baf700ccf..fe3ad19a9fb8e10348bea524e858af9e26c38e86 100644
--- a/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
+++ b/src/fvOptions/sources/interRegion/interRegionHeatTransfer/interRegionHeatTransferModel/interRegionHeatTransferModel.C
@@ -206,10 +206,12 @@ void Foam::fv::interRegionHeatTransferModel::addSup
{
if (he.dimensions() == dimEnergy/dimMass)
{
- if (mesh_.foundObject<basicThermo>(basicThermo::dictName))
+ const basicThermo* thermoPtr =
+ mesh_.findObject<basicThermo>(basicThermo::dictName);
+
+ if (thermoPtr)
{
- const basicThermo& thermo =
- mesh_.lookupObject<basicThermo>(basicThermo::dictName);
+ const basicThermo& thermo = *thermoPtr;
volScalarField htcByCpv(htc_/thermo.Cpv());
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
index cbba2eb6983f4afe1a8ea67d47bcadededce72ff..64bf5dcfb8b58c4d6f0494f5efc5c92c07f0d4db 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Interface/InterfaceForce.C
@@ -101,10 +101,10 @@ void Foam::InterfaceForce<CloudType>::cacheFields(const bool store)
if (fieldExists)
{
- const volVectorField& gradInterForce = this->mesh().template
- lookupObject<volVectorField>(fName);
+ volVectorField& gradInterForce =
+ this->mesh().template lookupObjectRef<volVectorField>(fName);
- const_cast<volVectorField&>(gradInterForce).checkOut();
+ gradInterForce.checkOut();
}
}
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C
index cc45ca417d3ee9a03c5056b40af5ef34bda4451e..ed757e32d62a3ba6ef30a85ed3d4f647e2a99295 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/Lift/LiftForce/LiftForce.C
@@ -116,10 +116,10 @@ void Foam::LiftForce<CloudType>::cacheFields(const bool store)
if (fieldExists)
{
- const volVectorField& curlUc = this->mesh().template
- lookupObject<volVectorField>(fName);
+ volVectorField& curlUc =
+ this->mesh().template lookupObjectRef<volVectorField>(fName);
- const_cast<volVectorField&>(curlUc).checkOut();
+ curlUc.checkOut();
}
}
}
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C
index 2d1b322950b673d0dcacc7108e23940816107748..b84811e98e7437c11abbe2a96aa56266dda1e1ee 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/ParticleForces/PressureGradient/PressureGradientForce.C
@@ -106,10 +106,10 @@ void Foam::PressureGradientForce<CloudType>::cacheFields(const bool store)
if (fieldExists)
{
- const volVectorField& DUcDt = this->mesh().template
- lookupObject<volVectorField>(fName);
+ volVectorField& DUcDt =
+ this->mesh().template lookupObjectRef<volVectorField>(fName);
- const_cast<volVectorField&>(DUcDt).checkOut();
+ DUcDt.checkOut();
}
}
}
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
index b1116d76ce5326302fa8c335ab7f4a62a9591732..82bbd3702e0a108edeef6206a4832c4778c4cd11 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
@@ -41,11 +41,11 @@ Foam::DispersionRASModel<CloudType>::kModel() const
this->owner().U().group()
);
- if (obr.foundObject<turbulenceModel>(turbName))
+ const turbulenceModel* turb = obr.findObject<turbulenceModel>(turbName);
+
+ if (turb)
{
- const turbulenceModel& model =
- obr.lookupObject<turbulenceModel>(turbName);
- return model.k();
+ return turb->k();
}
FatalErrorInFunction
@@ -69,11 +69,11 @@ Foam::DispersionRASModel<CloudType>::epsilonModel() const
this->owner().U().group()
);
- if (obr.foundObject<turbulenceModel>(turbName))
+ const turbulenceModel* turb = obr.findObject<turbulenceModel>(turbName);
+
+ if (turb)
{
- const turbulenceModel& model =
- obr.lookupObject<turbulenceModel>(turbName);
- return model.epsilon();
+ return turb->epsilon();
}
FatalErrorInFunction
diff --git a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
index c2f42a8c1052a147d865b8d9a34ae34a1f51b095..2718f36e0ee843d0d175f77797b5eea81a79096b 100644
--- a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
+++ b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
@@ -64,11 +64,11 @@ Foam::BrownianMotionForce<CloudType>::kModel() const
this->owner().U().group()
);
- if (obr.foundObject<turbulenceModel>(turbName))
+ const turbulenceModel* turb = obr.findObject<turbulenceModel>(turbName);
+
+ if (turb)
{
- const turbulenceModel& model =
- obr.lookupObject<turbulenceModel>(turbName);
- return model.k();
+ return turb->k();
}
FatalErrorInFunction
diff --git a/src/lumpedPointMotion/lumpedPointIOMovement.C b/src/lumpedPointMotion/lumpedPointIOMovement.C
index 81cc4073bb44a68b3bf91fdd4ff3761cb137d84b..2f9d02fba418c7b37e0a3793cd92fe13a87948a8 100644
--- a/src/lumpedPointMotion/lumpedPointIOMovement.C
+++ b/src/lumpedPointMotion/lumpedPointIOMovement.C
@@ -39,7 +39,7 @@ namespace Foam
const Foam::lumpedPointIOMovement*
Foam::lumpedPointIOMovement::lookupInRegistry(const objectRegistry& obr)
{
- return obr.lookupObjectPtr<lumpedPointIOMovement>
+ return obr.findObject<lumpedPointIOMovement>
(
lumpedPointMovement::canonicalName
);
diff --git a/src/lumpedPointMotion/lumpedPointMovement.C b/src/lumpedPointMotion/lumpedPointMovement.C
index 3ef592ba709b080a7ea230ace402b26ef2a4b929..8ecbe7e3c8308f9897c636e17f17ccef79ee174a 100644
--- a/src/lumpedPointMotion/lumpedPointMovement.C
+++ b/src/lumpedPointMotion/lumpedPointMovement.C
@@ -495,7 +495,7 @@ bool Foam::lumpedPointMovement::forcesAndMoments
// Calculated force per patch - cache
PtrMap<vectorField> forceOnPatches;
- const volScalarField* pPtr = pmesh.lookupObjectPtr<volScalarField>(pName);
+ const volScalarField* pPtr = pmesh.findObject<volScalarField>(pName);
// fvMesh and has pressure field
if (isA<fvMesh>(pmesh) && pPtr)
diff --git a/src/meshTools/coordinate/systems/coordinateSystems.C b/src/meshTools/coordinate/systems/coordinateSystems.C
index 5fcb359ad5e6446763878f8fecef305841a69e93..0da9cb0c8bc8c9273b96c74b8a73848030829779 100644
--- a/src/meshTools/coordinate/systems/coordinateSystems.C
+++ b/src/meshTools/coordinate/systems/coordinateSystems.C
@@ -240,8 +240,7 @@ const Foam::coordinateSystems& Foam::coordinateSystems::New
{
// Previously registered?
- const coordinateSystems* ptr =
- obr.lookupObjectPtr<coordinateSystems>(typeName);
+ const coordinateSystems* ptr = obr.findObject<coordinateSystems>(typeName);
if (ptr)
{
diff --git a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C
index 0dba39262480871777c6560d04cebc92242a712d..5bc947e6ef5946640d497101b371765a2ab8a444 100644
--- a/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C
+++ b/src/meshTools/regionCoupled/GAMG/interfaces/regionCoupledGAMGInterface/regionCoupledBaseGAMGInterface.C
@@ -100,19 +100,16 @@ Foam::regionCoupledBaseGAMGInterface::regionCoupledBaseGAMGInterface
const polyMesh& nbrMesh =
fineRegionCoupledLduInterface_.nbrMesh();
- if
- (
- nbrMesh.foundObject<GAMGAgglomeration>(GAMGAgglomeration::typeName)
- )
- {
- const GAMGAgglomeration& nbrAgg = nbrMesh.thisDb().lookupObject
- <
- GAMGAgglomeration
- >
+ const GAMGAgglomeration* nbrAggPtr = nbrMesh.thisDb().findObject
+ <GAMGAgglomeration>
(
GAMGAgglomeration::typeName
);
+ if (nbrAggPtr)
+ {
+ const GAMGAgglomeration& nbrAgg = *nbrAggPtr;
+
label nbrLevel(-1);
if (nbrAgg.size() > fineLevelIndex)
{
diff --git a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
index bd64b8238df3087b35c7e6daf7e0ee918d34e25c..37fc5171a79c0102d527212b0d7aca7b5f8bbef3 100644
--- a/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
+++ b/src/meshTools/regionCoupled/patches/regionCoupledPolyPatch/regionCoupledBase.C
@@ -187,19 +187,15 @@ Foam::label Foam::regionCoupledBase::neighbPatchID() const
{
if (nbrPatchID_ == -1)
{
- if
- (
- patch_.boundaryMesh().mesh().time().foundObject<polyMesh>
+ const polyMesh* meshPtr =
+ patch_.boundaryMesh().mesh().time().findObject<polyMesh>
(
nbrRegionName_
- )
- )
+ );
+
+ if (meshPtr)
{
- const polyMesh& mesh =
- patch_.boundaryMesh().mesh().time().lookupObject<polyMesh>
- (
- nbrRegionName_
- );
+ const polyMesh& mesh = *meshPtr;
nbrPatchID_ = mesh.boundaryMesh().findPatchID(nbrPatchName_);
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
index a55e2c37ff84837cd4a89050d28afe8a2a965efc..6f84dd7e7dfaf7be9a3d92e6aa6f6acc929dbf3b 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
+++ b/src/meshTools/searchableSurfaces/searchableSurfaceCollection/searchableSurfaceCollection.C
@@ -205,8 +205,8 @@ Foam::searchableSurfaceCollection::searchableSurfaceCollection
const word subGeomName(subDict.get<word>("surface"));
//Pout<< "Trying to find " << subGeomName << endl;
- const searchableSurface& s =
- io.db().lookupObject<searchableSurface>(subGeomName);
+ searchableSurface& s =
+ io.db().lookupObjectRef<searchableSurface>(subGeomName);
// I don't know yet how to handle the globalSize combined with
// regionOffset. Would cause non-consecutive indices locally
@@ -218,7 +218,7 @@ Foam::searchableSurfaceCollection::searchableSurfaceCollection
<< exit(FatalError);
}
- subGeom_.set(surfI, &(const_cast<searchableSurface&>(s)));
+ subGeom_.set(surfI, &s);
indexOffset_[surfI] = startIndex;
startIndex += subGeom_[surfI].size();
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.C b/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.C
index 6721a4bb5a64711acab410c5e053dafe9d2461d6..d6106019333471235c43fb826570cddc915657db 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.C
+++ b/src/meshTools/searchableSurfaces/searchableSurfaceWithGaps/searchableSurfaceWithGaps.C
@@ -189,7 +189,7 @@ Foam::searchableSurfaceWithGaps::searchableSurfaceWithGaps
subGeom_.set
(
0,
- io.db().lookupObjectRefPtr<searchableSurface>(subGeomName)
+ io.db().getObjectPtr<searchableSurface>(subGeomName)
);
bounds() = subGeom_[0].bounds();
diff --git a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
index 791c8d993ba4ac9e3e5c56bcee703262c8982dec..74cafc8fc3993e330b7b51949ebb5653d81cfddd 100644
--- a/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
+++ b/src/meshTools/searchableSurfaces/triSurfaceMesh/triSurfaceMesh.C
@@ -803,14 +803,15 @@ void Foam::triSurfaceMesh::getNormal
void Foam::triSurfaceMesh::setField(const labelList& values)
{
+ auto* fldPtr = getObjectPtr<triSurfaceLabelField>("values");
- if (foundObject<triSurfaceLabelField>("values"))
+ if (fldPtr)
{
- lookupObjectRef<triSurfaceLabelField>("values").field() = values;
+ (*fldPtr).field() = values;
}
else
{
- auto fldPtr = autoPtr<triSurfaceLabelField>::New
+ fldPtr = new triSurfaceLabelField
(
IOobject
(
@@ -827,7 +828,7 @@ void Foam::triSurfaceMesh::setField(const labelList& values)
);
// Store field on triMesh
- fldPtr.ptr()->store();
+ fldPtr->store();
}
}
@@ -838,9 +839,11 @@ void Foam::triSurfaceMesh::getField
labelList& values
) const
{
- if (foundObject<triSurfaceLabelField>("values"))
+ const auto* fldPtr = getObjectPtr<triSurfaceLabelField>("values");
+
+ if (fldPtr)
{
- const auto& fld = lookupObject<triSurfaceLabelField>("values");
+ const auto& fld = *fldPtr;
values.setSize(info.size());
diff --git a/src/parallel/decompose/decompositionMethods/decompositionConstraints/refinementHistory/refinementHistoryConstraint.C b/src/parallel/decompose/decompositionMethods/decompositionConstraints/refinementHistory/refinementHistoryConstraint.C
index c1af450d7fec38332eaa90d706d9a47fc493bd8c..ebdb9f641dbf061d5f4d0436a3fe86da2e02c627 100644
--- a/src/parallel/decompose/decompositionMethods/decompositionConstraints/refinementHistory/refinementHistoryConstraint.C
+++ b/src/parallel/decompose/decompositionMethods/decompositionConstraints/refinementHistory/refinementHistoryConstraint.C
@@ -84,24 +84,13 @@ void Foam::refinementHistoryConstraint::add
List<labelPair>& explicitConnections
) const
{
+ const refinementHistory* refPtr =
+ mesh.findObject<refinementHistory>("refinementHistory");
+
autoPtr<const refinementHistory> storagePtr;
- refinementHistory const* refPtr = nullptr;
- if (mesh.foundObject<refinementHistory>("refinementHistory"))
- {
- if (decompositionConstraint::debug)
- {
- Info<< type() << " : found refinementHistory" << endl;
- }
- refPtr = &mesh.lookupObject<refinementHistory>("refinementHistory");
- }
- else
+ if (!refPtr)
{
- if (decompositionConstraint::debug)
- {
- Info<< type() << " : reading refinementHistory from time "
- << mesh.facesInstance() << endl;
- }
storagePtr.reset
(
new refinementHistory
@@ -120,6 +109,19 @@ void Foam::refinementHistoryConstraint::add
);
}
+ if (decompositionConstraint::debug)
+ {
+ if (refPtr)
+ {
+ Info<< type() << " : found refinementHistory" << nl;
+ }
+ else
+ {
+ Info<< type() << " : reading refinementHistory from time "
+ << mesh.facesInstance() << nl;
+ }
+ }
+
const refinementHistory& history =
(
storagePtr.valid()
@@ -151,24 +153,13 @@ void Foam::refinementHistoryConstraint::apply
labelList& decomposition
) const
{
+ const refinementHistory* refPtr =
+ mesh.findObject<refinementHistory>("refinementHistory");
+
autoPtr<const refinementHistory> storagePtr;
- refinementHistory const* refPtr = nullptr;
- if (mesh.foundObject<refinementHistory>("refinementHistory"))
- {
- //if (decompositionConstraint::debug)
- //{
- // Info<< type() << " : found refinementHistory" << endl;
- //}
- refPtr = &mesh.lookupObject<refinementHistory>("refinementHistory");
- }
- else
+ if (!refPtr)
{
- //if (decompositionConstraint::debug)
- //{
- // Info<< type() << " : reading refinementHistory from time "
- // << mesh.facesInstance() << endl;
- //}
storagePtr.reset
(
new refinementHistory
diff --git a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
index 25686ebb724d0df9978cb7e8ca467d70b6234ec0..7da8ce27f46b8db6ce4c72c7c88f70b56306f0e4 100644
--- a/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
+++ b/src/parallel/distributed/distributedTriSurfaceMesh/distributedTriSurfaceMesh.C
@@ -808,7 +808,7 @@ Foam::distributedTriSurfaceMesh::independentlyDistributedBbs
// here since we've only got Time and not a mesh.
const auto* dictPtr =
- searchableSurface::time().lookupObjectPtr<IOdictionary>
+ searchableSurface::time().findObject<IOdictionary>
(
// == decompositionModel::canonicalName
"decomposeParDict"
@@ -1914,13 +1914,11 @@ void Foam::distributedTriSurfaceMesh::getField
return;
}
- if (foundObject<triSurfaceLabelField>("values"))
- {
- const triSurfaceLabelField& fld = lookupObject<triSurfaceLabelField>
- (
- "values"
- );
+ const auto* fldPtr = findObject<triSurfaceLabelField>("values");
+ if (fldPtr)
+ {
+ const triSurfaceLabelField& fld = *fldPtr;
// Get query data (= local index of triangle)
// ~~~~~~~~~~~~~~
diff --git a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
index 53ba2236c519677f6da321029d1a82e737c92ba6..0c751ec61ebf5a942946bb9b83dd998ce11daf6f 100644
--- a/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
+++ b/src/regionCoupled/derivedFvPatchFields/energyRegionCoupled/energyRegionCoupledFvPatchScalarField.C
@@ -67,23 +67,19 @@ void Foam::energyRegionCoupledFvPatchScalarField::setMethod() const
if (!nbrThermoPtr_)
{
nbrThermoPtr_ =
- (
- ®ionCoupledPatch_.nbrMesh().lookupObject<basicThermo>
+ regionCoupledPatch_.nbrMesh().findObject<basicThermo>
(
basicThermo::dictName
- )
- );
+ );
}
if (!thermoPtr_)
{
thermoPtr_ =
- (
- &this->db().lookupObject<basicThermo>
+ this->db().findObject<basicThermo>
(
basicThermo::dictName
- )
- );
+ );
}
}
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
index 6b1aee1745296c3292ac448791044f563c824861..a0badb5c876c82ed2d5c634a6b8a8fc298a97b83 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisTemperatureCoupled/filmPyrolysisTemperatureCoupledFvPatchScalarField.C
@@ -123,35 +123,37 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::updateCoeffs()
return;
}
- typedef regionModels::surfaceFilmModels::surfaceFilmRegionModel
- filmModelType;
+ // Film model
+ const auto* filmModelPtr = db().time().findObject
+ <regionModels::surfaceFilmModels::surfaceFilmRegionModel>
+ (filmRegionName_);
+
+ // Pyrolysis model
+ const auto* pyrModelPtr = db().time().findObject
+ <regionModels::pyrolysisModels::pyrolysisModel>
+ (pyrolysisRegionName_);
+
+ if (!filmModelPtr || !pyrModelPtr)
+ {
+ // Do nothing on construction - film model doesn't exist yet
+ return;
+ }
+
+ const auto& filmModel = *filmModelPtr;
+ const auto& pyrModel = *pyrModelPtr;
- typedef regionModels::pyrolysisModels::pyrolysisModel pyrModelType;
// Since we're inside initEvaluate/evaluate there might be processor
// comms underway. Change the tag we use.
int oldTag = UPstream::msgType();
UPstream::msgType() = oldTag+1;
- bool filmOk = db().time().foundObject<filmModelType>(filmRegionName_);
-
-
- bool pyrOk = db().time().foundObject<pyrModelType>(pyrolysisRegionName_);
-
- if (!filmOk || !pyrOk)
- {
- // Do nothing on construction - film model doesn't exist yet
- return;
- }
scalarField& Tp = *this;
const label patchi = patch().index();
- // Retrieve film model
- const filmModelType& filmModel =
- db().time().lookupObject<filmModelType>(filmRegionName_);
-
+ // The film model
const label filmPatchi = filmModel.regionPatchID(patchi);
scalarField alphaFilm = filmModel.alpha().boundaryField()[filmPatchi];
@@ -160,10 +162,7 @@ void Foam::filmPyrolysisTemperatureCoupledFvPatchScalarField::updateCoeffs()
scalarField TFilm = filmModel.Ts().boundaryField()[filmPatchi];
filmModel.toPrimary(filmPatchi, TFilm);
- // Retrieve pyrolysis model
- const pyrModelType& pyrModel =
- db().time().lookupObject<pyrModelType>(pyrolysisRegionName_);
-
+ // The pyrolysis model
const label pyrPatchi = pyrModel.regionPatchID(patchi);
scalarField TPyr = pyrModel.T().boundaryField()[pyrPatchi];
diff --git a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
index f4b4d4455524d90776857e78a1a4bb1f68088de4..34c22f9e285885cf07e8cd59b52ad6551375034f 100644
--- a/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
+++ b/src/regionModels/regionCoupling/derivedFvPatchFields/filmPyrolysisVelocityCoupled/filmPyrolysisVelocityCoupledFvPatchVectorField.C
@@ -123,35 +123,38 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::updateCoeffs()
return;
}
- typedef regionModels::surfaceFilmModels::surfaceFilmRegionModel
- filmModelType;
+ // Film model
+ const auto* filmModelPtr = db().time().findObject
+ <regionModels::surfaceFilmModels::surfaceFilmRegionModel>
+ (filmRegionName_);
- typedef regionModels::pyrolysisModels::pyrolysisModel pyrModelType;
+ // Pyrolysis model
+ const auto* pyrModelPtr = db().time().findObject
+ <regionModels::pyrolysisModels::pyrolysisModel>
+ (pyrolysisRegionName_);
- // Since we're inside initEvaluate/evaluate there might be processor
- // comms underway. Change the tag we use.
- int oldTag = UPstream::msgType();
- UPstream::msgType() = oldTag+1;
- bool foundFilm = db().time().foundObject<filmModelType>(filmRegionName_);
-
- bool foundPyrolysis =
- db().time().foundObject<pyrModelType>(pyrolysisRegionName_);
-
- if (!foundFilm || !foundPyrolysis)
+ if (!filmModelPtr || !pyrModelPtr)
{
// Do nothing on construction - film model doesn't exist yet
return;
}
+ const auto& filmModel = *filmModelPtr;
+ const auto& pyrModel = *pyrModelPtr;
+
+
+ // Since we're inside initEvaluate/evaluate there might be processor
+ // comms underway. Change the tag we use.
+ int oldTag = UPstream::msgType();
+ UPstream::msgType() = oldTag+1;
+
+
vectorField& Up = *this;
const label patchi = patch().index();
- // Retrieve film model
- const filmModelType& filmModel =
- db().time().lookupObject<filmModelType>(filmRegionName_);
-
+ // The film model
const label filmPatchi = filmModel.regionPatchID(patchi);
scalarField alphaFilm = filmModel.alpha().boundaryField()[filmPatchi];
@@ -160,10 +163,7 @@ void Foam::filmPyrolysisVelocityCoupledFvPatchVectorField::updateCoeffs()
vectorField UFilm = filmModel.Us().boundaryField()[filmPatchi];
filmModel.toPrimary(filmPatchi, UFilm);
- // Retrieve pyrolysis model
- const pyrModelType& pyrModel =
- db().time().lookupObject<pyrModelType>(pyrolysisRegionName_);
-
+ // The pyrolysis model
const label pyrPatchi = pyrModel.regionPatchID(patchi);
scalarField phiPyr = pyrModel.phiGas().boundaryField()[pyrPatchi];
diff --git a/src/regionModels/regionModel/regionModel/regionModelI.H b/src/regionModels/regionModel/regionModel/regionModelI.H
index b841f0165f663db94c52af17bd8b243a67752bb2..39c0c11b5b917689953ed42d87c20bbe55b533e8 100644
--- a/src/regionModels/regionModel/regionModel/regionModelI.H
+++ b/src/regionModels/regionModel/regionModel/regionModelI.H
@@ -60,14 +60,16 @@ inline const Foam::word& Foam::regionModels::regionModel::modelName() const
inline const Foam::fvMesh& Foam::regionModels::regionModel::regionMesh() const
{
- if (time_.foundObject<fvMesh>(regionName_))
+ const fvMesh* regionPtr = time_.findObject<fvMesh>(regionName_);
+
+ if (regionPtr)
{
- return time_.lookupObject<fvMesh>(regionName_);
+ return *regionPtr;
}
else if (!regionMeshPtr_.valid())
{
FatalErrorInFunction
- << "Region mesh not available" << abort(FatalError);
+ << "Region mesh not available" << abort(FatalError);
}
return *regionMeshPtr_;
@@ -76,17 +78,16 @@ inline const Foam::fvMesh& Foam::regionModels::regionModel::regionMesh() const
inline Foam::fvMesh& Foam::regionModels::regionModel::regionMesh()
{
- if (time_.foundObject<fvMesh>(regionName_))
+ fvMesh* regionPtr = time_.getObjectPtr<fvMesh>(regionName_);
+
+ if (regionPtr)
{
- return const_cast<fvMesh&>
- (
- time_.lookupObject<fvMesh>(regionName_)
- );
+ return *regionPtr;
}
else if (!regionMeshPtr_.valid())
{
FatalErrorInFunction
- << "Region mesh not available" << abort(FatalError);
+ << "Region mesh not available" << abort(FatalError);
}
return *regionMeshPtr_;
diff --git a/src/regionModels/regionModel/regionModel/regionModelTemplates.C b/src/regionModels/regionModel/regionModel/regionModelTemplates.C
index a1ef447e499d5a8985bfd4a7cbe25911792550db..9813f9f8e39ba79798bca5360cef3cb4e86b56e1 100644
--- a/src/regionModels/regionModel/regionModel/regionModelTemplates.C
+++ b/src/regionModels/regionModel/regionModel/regionModelTemplates.C
@@ -87,15 +87,7 @@ Foam::regionModels::regionModel::mapRegionPatchField
{
const polyPatch& p = regionMesh().boundaryMesh()[regionPatchi];
- return
- tmp<Field<Type>>
- (
- new Field<Type>
- (
- p.size(),
- Zero
- )
- );
+ return tmp<Field<Type>>::New(p.size(), Zero);
}
}
@@ -143,15 +135,7 @@ Foam::regionModels::regionModel::mapRegionPatchInternalField
{
const polyPatch& p = regionMesh().boundaryMesh()[regionPatchi];
- return
- tmp<Field<Type>>
- (
- new Field<Type>
- (
- p.size(),
- Zero
- )
- );
+ return tmp<Field<Type>>::New(p.size(), Zero);
}
}
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
index f468aff4c6b603b75ae3a9dc12aae64d9c4c41c8..3d417419e44b17d19b9d16776869d5859b4ccf2c 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/alphatFilmWallFunction/alphatFilmWallFunctionFvPatchScalarField.C
@@ -142,27 +142,27 @@ void alphatFilmWallFunctionFvPatchScalarField::updateCoeffs()
return;
}
- typedef regionModels::surfaceFilmModels::surfaceFilmRegionModel modelType;
+ const auto* filmModelPtr = db().time().findObject
+ <regionModels::surfaceFilmModels::surfaceFilmRegionModel>
+ (filmRegionName_);
- // Since we're inside initEvaluate/evaluate there might be processor
- // comms underway. Change the tag we use.
- int oldTag = UPstream::msgType();
- UPstream::msgType() = oldTag+1;
-
- bool foundFilm = db().time().foundObject<modelType>(filmRegionName_);
-
- if (!foundFilm)
+ if (!filmModelPtr)
{
// Do nothing on construction - film model doesn't exist yet
return;
}
+ const auto& filmModel = *filmModelPtr;
+
+
+ // Since we're inside initEvaluate/evaluate there might be processor
+ // comms underway. Change the tag we use.
+ int oldTag = UPstream::msgType();
+ UPstream::msgType() = oldTag+1;
+
const label patchi = patch().index();
// Retrieve phase change mass from surface film model
- const modelType& filmModel =
- db().time().lookupObject<modelType>(filmRegionName_);
-
const label filmPatchi = filmModel.regionPatchID(patchi);
tmp<volScalarField> mDotFilm(filmModel.primaryMassTrans());
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
index 4b733d82680bc8559d721b6ac296d57b2f2e9289..b17d6a9ac8be6c1bb94b3324db52dca1d6459510 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/wallFunctions/nutkFilmWallFunction/nutkFilmWallFunctionFvPatchScalarField.C
@@ -48,14 +48,14 @@ tmp<scalarField> nutkFilmWallFunctionFvPatchScalarField::calcUTau
const scalarField& magGradU
) const
{
- tmp<scalarField> tuTau(new scalarField(patch().size(), 0.0));
+ tmp<scalarField> tuTau(new scalarField(patch().size(), Zero));
scalarField& uTau = tuTau.ref();
- typedef regionModels::surfaceFilmModels::surfaceFilmRegionModel modelType;
+ const auto* filmModelPtr = db().time().findObject
+ <regionModels::surfaceFilmModels::surfaceFilmRegionModel>
+ (filmRegionName_);
- bool foundFilm = db().time().foundObject<modelType>(filmRegionName_);
-
- if (!foundFilm)
+ if (!filmModelPtr)
{
// Do nothing on construction - film model doesn't exist yet
return tuTau;
@@ -64,8 +64,7 @@ tmp<scalarField> nutkFilmWallFunctionFvPatchScalarField::calcUTau
const label patchi = patch().index();
// Retrieve phase change mass from surface film model
- const modelType& filmModel =
- db().time().lookupObject<modelType>(filmRegionName_);
+ const auto& filmModel = *filmModelPtr;
const label filmPatchi = filmModel.regionPatchID(patchi);
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
index b857ed3fae745baa3947dab403130998c0eee41e..0f20bdc9e03e620019abcbdc0980620ef001fc3c 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/filmThermoModel/liquidFilmThermo/liquidFilmThermo.C
@@ -78,19 +78,23 @@ void liquidFilmThermo::initLiquid(const dictionary& dict)
dict.readEntry("liquid", name_);
- if (filmModel_.primaryMesh().foundObject<SLGThermo>("SLGThermo"))
+ const SLGThermo* thermoPtr =
+ filmModel_.primaryMesh().findObject<SLGThermo>("SLGThermo");
+
+ if (thermoPtr)
{
- // retrieve from film thermo
+ // Retrieve from film thermo
ownLiquid_ = false;
- const SLGThermo& thermo =
- filmModel_.primaryMesh().lookupObject<SLGThermo>("SLGThermo");
- label id = thermo.liquidId(name_);
+ const SLGThermo& thermo = *thermoPtr;
+
+ const label id = thermo.liquidId(name_);
+
liquidPtr_ = &thermo.liquids().properties()[id];
}
else
{
- // new liquid create
+ // New liquid create
ownLiquid_ = true;
liquidPtr_ =
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
index 69f971030ea1a4cc419b85f4dc97b08713fc48d1..87a847f2470f3c3e6b127c6be42e3698d0932ef8 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurface.C
@@ -52,27 +52,22 @@ void Foam::sampledIsoSurface::getIsoFields() const
// Get volField
// ~~~~~~~~~~~~
- if (fvm.foundObject<volScalarField>(isoField_))
+ volFieldPtr_ = fvm.getObjectPtr<volScalarField>(isoField_);
+
+ if (volFieldPtr_)
{
- if (debug)
- {
- InfoInFunction
- << "Lookup volField " << isoField_ << endl;
- }
+ DebugInFunction
+ << "Lookup volField " << isoField_ << endl;
+
storedVolFieldPtr_.clear();
- volFieldPtr_ = &fvm.lookupObject<volScalarField>(isoField_);
}
else
{
// Bit of a hack. Read field and store.
- if (debug)
- {
- InfoInFunction
- << "Checking " << isoField_
- << " for same time " << fvm.time().timeName()
- << endl;
- }
+ DebugInFunction
+ << "Checking " << isoField_
+ << " for same time " << fvm.time().timeName() << endl;
if
(
@@ -80,13 +75,9 @@ void Foam::sampledIsoSurface::getIsoFields() const
|| (fvm.time().timeName() != storedVolFieldPtr_().instance())
)
{
- if (debug)
- {
- InfoInFunction
- << "Reading volField " << isoField_
- << " from time " << fvm.time().timeName()
- << endl;
- }
+ DebugInFunction
+ << "Reading volField " << isoField_
+ << " from time " << fvm.time().timeName() << endl;
IOobject vfHeader
(
@@ -141,61 +132,45 @@ void Foam::sampledIsoSurface::getIsoFields() const
+ isoField_
+ ')';
- if (fvm.foundObject<pointScalarField>(pointFldName))
+
+ pointFieldPtr_ = fvm.getObjectPtr<pointScalarField>(pointFldName);
+
+ if (pointFieldPtr_)
{
- if (debug)
- {
- InfoInFunction
- << "lookup pointField " << pointFldName << endl;
- }
- const pointScalarField& pfld = fvm.lookupObject<pointScalarField>
- (
- pointFldName
- );
+ DebugInFunction
+ << "lookup pointField " << pointFldName << endl;
- if (!pfld.upToDate(*volFieldPtr_))
+ if (!pointFieldPtr_->upToDate(*volFieldPtr_))
{
- if (debug)
- {
- InfoInFunction
- << "updating pointField "
- << pointFldName << endl;
- }
+ DebugInFunction
+ << "updating pointField " << pointFldName << endl;
+
// Update the interpolated value
volPointInterpolation::New(fvm).interpolate
(
*volFieldPtr_,
- const_cast<pointScalarField&>(pfld)
+ const_cast<pointScalarField&>(*pointFieldPtr_)
);
}
-
- pointFieldPtr_ = &pfld;
}
else
{
// Not in registry. Interpolate.
- if (debug)
- {
- InfoInFunction
- << "Checking pointField " << pointFldName
- << " for same time " << fvm.time().timeName()
- << endl;
- }
+ DebugInFunction
+ << "creating pointField " << pointFldName << endl;
// Interpolate without cache. Note that we're registering it
// below so next time round it goes into the condition
// above.
- tmp<pointScalarField> tpfld
- (
+ pointFieldPtr_ =
volPointInterpolation::New(fvm).interpolate
(
*volFieldPtr_,
pointFldName,
false
- )
- );
- pointFieldPtr_ = tpfld.ptr();
+ ).ptr();
+
const_cast<pointScalarField*>(pointFieldPtr_)->store();
}
@@ -212,17 +187,13 @@ void Foam::sampledIsoSurface::getIsoFields() const
}
- if (debug)
- {
- InfoInFunction
- << "volField " << volFieldPtr_->name()
- << " min:" << min(*volFieldPtr_).value()
- << " max:" << max(*volFieldPtr_).value() << endl;
- InfoInFunction
- << "pointField " << pointFieldPtr_->name()
- << " min:" << gMin(pointFieldPtr_->primitiveField())
- << " max:" << gMax(pointFieldPtr_->primitiveField()) << endl;
- }
+ DebugInFunction
+ << "volField " << volFieldPtr_->name()
+ << " min:" << min(*volFieldPtr_).value()
+ << " max:" << max(*volFieldPtr_).value() << nl
+ << "pointField " << pointFieldPtr_->name()
+ << " min:" << gMin(pointFieldPtr_->primitiveField())
+ << " max:" << gMax(pointFieldPtr_->primitiveField()) << endl;
}
else
{
@@ -231,24 +202,20 @@ void Foam::sampledIsoSurface::getIsoFields() const
// Either lookup on the submesh or subset the whole-mesh volField
- if (subFvm.foundObject<volScalarField>(isoField_))
+ volSubFieldPtr_ = subFvm.getObjectPtr<volScalarField>(isoField_);
+
+ if (volSubFieldPtr_)
{
- if (debug)
- {
- InfoInFunction
- << "Sub-mesh lookup volField "
- << isoField_ << endl;
- }
+ DebugInFunction
+ << "Sub-mesh lookup volField " << isoField_ << endl;
+
storedVolSubFieldPtr_.clear();
- volSubFieldPtr_ = &subFvm.lookupObject<volScalarField>(isoField_);
}
else
{
- if (debug)
- {
- InfoInFunction
- << "Sub-setting volField " << isoField_ << endl;
- }
+ DebugInFunction
+ << "Sub-setting volField " << isoField_ << endl;
+
storedVolSubFieldPtr_.reset
(
subMeshPtr_().interpolate
@@ -270,53 +237,40 @@ void Foam::sampledIsoSurface::getIsoFields() const
+ volSubFieldPtr_->name()
+ ')';
- if (subFvm.foundObject<pointScalarField>(pointFldName))
+
+ pointFieldPtr_ = subFvm.getObjectPtr<pointScalarField>(pointFldName);
+
+ if (pointFieldPtr_)
{
- if (debug)
- {
- InfoInFunction
- << "Sub-mesh lookup pointField " << pointFldName << endl;
- }
- const pointScalarField& pfld = subFvm.lookupObject<pointScalarField>
- (
- pointFldName
- );
+ DebugInFunction
+ << "Sub-mesh lookup pointField " << pointFldName << endl;
- if (!pfld.upToDate(*volSubFieldPtr_))
+ if (!pointFieldPtr_->upToDate(*volSubFieldPtr_))
{
- if (debug)
- {
- Info<< "sampledIsoSurface::getIsoFields() :"
- << " updating submesh pointField "
- << pointFldName << endl;
- }
+ DebugInFunction
+ << "Updating submesh pointField " << pointFldName << endl;
+
// Update the interpolated value
volPointInterpolation::New(subFvm).interpolate
(
*volSubFieldPtr_,
- const_cast<pointScalarField&>(pfld)
+ const_cast<pointScalarField&>(*pointFieldPtr_)
);
}
-
- pointFieldPtr_ = &pfld;
}
else
{
- if (debug)
- {
- InfoInFunction
- << "Interpolating submesh volField "
- << volSubFieldPtr_->name()
- << " to get submesh pointField " << pointFldName << endl;
- }
- tmp<pointScalarField> tpfld
- (
+ DebugInFunction
+ << "Interpolating submesh volField "
+ << volSubFieldPtr_->name()
+ << " to get submesh pointField " << pointFldName << endl;
+
+ pointSubFieldPtr_ =
volPointInterpolation::New
(
subFvm
- ).interpolate(*volSubFieldPtr_)
- );
- pointSubFieldPtr_ = tpfld.ptr();
+ ).interpolate(*volSubFieldPtr_).ptr();
+
const_cast<pointScalarField*>(pointSubFieldPtr_)->store();
}
@@ -333,19 +287,15 @@ void Foam::sampledIsoSurface::getIsoFields() const
}
- if (debug)
- {
- InfoInFunction
- << "volSubField "
- << volSubFieldPtr_->name()
- << " min:" << min(*volSubFieldPtr_).value()
- << " max:" << max(*volSubFieldPtr_).value() << endl;
- InfoInFunction
- << "pointSubField "
- << pointSubFieldPtr_->name()
- << " min:" << gMin(pointSubFieldPtr_->primitiveField())
- << " max:" << gMax(pointSubFieldPtr_->primitiveField()) << endl;
- }
+ DebugInFunction
+ << "volSubField "
+ << volSubFieldPtr_->name()
+ << " min:" << min(*volSubFieldPtr_).value()
+ << " max:" << max(*volSubFieldPtr_).value() << nl
+ << "pointSubField "
+ << pointSubFieldPtr_->name()
+ << " min:" << gMin(pointSubFieldPtr_->primitiveField())
+ << " max:" << gMax(pointSubFieldPtr_->primitiveField()) << endl;
}
}
diff --git a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
index f51b7f1ccff150ede1f4d724c25d6e138480a7c0..b5ba01ada1a866a9459fdb685efc598fe17b0029 100644
--- a/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
+++ b/src/sampling/sampledSurface/isoSurface/sampledIsoSurfaceCell.C
@@ -64,7 +64,7 @@ bool Foam::sampledIsoSurfaceCell::updateGeometry() const
// Use field from database, or try to read it in
- const auto* cellFldPtr = fvm.lookupObjectPtr<volScalarField>(isoField_);
+ const auto* cellFldPtr = fvm.findObject<volScalarField>(isoField_);
if (debug)
{
diff --git a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
index 82e158111ba48893a1488e13f565dee8f14c99c6..a40794543015bb46d2fc347086d59844466a1c1f 100644
--- a/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
+++ b/src/sampling/sampledSurface/thresholdCellFaces/sampledThresholdCellFaces.C
@@ -61,7 +61,7 @@ bool Foam::sampledThresholdCellFaces::updateGeometry() const
// Use volField from database, or try to read it in
- const auto* cellFldPtr = fvm.lookupObjectPtr<volScalarField>(fieldName_);
+ const auto* cellFldPtr = fvm.findObject<volScalarField>(fieldName_);
if (debug)
{
diff --git a/src/sampling/surfMeshSample/distanceSurface/surfMeshSampleDistanceSurfaceTemplates.C b/src/sampling/surfMeshSample/distanceSurface/surfMeshSampleDistanceSurfaceTemplates.C
index 1a179a08d3d3021392ac82ba9968e3d30203c837..7e1834f5d51f4efbed13816971663bcdd4a29f3e 100644
--- a/src/sampling/surfMeshSample/distanceSurface/surfMeshSampleDistanceSurfaceTemplates.C
+++ b/src/sampling/surfMeshSample/distanceSurface/surfMeshSampleDistanceSurfaceTemplates.C
@@ -53,7 +53,7 @@ bool Foam::surfMeshSampleDistanceSurface::sampleType
{
typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
- const auto* volFldPtr = mesh().lookupObjectPtr<VolFieldType>(fieldName);
+ const auto* volFldPtr = mesh().findObject<VolFieldType>(fieldName);
if (!volFldPtr)
{
diff --git a/src/sampling/surfMeshSample/plane/surfMeshSamplePlaneTemplates.C b/src/sampling/surfMeshSample/plane/surfMeshSamplePlaneTemplates.C
index 2158020021a2c5b1d3cdc941e22c2bef376e759f..fbcd7a6441131b64ff80d953a0894fd4a57deba0 100644
--- a/src/sampling/surfMeshSample/plane/surfMeshSamplePlaneTemplates.C
+++ b/src/sampling/surfMeshSample/plane/surfMeshSamplePlaneTemplates.C
@@ -53,7 +53,7 @@ bool Foam::surfMeshSamplePlane::sampleType
{
typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
- const auto* volFldPtr = mesh().lookupObjectPtr<VolFieldType>(fieldName);
+ const auto* volFldPtr = mesh().findObject<VolFieldType>(fieldName);
if (!volFldPtr)
{
diff --git a/src/sampling/surfMeshSample/surfMeshSample/surfMeshSampleTemplates.C b/src/sampling/surfMeshSample/surfMeshSample/surfMeshSampleTemplates.C
index 316d3384d13c5bfe0ca6207f27691919ca67e69f..95d969da542255cfda2f7a08694f31359da2cef0 100644
--- a/src/sampling/surfMeshSample/surfMeshSample/surfMeshSampleTemplates.C
+++ b/src/sampling/surfMeshSample/surfMeshSample/surfMeshSampleTemplates.C
@@ -76,7 +76,7 @@ Foam::surfMeshSample::getOrCreateSurfField
const surfMesh& surf = surface();
const word& fieldName = vField.name();
- SurfFieldType* ptr = surf.lookupObjectRefPtr<SurfFieldType>(fieldName);
+ SurfFieldType* ptr = surf.getObjectPtr<SurfFieldType>(fieldName);
if (!ptr)
{
ptr = new SurfFieldType
diff --git a/src/sampling/surfMeshSample/surfMeshSamplers/surfMeshSamplers.C b/src/sampling/surfMeshSample/surfMeshSamplers/surfMeshSamplers.C
index 62ff7b3530c612feafec0438dbd73f79d1a69a71..f51801ae779015fd90d13ef91062e27e6c8d0395 100644
--- a/src/sampling/surfMeshSample/surfMeshSamplers/surfMeshSamplers.C
+++ b/src/sampling/surfMeshSample/surfMeshSamplers/surfMeshSamplers.C
@@ -109,7 +109,7 @@ bool Foam::surfMeshSamplers::add_rhoU(const word& derivedName)
// rhoU = rho * U
- const auto* rhoPtr = mesh_.lookupObjectPtr<volScalarField>("rho");
+ const auto* rhoPtr = mesh_.findObject<volScalarField>("rho");
const volVectorField& U = mesh_.lookupObject<volVectorField>("U");
tmp<volVectorField> tresult;
@@ -152,7 +152,7 @@ bool Foam::surfMeshSamplers::add_pTotal(const word& derivedName)
// pTotal = p + rho * U^2 / 2
- const auto* rhoPtr = mesh_.lookupObjectPtr<volScalarField>("rho");
+ const auto* rhoPtr = mesh_.findObject<volScalarField>("rho");
const volScalarField& p = mesh_.lookupObject<volScalarField>("p");
const volVectorField& U = mesh_.lookupObject<volVectorField>("U");
diff --git a/src/sampling/surfMeshSample/triSurfaceMesh/surfMeshSampleDiscreteTemplates.C b/src/sampling/surfMeshSample/triSurfaceMesh/surfMeshSampleDiscreteTemplates.C
index 78cf386c52147f43a567a4960f4d91f6254d3fb5..d3f120cac49dbf86a44572503ba7e9e7cb76be7b 100644
--- a/src/sampling/surfMeshSample/triSurfaceMesh/surfMeshSampleDiscreteTemplates.C
+++ b/src/sampling/surfMeshSample/triSurfaceMesh/surfMeshSampleDiscreteTemplates.C
@@ -60,7 +60,7 @@ bool Foam::surfMeshSampleDiscrete::sampleType
typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
const auto* volFldPtr =
- SurfaceSource::mesh().lookupObjectPtr<VolFieldType>(fieldName);
+ SurfaceSource::mesh().findObject<VolFieldType>(fieldName);
if (!volFldPtr)
{
diff --git a/src/sampling/surface/triSurfaceMesh/discreteSurfaceTemplates.C b/src/sampling/surface/triSurfaceMesh/discreteSurfaceTemplates.C
index 3fce29d212a0e1d6d24ed8da4cb5de68c38b86e6..eba3ec1194b0bbf0f79401fa5e46cf3b4f68c373 100644
--- a/src/sampling/surface/triSurfaceMesh/discreteSurfaceTemplates.C
+++ b/src/sampling/surface/triSurfaceMesh/discreteSurfaceTemplates.C
@@ -40,7 +40,7 @@ bool Foam::discreteSurface::sampleType
typedef DimensionedField<Type, surfGeoMesh> SurfFieldType;
typedef IOField<Type> TmpFieldType;
- const auto* volFldPtr = mesh().lookupObjectPtr<VolFieldType>(fieldName);
+ const auto* volFldPtr = mesh().findObject<VolFieldType>(fieldName);
if (!volFldPtr)
{
@@ -57,7 +57,7 @@ bool Foam::discreteSurface::sampleType
{
const surfMesh& surf = dynamicCast<const surfMesh>(obr);
- SurfFieldType* ptr = surf.lookupObjectRefPtr<SurfFieldType>(fieldName);
+ SurfFieldType* ptr = surf.getObjectPtr<SurfFieldType>(fieldName);
if (!ptr)
{
// Doesn't exist or the wrong type
@@ -83,7 +83,7 @@ bool Foam::discreteSurface::sampleType
}
else
{
- TmpFieldType* ptr = obr.lookupObjectRefPtr<TmpFieldType>(fieldName);
+ TmpFieldType* ptr = obr.getObjectPtr<TmpFieldType>(fieldName);
if (!ptr)
{
// Doesn't exist or the wrong type
@@ -121,7 +121,7 @@ Foam::discreteSurface::sampleType
{
typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
- const auto* volFldPtr = mesh().lookupObjectPtr<VolFieldType>(fieldName);
+ const auto* volFldPtr = mesh().findObject<VolFieldType>(fieldName);
if (volFldPtr)
{
diff --git a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
index 123b128b9234b14614e8e217a4f458d7995e1634..4031fb276437ba832afcb34dc144330371969bbb 100644
--- a/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
+++ b/src/sixDoFRigidBodyMotion/pointPatchFields/derived/uncoupledSixDoFRigidBodyDisplacement/uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField.C
@@ -165,7 +165,7 @@ void uncoupledSixDoFRigidBodyDisplacementPointPatchVectorField::updateCoeffs()
if (db().foundObject<uniformDimensionedVectorField>("g"))
{
uniformDimensionedVectorField g =
- db().lookupObject<uniformDimensionedVectorField>("g");
+ db().lookupObject<uniformDimensionedVectorField>("g");
gravity = g.value();
}
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
index 7e376b2f14181fa225b2ec462e7876c4a722c0bc..c5ccced0e023f4ea0c8b6fa54a09b9fccddd1229 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
@@ -147,7 +147,7 @@ bool Foam::fileFormats::VTKsurfaceFormat<Face>::read
for (auto fieldName : { "region", "STLSolidLabeling" })
{
const labelIOField* lptr =
- reader.cellData().lookupObjectPtr<labelIOField>(fieldName);
+ reader.cellData().findObject<labelIOField>(fieldName);
if (lptr)
{
@@ -160,7 +160,7 @@ bool Foam::fileFormats::VTKsurfaceFormat<Face>::read
}
const scalarIOField* sptr =
- reader.cellData().lookupObjectPtr<scalarIOField>(fieldName);
+ reader.cellData().findObject<scalarIOField>(fieldName);
if (sptr)
{
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
index daf961381ff21d4ca389c10221689af7941dfea2..6b29193690e169733490fe8c531d7f8155aa37fc 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
@@ -130,37 +130,31 @@ Foam::volScalarField& Foam::basicThermo::lookupOrConstruct
bool& isOwner
)
{
- const volScalarField* p =
- mesh.objectRegistry::lookupObjectPtr<volScalarField>(name);
+ volScalarField* ptr =
+ mesh.objectRegistry::getObjectPtr<volScalarField>(name);
- isOwner = !p;
+ isOwner = !ptr;
- if (!p)
+ if (!ptr)
{
- volScalarField* fPtr
+ ptr = new volScalarField
(
- new volScalarField
+ IOobject
(
- IOobject
- (
- name,
- mesh.time().timeName(),
- mesh,
- IOobject::MUST_READ,
- IOobject::AUTO_WRITE
- ),
- mesh
- )
+ name,
+ mesh.time().timeName(),
+ mesh,
+ IOobject::MUST_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh
);
// Transfer ownership of this object to the objectRegistry
- fPtr->store(fPtr);
- return *fPtr;
- }
- else
- {
- return const_cast<volScalarField&>(*p);
+ ptr->store(ptr);
}
+
+ return *ptr;
}
@@ -341,30 +335,25 @@ const Foam::basicThermo& Foam::basicThermo::lookupThermo
const fvPatchScalarField& pf
)
{
- if (pf.db().foundObject<basicThermo>(dictName))
+ const basicThermo* thermo = pf.db().findObject<basicThermo>(dictName);
+
+ if (thermo)
{
- return pf.db().lookupObject<basicThermo>(dictName);
+ return *thermo;
}
- else
- {
- HashTable<const basicThermo*> thermos =
- pf.db().lookupClass<basicThermo>();
- for
+ HashTable<const basicThermo*> thermos =
+ pf.db().lookupClass<basicThermo>();
+
+ forAllConstIters(thermos, iter)
+ {
+ if
(
- HashTable<const basicThermo*>::iterator iter = thermos.begin();
- iter != thermos.end();
- ++iter
+ &(iter()->he().internalField())
+ == &(pf.internalField())
)
{
- if
- (
- &(iter()->he().internalField())
- == &(pf.internalField())
- )
- {
- return *iter();
- }
+ return *iter();
}
}
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
index c5a782b23c54e873b2aacf1f4f4c1c8c3e42ed9a..2a414eec941f1770fd797decb80eb3ec7de7cef0 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/greyMeanAbsorptionEmission/greyMeanAbsorptionEmission.C
@@ -118,58 +118,53 @@ Foam::radiation::greyMeanAbsorptionEmission::greyMeanAbsorptionEmission
// look-up table and save the corresponding indices of the look-up table
label j = 0;
- forAllConstIter(HashTable<label>, speciesNames_, iter)
+ forAllConstIters(speciesNames_, iter)
{
+ const word& specieName = iter.key();
+ const label index = iter.object();
+
+ volScalarField* fldPtr = mesh.getObjectPtr<volScalarField>(specieName);
+
if (!lookUpTablePtr_.empty())
{
- if (lookUpTablePtr_().found(iter.key()))
+ if (lookUpTablePtr_().found(specieName))
{
- label index = lookUpTablePtr_().findFieldIndex(iter.key());
+ const label fieldIndex =
+ lookUpTablePtr_().findFieldIndex(specieName);
- Info<< "specie: " << iter.key() << " found on look-up table "
- << " with index: " << index << endl;
+ Info<< "specie: " << specieName << " found on look-up table "
+ << " with index: " << fieldIndex << endl;
- specieIndex_[iter()] = index;
+ specieIndex_[index] = fieldIndex;
}
- else if (mesh.foundObject<volScalarField>(iter.key()))
+ else if (fldPtr)
{
- volScalarField& Y =
- const_cast<volScalarField&>
- (
- mesh.lookupObject<volScalarField>(iter.key())
- );
- Yj_.set(j, &Y);
- specieIndex_[iter()] = 0;
+ Yj_.set(j, fldPtr);
+ specieIndex_[index] = 0;
j++;
Info<< "specie: " << iter.key() << " is being solved" << endl;
}
else
{
FatalErrorInFunction
- << "specie: " << iter.key()
+ << "specie: " << specieName
<< " is neither in look-up table: "
<< lookUpTablePtr_().tableName()
<< " nor is being solved" << nl
<< exit(FatalError);
}
}
- else if (mesh.foundObject<volScalarField>(iter.key()))
+ else if (fldPtr)
{
- volScalarField& Y =
- const_cast<volScalarField&>
- (
- mesh.lookupObject<volScalarField>(iter.key())
- );
-
- Yj_.set(j, &Y);
- specieIndex_[iter()] = 0;
+ Yj_.set(j, fldPtr);
+ specieIndex_[index] = 0;
j++;
}
else
{
FatalErrorInFunction
- << " there is not lookup table and the specie" << nl
- << iter.key() << nl
+ << "There is no lookup table and the specie" << nl
+ << specieName << nl
<< " is not found " << nl
<< exit(FatalError);
}
@@ -292,10 +287,11 @@ Foam::radiation::greyMeanAbsorptionEmission::ECont(const label bandI) const
)
);
- if (mesh_.foundObject<volScalarField>("Qdot"))
+ const volScalarField* QdotPtr = mesh_.findObject<volScalarField>("Qdot");
+
+ if (QdotPtr)
{
- const volScalarField& Qdot =
- mesh_.lookupObject<volScalarField>("Qdot");
+ const volScalarField& Qdot = *QdotPtr;
if (Qdot.dimensions() == dimEnergy/dimTime)
{
diff --git a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
index 1d7dfddf787f674fb5e4ec7d75ac1923802753f9..353f3cd97342525cf22bb671b2aa93521492b55e 100644
--- a/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
+++ b/src/thermophysicalModels/radiation/submodels/absorptionEmissionModel/wideBandAbsorptionEmission/wideBandAbsorptionEmission.C
@@ -132,48 +132,53 @@ Foam::radiation::wideBandAbsorptionEmission::wideBandAbsorptionEmission
// look-up table and save the corresponding indices of the look-up table
label j = 0;
- forAllConstIter(HashTable<label>, speciesNames_, iter)
+ forAllConstIters(speciesNames_, iter)
{
+ const word& specieName = iter.key();
+ const label index = iter.object();
+
+ volScalarField* fldPtr = mesh.getObjectPtr<volScalarField>(specieName);
+
if (!lookUpTablePtr_.empty())
{
- if (lookUpTablePtr_().found(iter.key()))
+ if (lookUpTablePtr_().found(specieName))
{
- const label index =
- lookUpTablePtr_().findFieldIndex(iter.key());
+ const label fieldIndex =
+ lookUpTablePtr_().findFieldIndex(specieName);
- Info<< "specie: " << iter.key() << " found on look-up table "
- << " with index: " << index << endl;
+ Info<< "specie: " << specieName << " found on look-up table "
+ << " with index: " << fieldIndex << endl;
- specieIndex_[iter()] = index;
+ specieIndex_[index] = fieldIndex;
}
- else if (mesh.foundObject<volScalarField>(iter.key()))
+ else if (fldPtr)
{
- Yj_.set(j, &mesh.lookupObjectRef<volScalarField>(iter.key()));
- specieIndex_[iter()] = 0;
+ Yj_.set(j, fldPtr);
+ specieIndex_[index] = 0;
j++;
- Info<< "specie: " << iter.key() << " is being solved" << endl;
+ Info<< "specie: " << specieName << " is being solved" << endl;
}
else
{
FatalErrorInFunction
- << "specie: " << iter.key()
+ << "specie: " << specieName
<< " is neither in look-up table: "
<< lookUpTablePtr_().tableName()
<< " nor is being solved" << nl
<< exit(FatalError);
}
}
- else if (mesh.foundObject<volScalarField>(iter.key()))
+ else if (fldPtr)
{
- Yj_.set(j, &mesh.lookupObjectRef<volScalarField>(iter.key()));
- specieIndex_[iter()] = 0;
+ Yj_.set(j, fldPtr);
+ specieIndex_[index] = 0;
j++;
}
else
{
FatalErrorInFunction
- << " there is no lookup table and the specie" << nl
- << iter.key() << nl
+ << "There is no lookup table and the specie" << nl
+ << specieName << nl
<< " is not found " << nl
<< exit(FatalError);
@@ -300,10 +305,11 @@ Foam::radiation::wideBandAbsorptionEmission::ECont(const label bandi) const
)
);
- if (mesh().foundObject<volScalarField>("Qdot"))
+ const volScalarField* QdotPtr = mesh().findObject<volScalarField>("Qdot");
+
+ if (QdotPtr)
{
- const volScalarField& Qdot =
- mesh().lookupObject<volScalarField>("Qdot");
+ const volScalarField& Qdot = *QdotPtr;
if (Qdot.dimensions() == dimEnergy/dimTime)
{
diff --git a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C
index 4339e232435cf6ae0170f251c4eeaaf856356ee8..3c645f48e125c6449752ffc37558104bd7934b37 100644
--- a/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C
+++ b/src/thermophysicalModels/reactionThermo/functionObjects/moleFractions/moleFractions.C
@@ -64,12 +64,12 @@ Foam::moleFractions<ThermoType>::moleFractions
:
fvMeshFunctionObject(name, runTime, dict)
{
- if (mesh_.foundObject<ThermoType>(basicThermo::dictName))
- {
- const ThermoType& thermo =
- mesh_.lookupObject<ThermoType>(basicThermo::dictName);
+ const ThermoType* thermo =
+ mesh_.findObject<ThermoType>(basicThermo::dictName);
- const PtrList<volScalarField>& Y = thermo.composition().Y();
+ if (thermo)
+ {
+ const PtrList<volScalarField>& Y = thermo->composition().Y();
X_.setSize(Y.size());
diff --git a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
index a0e5e284a69b7ed77bcd10c8151d2ff79f5c108c..316e1367e07ab1f43b56212fece071e2ca876e94 100644
--- a/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
+++ b/src/thermophysicalModels/thermophysicalPropertiesFvPatchFields/liquidProperties/humidityTemperatureCoupledMixed/humidityTemperatureCoupledMixedFvPatchScalarField.C
@@ -93,33 +93,28 @@ Foam::humidityTemperatureCoupledMixedFvPatchScalarField::thicknessField
const fvMesh& mesh
)
{
- if (!mesh.foundObject<volScalarField>(fieldName))
+ volScalarField* ptr = mesh.getObjectPtr<volScalarField>(fieldName);
+
+ if (!ptr)
{
- tmp<volScalarField> tField
+ ptr = new volScalarField
(
- new volScalarField
+ IOobject
(
- IOobject
- (
- fieldName,
- mesh.time().timeName(),
- mesh,
- IOobject::NO_READ,
- IOobject::AUTO_WRITE
- ),
+ fieldName,
+ mesh.time().timeName(),
mesh,
- dimensionedScalar(dimLength, Zero)
- )
+ IOobject::NO_READ,
+ IOobject::AUTO_WRITE
+ ),
+ mesh,
+ dimensionedScalar(dimLength, Zero)
);
- tField.ptr()->store();
+ ptr->store();
}
- return
- const_cast<volScalarField&>
- (
- mesh.lookupObject<volScalarField>(fieldName)
- );
+ return *ptr;
}
diff --git a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C
index fd8b9d8a34e0d08c98e3470860a62a94d3e264e8..5aad9163c9311dcbf46fb0e98ad98b2257557e1a 100644
--- a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C
+++ b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMesh.C
@@ -141,11 +141,10 @@ bool Foam::rawTopoChangerFvMesh::update()
// Special handling for phi: set unmapped faces to recreated phi
Info<< "rawTopoChangerFvMesh :"
<< " recreating phi for unmapped boundary values." << endl;
+
const volVectorField& U = lookupObject<volVectorField>("U");
- surfaceScalarField& phi = const_cast<surfaceScalarField&>
- (
- lookupObject<surfaceScalarField>("phi")
- );
+ surfaceScalarField& phi = lookupObjectRef<surfaceScalarField>("phi");
+
setUnmappedValues
(
phi,
diff --git a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C
index bd52ee04aeb0f79447beaeeb593b2a39fd2f41dd..30a8a1c26d6ffe6f2bd1b12761c23b73d2779c97 100644
--- a/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C
+++ b/src/topoChangerFvMesh/rawTopoChangerFvMesh/rawTopoChangerFvMeshTemplates.C
@@ -75,10 +75,7 @@ void Foam::rawTopoChangerFvMesh::zeroUnmappedValues
{
//Pout<< "Checking field " << fldNames[i] << endl;
- FieldType& fld = const_cast<FieldType&>
- (
- lookupObject<FieldType>(fldNames[i])
- );
+ FieldType& fld = lookupObjectRef<FieldType>(fldNames[i]);
setUnmappedValues
(
diff --git a/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.C b/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.C
index 48f1373385c2f212f27fd87cea754ac9ec077748..f3931ab60604a2b84b64c4347f8c54a2f076cbb2 100644
--- a/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.C
+++ b/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.C
@@ -60,12 +60,11 @@ Foam::viscosityModels::Arrhenius<ViscousModel>::Arrhenius
fieldName_(ArrheniusCoeffs_.lookupOrDefault<word>("field","T")),
mesh_(U.mesh())
{
- const volScalarField* fieldPtr =
- mesh_.lookupObjectPtr<volScalarField>(fieldName_);
+ const auto* fldPtr = mesh_.findObject<volScalarField>(fieldName_);
- if (fieldPtr)
+ if (fldPtr)
{
- this->nu_ *= calcNu(*fieldPtr);
+ this->nu_ *= calcNu(*fldPtr);
}
}
diff --git a/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.H b/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.H
index 57ed3f2a102ffa6e6c749654d6ea1520e595c939..da6e7082a1a597d11678d8c5ebef1a47aed2fcf9 100644
--- a/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.H
+++ b/src/transportModels/incompressible/viscosityModels/Arrhenius/Arrhenius.H
@@ -113,12 +113,11 @@ public:
{
ViscousModel::correct();
- const volScalarField* fieldPtr =
- mesh_.lookupObjectPtr<volScalarField>(fieldName_);
+ const auto* fldPtr = mesh_.findObject<volScalarField>(fieldName_);
- if (fieldPtr)
+ if (fldPtr)
{
- this->nu_ *= calcNu(*fieldPtr);
+ this->nu_ *= calcNu(*fldPtr);
}
}
diff --git a/src/waveModels/waveModel/waveModelNew.C b/src/waveModels/waveModel/waveModelNew.C
index e697104508070505029f46298d5ddc36e4de1391..79ca31f1e34c202573a0c56e06de2fc9ea0734d4 100644
--- a/src/waveModels/waveModel/waveModelNew.C
+++ b/src/waveModels/waveModel/waveModelNew.C
@@ -87,15 +87,16 @@ Foam::tmp<Foam::waveModel> Foam::waveModel::lookupOrCreate
{
const word modelName = waveModel::modelName(patch.name());
- if (!mesh.foundObject<waveModel>(modelName))
+ waveModel* modelPtr = mesh.getObjectPtr<waveModel>(modelName);
+
+ if (!modelPtr)
{
- autoPtr<waveModel> model(waveModel::New(waveDictName, mesh, patch));
- waveModel* waveModelPtr = model.ptr();
- waveModelPtr->store();
- waveModelPtr->info(Info);
+ modelPtr = waveModel::New(waveDictName, mesh, patch).ptr();
+ modelPtr->store();
+ modelPtr->info(Info);
}
- return mesh.lookupObject<waveModel>(modelName);
+ return *modelPtr;
}
diff --git a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess
index 58dceab3f1d820dbac36b99cf6a8c4edbc7b99ae..aec89cfee61a3f65f0346e1b2d7e2c3c83123f37 100644
--- a/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess
+++ b/tutorials/compressible/rhoPimpleAdiabaticFoam/rutlandVortex2D/system/preProcess
@@ -38,8 +38,7 @@ functions
scalar gamma = 1.4;
scalar A = -0.3*D*UInf;
const dimensionedScalar rhoRef("rhoRef", dimDensity, 1);
- const volScalarField& rho =
- mesh().lookupObject<volScalarField>("rho");
+ const auto& rho = mesh().lookupObject<volScalarField>("rho");
const vectorField& C = mesh().C();
const scalarField x(C.component(0));
@@ -47,19 +46,15 @@ functions
const scalar r2 = sqr(0.5*D/(Foam::sqrt(Foam::log(10.0))));
const scalarField Psi(A*exp(-0.5/r2*(sqr(x) + sqr(y))));
- volVectorField* Uptr =
- mesh().lookupObjectRefPtr<volVectorField>("U");
- volScalarField* pPtr =
- mesh().lookupObjectRefPtr<volScalarField>("p");
- volScalarField* TPtr =
- mesh().lookupObjectRefPtr<volScalarField>("T");
-
+ auto* Uptr = mesh().getObjectPtr<volVectorField>("U");
+ auto* pPtr = mesh().getObjectPtr<volScalarField>("p");
+ auto* TPtr = mesh().getObjectPtr<volScalarField>("T");
if (Uptr && pPtr && TPtr)
{
- volVectorField& U = *Uptr;
- volScalarField& p = *pPtr;
- volScalarField& T = *TPtr;
+ auto& U = *Uptr;
+ auto& p = *pPtr;
+ auto& T = *TPtr;
vectorField& Uc = U.primitiveFieldRef();
Uc.replace(0, UInf - rhoRef/rho()*Psi/r2*y);