From b19e767b8f8ee7ef75b59cef23af7765cf32240d Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Tue, 21 Sep 2021 20:48:30 +0100
Subject: [PATCH 01/18] ENH: sampledSets - added min,max,average values to the
 results dict

---
 .../sampledSet/sampledSets/sampledSetsTemplates.C   | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C b/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
index 6ffb818ed4..82dad524a2 100644
--- a/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
+++ b/src/sampling/sampledSet/sampledSets/sampledSetsTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2020 OpenCFD Ltd.
+    Copyright (C) 2015-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -139,8 +139,17 @@ Foam::fileName Foam::sampledSets::writeSampleFile
 
     forAll(masterFields, fieldi)
     {
-        valueSetNames[fieldi] = masterFields[fieldi].name();
+        const word& fieldName = masterFields[fieldi].name();
+
+        valueSetNames[fieldi] = fieldName;
         valueSets[fieldi] = &masterFields[fieldi][setI];
+
+        // Set results
+
+        setResult("average(" + fieldName + ")", average(*valueSets[fieldi]));
+        setResult("min(" + fieldName + ")", min(*valueSets[fieldi]));
+        setResult("max(" + fieldName + ")", max(*valueSets[fieldi]));
+        setResult("size(" + fieldName + ")", valueSets[fieldi]->size());
     }
 
     fileName fName

From aeef96251ff3c90287ce457e897427984646bbda Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Tue, 21 Sep 2021 20:51:41 +0100
Subject: [PATCH 02/18] ENH: Refactored stateFunctionObject

- created new functionObjects::properties class derived from IOdictionary
  - replaces raw state IOdictionary owned by functionObjectList
  - state dictionary access/manipulators moved from stateFunctionObject
- stateFunctionObject now acts as a light wrapper around
  functionObjecties::properties
- updated dependent code
---
 src/OpenFOAM/Make/files                       |   1 +
 .../functionObjectList/functionObjectList.C   |  45 +--
 .../functionObjectList/functionObjectList.H   |  27 +-
 .../functionObjectProperties.C                | 308 ++++++++++++++++++
 .../functionObjectProperties.H                | 241 ++++++++++++++
 .../functionObjectPropertiesTemplates.C       | 163 +++++++++
 .../stateFunctionObject/stateFunctionObject.C | 168 ++--------
 .../stateFunctionObject/stateFunctionObject.H |  12 +-
 .../stateFunctionObjectTemplates.C            |  73 +----
 9 files changed, 787 insertions(+), 251 deletions(-)
 create mode 100644 src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectProperties.C
 create mode 100644 src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectProperties.H
 create mode 100644 src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectPropertiesTemplates.C

diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 79cd748121..47a7a41a0d 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -354,6 +354,7 @@ $(dll)/codedBase/codedBase.C
 funcObjs = db/functionObjects
 
 $(funcObjs)/functionObject/functionObject.C
+$(funcObjs)/functionObjectProperties/functionObjectProperties.C
 $(funcObjs)/functionObjectList/functionObjectList.C
 $(funcObjs)/stateFunctionObject/stateFunctionObject.C
 $(funcObjs)/timeFunctionObject/timeFunctionObject.C
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index 4c39aa2759..8aa4168d6d 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -97,13 +97,13 @@ namespace Foam
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
-void Foam::functionObjectList::createStateDict() const
+void Foam::functionObjectList::createPropertiesDict() const
 {
-    // Cannot set the state dictionary on construction since Time has not
+    // Cannot set the properties dictionary on construction since Time has not
     // been fully initialised
-    stateDictPtr_.reset
+    propsDictPtr_.reset
     (
-        new IOdictionary
+        new functionObjects::properties
         (
             IOobject
             (
@@ -412,7 +412,7 @@ Foam::functionObjectList::functionObjectList
     warnings_(),
     time_(runTime),
     parentDict_(parentDict),
-    stateDictPtr_(nullptr),
+    propsDictPtr_(nullptr),
     objectsRegistryPtr_(nullptr),
     execution_(execution),
     updated_(false)
@@ -509,37 +509,38 @@ Foam::autoPtr<Foam::functionObjectList> Foam::functionObjectList::New
 
 Foam::label Foam::functionObjectList::triggerIndex() const
 {
-    return stateDict().getOrDefault<label>("triggerIndex", labelMin);
+    return propsDict().getOrDefault<label>("triggerIndex", labelMin);
 }
 
 
-void Foam::functionObjectList::resetState()
+void Foam::functionObjectList::resetPropertiesDict()
 {
-    // Reset (re-read) the state dictionary
-    stateDictPtr_.reset(nullptr);
-    createStateDict();
+    // Reset (re-read) the properties dictionary
+    propsDictPtr_.reset(nullptr);
+    createPropertiesDict();
 }
 
 
-Foam::IOdictionary& Foam::functionObjectList::stateDict()
+Foam::functionObjects::properties& Foam::functionObjectList::propsDict()
 {
-    if (!stateDictPtr_)
+    if (!propsDictPtr_)
     {
-        createStateDict();
+        createPropertiesDict();
     }
 
-    return *stateDictPtr_;
+    return *propsDictPtr_;
 }
 
 
-const Foam::IOdictionary& Foam::functionObjectList::stateDict() const
+const Foam::functionObjects::properties&
+Foam::functionObjectList::propsDict() const
 {
-    if (!stateDictPtr_)
+    if (!propsDictPtr_)
     {
-        createStateDict();
+        createPropertiesDict();
     }
 
-    return *stateDictPtr_;
+    return *propsDictPtr_;
 }
 
 
@@ -768,13 +769,13 @@ bool Foam::functionObjectList::execute()
         }
     }
 
-    // Force writing of state dictionary after function object execution
+    // Force writing of properties dictionary after function object execution
     if (time_.writeTime())
     {
         const auto oldPrecision = IOstream::precision_;
         IOstream::precision_ = 16;
 
-        stateDictPtr_->writeObject
+        propsDictPtr_->writeObject
         (
             IOstreamOption(IOstream::ASCII, time_.writeCompression()),
             true
@@ -930,9 +931,9 @@ bool Foam::functionObjectList::adjustTimeStep()
 
 bool Foam::functionObjectList::read()
 {
-    if (!stateDictPtr_)
+    if (!propsDictPtr_)
     {
-        createStateDict();
+        createPropertiesDict();
     }
 
     updated_ = execution_;
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
index b96c665693..8143711ee6 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2020 OpenCFD Ltd.
+    Copyright (C) 2015-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -87,6 +87,7 @@ SourceFiles
 #include "HashTable.H"
 #include "IOdictionary.H"
 #include "HashSet.H"
+#include "functionObjectProperties.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -145,7 +146,7 @@ class functionObjectList
         const dictionary& parentDict_;
 
         //- Function object properties - stores state information
-        mutable autoPtr<IOdictionary> stateDictPtr_;
+        mutable autoPtr<functionObjects::properties> propsDictPtr_;
 
         //- Function objects output registry
         mutable autoPtr<objectRegistry> objectsRegistryPtr_;
@@ -165,8 +166,8 @@ class functionObjectList
         //- List of functions
         PtrList<functionObject>& functions() { return *this; }
 
-        //- Create state dictionary - attached to Time.
-        void createStateDict() const;
+        //- Create properties dictionary - attached to Time.
+        void createPropertiesDict() const;
 
         //- Create registry for output objects - attached to Time.
         void createOutputRegistry() const;
@@ -262,19 +263,19 @@ public:
         //- Access to the functionObjects
         using PtrList<functionObject>::operator[];
 
-        //- Return the current trigger index (read from the stateDict)
+        //- Return the current trigger index (read from the propsDict)
         label triggerIndex() const;
 
-        //- Reset/read state dictionary for current time
-        void resetState();
+        //- Reset/read properties dictionary for current time
+        void resetPropertiesDict();
 
-        //- Write access to the state dictionary ("functionObjectProperties")
-        //- registered on Time
-        IOdictionary& stateDict();
+        //- Write access to the properties dictionary
+        //- ("functionObjectProperties") registered on Time
+        functionObjects::properties& propsDict();
 
-        //- Const access to the state dictionary ("functionObjectProperties")
-        //- registered on Time
-        const IOdictionary& stateDict() const;
+        //- Const access to the properties dictionary
+        //- ("functionObjectProperties") registered on Time
+        const Foam::functionObjects::properties& propsDict() const;
 
         //- Write access to the output objects ("functionObjectObjects")
         //- registered on Time
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectProperties.C b/src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectProperties.C
new file mode 100644
index 0000000000..81a78a1630
--- /dev/null
+++ b/src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectProperties.C
@@ -0,0 +1,308 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2021 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "functionObjectProperties.H"
+#include "SHA1.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+const Foam::word Foam::functionObjects::properties::resultsName_ =
+    SHA1("results").str();
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::functionObjects::properties::properties
+(
+    const IOobject& io
+)
+:
+    IOdictionary(io)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::wordList Foam::functionObjects::properties::objectNames() const
+{
+    // TODO
+    // - remove resultsName_ dict from results?
+    // - or put objects into their own subdictionary?
+    return sortedToc();
+}
+
+
+bool Foam::functionObjects::properties::hasObjectDict
+(
+    const word& objectName
+) const
+{
+    return found(objectName);
+}
+
+
+Foam::dictionary& Foam::functionObjects::properties::getObjectDict
+(
+    const word& objectName
+)
+{
+    if (!found(objectName))
+    {
+        add(objectName, dictionary());
+    }
+
+    return subDict(objectName);
+}
+
+
+bool Foam::functionObjects::properties::setTrigger
+(
+    const label triggeri
+)
+{
+    label oldTriggeri = getOrDefault<label>("triggerIndex", labelMin);
+
+    if (triggeri > oldTriggeri)
+    {
+        set("triggerIndex", triggeri);
+        return true;
+    }
+
+    return false;
+}
+
+
+Foam::label Foam::functionObjects::properties::getTrigger() const
+{
+    return getOrDefault<label>("triggerIndex", labelMin);
+}
+
+
+bool Foam::functionObjects::properties::foundObjectProperty
+(
+    const word& objectName,
+    const word& entryName
+) const
+{
+    if (found(objectName))
+    {
+        const dictionary& baseDict = subDict(objectName);
+        return baseDict.found(entryName);
+    }
+
+    return false;
+}
+
+
+bool Foam::functionObjects::properties::getObjectDict
+(
+    const word& objectName,
+    const word& entryName,
+    dictionary& dict
+) const
+{
+    if (found(objectName))
+    {
+        const dictionary& baseDict = subDict(objectName);
+
+        if (baseDict.found(entryName) && baseDict.isDict(entryName))
+        {
+            dict = baseDict.subDict(entryName);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+bool Foam::functionObjects::properties::hasResultObject
+(
+    const word& objectName
+) const
+{
+    if (found(resultsName_))
+    {
+        return subDict(resultsName_).found(objectName);
+    }
+
+    return false;
+}
+
+
+Foam::wordList Foam::functionObjects::properties::objectResultNames() const
+{
+    if (found(resultsName_))
+    {
+        return subDict(resultsName_).sortedToc();
+    }
+
+    return wordList();
+}
+
+
+bool Foam::functionObjects::properties::hasResultObjectEntry
+(
+    const word& objectName,
+    const word& entryName
+) const
+{
+    if (found(resultsName_))
+    {
+        const dictionary& resultsDict = subDict(resultsName_);
+
+        if (resultsDict.found(objectName))
+        {
+            const dictionary& objectDict = resultsDict.subDict(objectName);
+
+            for (const entry& dEntry : objectDict)
+            {
+                const dictionary& dict = dEntry.dict();
+
+                if (dict.found(entryName))
+                {
+                    return true;
+                }
+            }
+        }
+    }
+
+    return false;
+}
+
+
+Foam::word Foam::functionObjects::properties::objectResultType
+(
+    const word& objectName,
+    const word& entryName
+) const
+{
+    if (found(resultsName_))
+    {
+        const dictionary& resultsDict = subDict(resultsName_);
+
+        if (resultsDict.found(objectName))
+        {
+            const dictionary& objectDict = resultsDict.subDict(objectName);
+
+            for (const entry& dEntry : objectDict)
+            {
+                const dictionary& dict = dEntry.dict();
+
+                if (dict.found(entryName))
+                {
+                    return dict.dictName();
+                }
+            }
+        }
+    }
+
+    return word::null;
+}
+
+
+Foam::wordList Foam::functionObjects::properties::objectResultEntries
+(
+    const word& objectName
+) const
+{
+    DynamicList<word> result;
+
+    if (found(resultsName_))
+    {
+        const dictionary& resultsDict = subDict(resultsName_);
+
+        if (resultsDict.found(objectName))
+        {
+            const dictionary& objectDict = resultsDict.subDict(objectName);
+
+            for (const entry& dEntry : objectDict)
+            {
+                const dictionary& dict = dEntry.dict();
+
+                result.append(dict.toc());
+            }
+        }
+    }
+
+    wordList entries;
+    entries.transfer(result);
+
+    return entries;
+}
+
+
+void Foam::functionObjects::properties::writeResultEntries
+(
+    const word& objectName,
+    Ostream& os
+) const
+{
+    if (found(resultsName_))
+    {
+        const dictionary& resultsDict = subDict(resultsName_);
+
+        if (resultsDict.found(objectName))
+        {
+            const dictionary& objectDict = resultsDict.subDict(objectName);
+
+            for (const word& dataFormat : objectDict.sortedToc())
+            {
+                os  << "    Type: " << dataFormat << nl;
+
+                const dictionary& resultDict = objectDict.subDict(dataFormat);
+
+                for (const word& result : resultDict.sortedToc())
+                {
+                    os << "        " << result << nl;
+                }
+            }
+        }
+    }
+}
+
+
+void Foam::functionObjects::properties::writeAllResultEntries
+(
+    Ostream& os
+) const
+{
+    if (found(resultsName_))
+    {
+        const dictionary& resultsDict = subDict(resultsName_);
+
+        for (const word& objectName : resultsDict.sortedToc())
+        {
+            os  << "Object: " << objectName << endl;
+
+            writeResultEntries(objectName, os);
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectProperties.H b/src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectProperties.H
new file mode 100644
index 0000000000..2e058bfeaf
--- /dev/null
+++ b/src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectProperties.H
@@ -0,0 +1,241 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2021 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::functionObjects::properties
+
+Description
+    Storage for function object properties, derived from IOdictionary.
+    Provides functionality to read/write state information (data required for
+    smooth restart behaviour) and results to/from the state dictionary
+
+    Note: cannot be accessed until after construction of thefunction objects,
+    since the owner container functionObjectList is owned by time, and time owns
+    [this] i.e. need to wait for time to be fully constructed.
+
+See also
+    Foam::functionObject
+
+SourceFiles
+    functionObjectProperties.C
+    functionObjectPropertiesTemplates.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef functionObjects_properties_H
+#define functionObjects_properties_H
+
+#include "IOdictionary.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace functionObjects
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class properties Declaration
+\*---------------------------------------------------------------------------*/
+
+class properties
+:
+    public IOdictionary
+{
+    // Private Member Data
+
+        //- Name of the results dictionary
+        static const word resultsName_;
+
+
+protected:
+
+    // Protected Member Functions
+
+        //- No copy construct
+        properties(const properties&) = delete;
+
+        //- No copy assignment
+        void operator=(const properties&) = delete;
+
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        explicit properties(const IOobject& io);
+
+
+    //- Destructor
+    virtual ~properties() = default;
+
+
+    // Member Functions
+
+        //- Return list of object names
+        wordList objectNames() const;
+
+        //- Return true if the object with objectName exists
+        bool hasObjectDict(const word& objectName) const;
+
+        //- Return access to the property dictionary
+        dictionary& propertyDict(const word& objectName);
+
+
+        // Properties
+
+            //- Get dictionary for named object. Creates one if required
+            dictionary& getObjectDict(const word& objectName);
+
+            //- Return true if the property exists
+            bool foundObjectProperty
+            (
+                const word& objectName,
+                const word& entryName
+            ) const;
+
+            //- Get the current trigger index
+            label getTrigger() const;
+
+            //- Set the current trigger index
+            bool setTrigger(const label triggeri);
+
+            //- Set dictionary from named object, return true if set
+            bool getObjectDict
+            (
+                const word& objectName,
+                const word& entryName,
+                dictionary& dict
+            ) const;
+
+            //- Retrieve generic property from named object
+            template<class Type>
+            Type getObjectProperty
+            (
+                const word& objectName,
+                const word& entryName,
+                const Type& defaultValue = Type(Zero)
+            ) const;
+
+            //- Set generic property from named object, return true if set
+            template<class Type>
+            bool getObjectProperty
+            (
+                const word& objectName,
+                const word& entryName,
+                Type& value
+            ) const;
+
+            //- Add generic property from named object
+            template<class Type>
+            void setObjectProperty
+            (
+                const word& objectName,
+                const word& entryName,
+                const Type& value
+            );
+
+
+        // Results
+
+            //- Add result from named object
+            template<class Type>
+            void setObjectResult
+            (
+                const word& objectName,
+                const word& entryName,
+                const Type& value
+            );
+
+            //- Retrieve result from named object
+            template<class Type>
+            Type getObjectResult
+            (
+                const word& objectName,
+                const word& entryName,
+                const Type& defaultValue = Type(Zero)
+            ) const;
+
+            //- Set result from named object, return true if set
+            template<class Type>
+            bool getObjectResult
+            (
+                const word& objectName,
+                const word& entryName,
+                Type& value
+            ) const;
+
+            //- Return true if the object with objectName exists in results
+            bool hasResultObject(const word& objectName) const;
+
+            //- Return list of objects with results
+            wordList objectResultNames() const;
+
+            //- Return true if the object with objectName exists and has
+            //- entryName in its results
+            bool hasResultObjectEntry
+            (
+                const word& objectName,
+                const word& entryName
+            ) const;
+
+            //- Return the type of result
+            word objectResultType
+            (
+                const word& objectName,
+                const word& entryName
+            ) const;
+
+            //- Return result entries for named object
+            wordList objectResultEntries(const word& objectName) const;
+
+            //- Write the results entries for all objects to stream
+            void writeResultEntries(Ostream& os) const;
+
+            //- Write the results entries for named object to stream
+            void writeResultEntries(const word& objectName, Ostream& os) const;
+
+            //- Write the results entries for all objects to stream
+            void writeAllResultEntries(Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace functionObjects
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "functionObjectPropertiesTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectPropertiesTemplates.C b/src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectPropertiesTemplates.C
new file mode 100644
index 0000000000..46c9ea74cd
--- /dev/null
+++ b/src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectPropertiesTemplates.C
@@ -0,0 +1,163 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2021 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "IOdictionary.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type>
+Type Foam::functionObjects::properties::getObjectProperty
+(
+    const word& objectName,
+    const word& entryName,
+    const Type& defaultValue
+) const
+{
+    Type result = defaultValue;
+    getObjectProperty(objectName, entryName, result);
+    return result;
+}
+
+
+template<class Type>
+bool Foam::functionObjects::properties::getObjectProperty
+(
+    const word& objectName,
+    const word& entryName,
+    Type& value
+) const
+{
+    if (this->found(objectName))
+    {
+        const dictionary& baseDict = this->subDict(objectName);
+        return baseDict.readIfPresent(entryName, value);
+    }
+
+    return false;
+}
+
+
+template<class Type>
+void Foam::functionObjects::properties::setObjectProperty
+(
+    const word& objectName,
+    const word& entryName,
+    const Type& value
+)
+{
+    if (!this->found(objectName))
+    {
+        this->add(objectName, dictionary());
+    }
+
+    dictionary& baseDict = this->subDict(objectName);
+    baseDict.add(entryName, value, true);
+}
+
+
+template<class Type>
+void Foam::functionObjects::properties::setObjectResult
+(
+    const word& objectName,
+    const word& entryName,
+    const Type& value
+)
+{
+    if (!this->found(resultsName_))
+    {
+        this->add(resultsName_, dictionary());
+    }
+
+    dictionary& resultsDict = this->subDict(resultsName_);
+
+    if (!resultsDict.found(objectName))
+    {
+        resultsDict.add(objectName, dictionary());
+    }
+
+    dictionary& objectDict = resultsDict.subDict(objectName);
+
+    const word& dictTypeName = pTraits<Type>::typeName;
+
+    if (!objectDict.found(dictTypeName))
+    {
+        objectDict.add(dictTypeName, dictionary());
+    }
+
+    dictionary& resultTypeDict = objectDict.subDict(dictTypeName);
+
+    resultTypeDict.add(entryName, value, true);
+}
+
+
+template<class Type>
+Type Foam::functionObjects::properties::getObjectResult
+(
+    const word& objectName,
+    const word& entryName,
+    const Type& defaultValue
+) const
+{
+    Type result = defaultValue;
+    (void)getObjectResult(objectName, entryName, result);
+    return result;
+}
+
+
+template<class Type>
+bool Foam::functionObjects::properties::getObjectResult
+(
+    const word& objectName,
+    const word& entryName,
+    Type& value
+) const
+{
+    if (this->found(resultsName_))
+    {
+        const dictionary& resultsDict = this->subDict(resultsName_);
+
+        if (resultsDict.found(objectName))
+        {
+            const dictionary& objectDict = resultsDict.subDict(objectName);
+
+            const word& dictTypeName = pTraits<Type>::typeName;
+
+            if (objectDict.found(dictTypeName))
+            {
+                const dictionary& resultTypeDict =
+                    objectDict.subDict(dictTypeName);
+
+                return resultTypeDict.readIfPresent<Type>(entryName, value);
+            }
+        }
+    }
+
+    return false;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.C b/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.C
index 8aa1595030..773dbafecf 100644
--- a/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.C
+++ b/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015 OpenFOAM Foundation
-    Copyright (C) 2015-2020 OpenCFD Ltd.
+    Copyright (C) 2015-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -37,16 +37,20 @@ const Foam::word Foam::functionObjects::stateFunctionObject::resultsName_ =
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-const Foam::IOdictionary&
+const Foam::functionObjects::properties&
 Foam::functionObjects::stateFunctionObject::stateDict() const
 {
-    return time_.functionObjects().stateDict();
+    return time_.functionObjects().propsDict();
 }
 
 
-Foam::IOdictionary& Foam::functionObjects::stateFunctionObject::stateDict()
+Foam::functionObjects::properties&
+Foam::functionObjects::stateFunctionObject::stateDict()
 {
-    return const_cast<IOdictionary&>(time_.functionObjects().stateDict());
+    return const_cast<functionObjects::properties&>
+    (
+        time_.functionObjects().propsDict()
+    );
 }
 
 
@@ -66,14 +70,7 @@ Foam::functionObjects::stateFunctionObject::stateFunctionObject
 
 Foam::dictionary& Foam::functionObjects::stateFunctionObject::propertyDict()
 {
-    IOdictionary& stateDict = this->stateDict();
-
-    if (!stateDict.found(name()))
-    {
-        stateDict.add(name(), dictionary());
-    }
-
-    return stateDict.subDict(name());
+    return stateDict().getObjectDict(name());
 }
 
 
@@ -82,26 +79,13 @@ bool Foam::functionObjects::stateFunctionObject::setTrigger
     const label triggeri
 )
 {
-    IOdictionary& stateDict = this->stateDict();
-
-    label oldTriggeri =
-        stateDict.getOrDefault<label>("triggerIndex", labelMin);
-
-    if (triggeri > oldTriggeri)
-    {
-        stateDict.set("triggerIndex", triggeri);
-        return true;
-    }
-
-    return false;
+    return stateDict().setTrigger(triggeri);
 }
 
 
 Foam::label Foam::functionObjects::stateFunctionObject::getTrigger() const
 {
-    const IOdictionary& stateDict = this->stateDict();
-
-    return stateDict.getOrDefault<label>("triggerIndex", labelMin);
+    return stateDict().getTrigger();
 }
 
 
@@ -110,15 +94,7 @@ bool Foam::functionObjects::stateFunctionObject::foundProperty
     const word& entryName
 ) const
 {
-    const IOdictionary& stateDict = this->stateDict();
-
-    if (stateDict.found(name()))
-    {
-        const dictionary& baseDict = stateDict.subDict(name());
-        return baseDict.found(entryName);
-    }
-
-    return false;
+    return stateDict().foundObjectProperty(name(), entryName);
 }
 
 
@@ -128,7 +104,7 @@ bool Foam::functionObjects::stateFunctionObject::getDict
     dictionary& dict
 ) const
 {
-    return getObjectDict(name(), entryName, dict);
+    return stateDict().getObjectDict(name(), entryName, dict);
 }
 
 
@@ -139,19 +115,7 @@ bool Foam::functionObjects::stateFunctionObject::getObjectDict
     dictionary& dict
 ) const
 {
-    const IOdictionary& stateDict = this->stateDict();
-
-    if (stateDict.found(objectName))
-    {
-        const dictionary& baseDict = stateDict.subDict(objectName);
-        if (baseDict.found(entryName) && baseDict.isDict(entryName))
-        {
-            dict = baseDict.subDict(entryName);
-            return true;
-        }
-    }
-
-    return false;
+    return stateDict().getObjectDict(objectName, entryName, dict);
 }
 
 
@@ -160,7 +124,7 @@ Foam::word Foam::functionObjects::stateFunctionObject::resultType
     const word& entryName
 ) const
 {
-    return objectResultType(name(), entryName);
+    return stateDict().objectResultType(name(), entryName);
 }
 
 
@@ -170,79 +134,33 @@ Foam::word Foam::functionObjects::stateFunctionObject::objectResultType
     const word& entryName
 ) const
 {
-    word result = word::null;
-    const IOdictionary& stateDict = this->stateDict();
-
-    if (stateDict.found(resultsName_))
-    {
-        const dictionary& resultsDict = stateDict.subDict(resultsName_);
-
-        if (resultsDict.found(objectName))
-        {
-            const dictionary& objectDict = resultsDict.subDict(objectName);
-
-            for (const entry& dEntry : objectDict)
-            {
-                const dictionary& dict = dEntry.dict();
-
-                if (dict.found(entryName))
-                {
-                    return dict.dictName();
-                }
-            }
-        }
-    }
-
-    return result;
+    return stateDict().objectResultType(objectName, entryName);
 }
 
 
-Foam::List<Foam::word>
+Foam::wordList
 Foam::functionObjects::stateFunctionObject::objectResultEntries() const
 {
-    return objectResultEntries(name());
+    return stateDict().objectResultEntries(name());
 }
 
 
-Foam::List<Foam::word>
+Foam::wordList
 Foam::functionObjects::stateFunctionObject::objectResultEntries
 (
     const word& objectName
 ) const
 {
-    DynamicList<word> result(2);
-
-    const IOdictionary& stateDict = this->stateDict();
-
-    if (stateDict.found(resultsName_))
-    {
-        const dictionary& resultsDict = stateDict.subDict(resultsName_);
-
-        if (resultsDict.found(objectName))
-        {
-            const dictionary& objectDict = resultsDict.subDict(objectName);
-
-            for (const entry& dEntry : objectDict)
-            {
-                const dictionary& dict = dEntry.dict();
-
-                result.append(dict.toc());
-            }
-        }
-    }
-
-    wordList entries;
-    entries.transfer(result);
-
-    return entries;
+    return stateDict().objectResultEntries(objectName);
 }
 
+
 void Foam::functionObjects::stateFunctionObject::writeResultEntries
 (
     Ostream& os
 ) const
 {
-    writeResultEntries(name(), os);
+    return stateDict().writeResultEntries(name(), os);
 }
 
 
@@ -252,29 +170,7 @@ void Foam::functionObjects::stateFunctionObject::writeResultEntries
     Ostream& os
 ) const
 {
-    const IOdictionary& stateDict = this->stateDict();
-
-    if (stateDict.found(resultsName_))
-    {
-        const dictionary& resultsDict = stateDict.subDict(resultsName_);
-
-        if (resultsDict.found(objectName))
-        {
-            const dictionary& objectDict = resultsDict.subDict(objectName);
-
-            for (const word& dataFormat : objectDict.sortedToc())
-            {
-                os  << "    Type: " << dataFormat << nl;
-
-                const dictionary& resultDict = objectDict.subDict(dataFormat);
-
-                for (const word& result : resultDict.sortedToc())
-                {
-                    os << "        " << result << nl;
-                }
-            }
-        }
-    }
+    return stateDict().writeResultEntries(objectName, os);
 }
 
 
@@ -283,21 +179,7 @@ void Foam::functionObjects::stateFunctionObject::writeAllResultEntries
     Ostream& os
 ) const
 {
-    const IOdictionary& stateDict = this->stateDict();
-
-    if (stateDict.found(resultsName_))
-    {
-        const dictionary& resultsDict = stateDict.subDict(resultsName_);
-
-        const wordList allObjectNames = resultsDict.sortedToc();
-
-        for (const word& objectName : allObjectNames)
-        {
-            os  << "Object: " << objectName << endl;
-
-            writeResultEntries(objectName, os);
-        }
-    }
+    return stateDict().writeAllResultEntries(os);
 }
 
 
diff --git a/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.H b/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.H
index bd8de02e32..7dce6ee473 100644
--- a/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015 OpenFOAM Foundation
-    Copyright (C) 2015-2019 OpenCFD Ltd.
+    Copyright (C) 2015-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,12 +50,14 @@ SourceFiles
 #define functionObjects_stateFunctionObject_H
 
 #include "timeFunctionObject.H"
+#include "functionObjectProperties.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+// Forward Declarations
 class IOdictionary;
 
 namespace functionObjects
@@ -80,10 +82,10 @@ protected:
     // Protected Member Functions
 
         //- Return a const reference to the state dictionary
-        const IOdictionary& stateDict() const;
+        const functionObjects::properties& stateDict() const;
 
         //- Return non-const access to the state dictionary
-        IOdictionary& stateDict();
+        functionObjects::properties& stateDict();
 
 
         //- No copy construct
@@ -237,10 +239,10 @@ public:
             ) const;
 
             //- Retrieve the result entries
-            List<word> objectResultEntries() const;
+            wordList objectResultEntries() const;
 
             //- Return result entries for named object
-            List<word> objectResultEntries(const word& objectName) const;
+            wordList objectResultEntries(const word& objectName) const;
 
             //- Write the results entries for all objects to stream
             void writeResultEntries(Ostream& os) const;
diff --git a/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObjectTemplates.C b/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObjectTemplates.C
index ad9c52f0be..1c11035109 100644
--- a/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObjectTemplates.C
+++ b/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObjectTemplates.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015 OpenFOAM Foundation
-    Copyright (C) 2015-2016 OpenCFD Ltd.
+    Copyright (C) 2015-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -87,15 +87,7 @@ bool Foam::functionObjects::stateFunctionObject::getObjectProperty
     Type& value
 ) const
 {
-    const IOdictionary& stateDict = this->stateDict();
-
-    if (stateDict.found(objectName))
-    {
-        const dictionary& baseDict = stateDict.subDict(objectName);
-        return baseDict.readIfPresent(entryName, value);
-    }
-
-    return false;
+    return stateDict().getObjectProperty(objectName, entryName, value);
 }
 
 
@@ -107,15 +99,7 @@ void Foam::functionObjects::stateFunctionObject::setObjectProperty
     const Type& value
 )
 {
-    IOdictionary& stateDict = this->stateDict();
-
-    if (!stateDict.found(objectName))
-    {
-        stateDict.add(objectName, dictionary());
-    }
-
-    dictionary& baseDict = stateDict.subDict(objectName);
-    baseDict.add(entryName, value, true);
+    stateDict().setObjectProperty(objectName, entryName, value);
 }
 
 
@@ -138,32 +122,7 @@ void Foam::functionObjects::stateFunctionObject::setObjectResult
     const Type& value
 )
 {
-    IOdictionary& stateDict = this->stateDict();
-
-    if (!stateDict.found(resultsName_))
-    {
-        stateDict.add(resultsName_, dictionary());
-    }
-
-    dictionary& resultsDict = stateDict.subDict(resultsName_);
-
-    if (!resultsDict.found(objectName))
-    {
-        resultsDict.add(name(), dictionary());
-    }
-
-    dictionary& objectDict = resultsDict.subDict(objectName);
-
-    const word& dictTypeName = pTraits<Type>::typeName;
-
-    if (!objectDict.found(dictTypeName))
-    {
-        objectDict.add(dictTypeName, dictionary());
-    }
-
-    dictionary& resultTypeDict = objectDict.subDict(dictTypeName);
-
-    resultTypeDict.add(entryName, value, true);
+    stateDict().setObjectResult(objectName, entryName, value);
 }
 
 
@@ -200,29 +159,7 @@ bool Foam::functionObjects::stateFunctionObject::getObjectResult
     Type& value
 ) const
 {
-    const IOdictionary& stateDict = this->stateDict();
-
-    if (stateDict.found(resultsName_))
-    {
-        const dictionary& resultsDict = stateDict.subDict(resultsName_);
-
-        if (resultsDict.found(objectName))
-        {
-            const dictionary& objectDict = resultsDict.subDict(objectName);
-
-            const word& dictTypeName = pTraits<Type>::typeName;
-
-            if (objectDict.found(dictTypeName))
-            {
-                const dictionary& resultTypeDict =
-                    objectDict.subDict(dictTypeName);
-
-                return resultTypeDict.readIfPresent<Type>(entryName, value);
-            }
-        }
-    }
-
-    return false;
+    return stateDict().getObjectResult(objectName, entryName, value);
 }
 
 

From c1a04abd96ee0ae98390ae71f9a0c5a772255810 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Tue, 21 Sep 2021 21:01:49 +0100
Subject: [PATCH 03/18] ENH: Function1 - added optional objectRegistry
 reference

Function1 can now be created with an object registry, e.g. time or mesh
database. This enables access to other stored objects, e.g. fields,
dictionaries etc. making Function1 much more flexible.

Note: will allow TimeFunction1 to be deprecated
---
 .../functions/Function1/Function1/Function1.C | 23 +++--
 .../functions/Function1/Function1/Function1.H | 15 +++-
 .../Function1/Function1/function1Base.C       | 87 ++++++++++++++++--
 .../Function1/Function1/function1Base.H       | 89 ++++++++++++++++---
 4 files changed, 182 insertions(+), 32 deletions(-)

diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
index 84900b63f7..e5a3834661 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
@@ -34,16 +34,25 @@ License
 // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Function1<Type>::Function1(const word& entryName)
+Foam::Function1<Type>::Function1
+(
+    const word& entryName,
+    const objectRegistry* obrPtr
+)
 :
-    function1Base(entryName)
+    function1Base(entryName, obrPtr)
 {}
 
 
 template<class Type>
-Foam::Function1<Type>::Function1(const word& entryName, const dictionary& dict)
+Foam::Function1<Type>::Function1
+(
+    const word& entryName,
+    const dictionary& dict,
+    const objectRegistry* obrPtr
+)
 :
-    function1Base(entryName, dict)
+    function1Base(entryName, dict, obrPtr)
 {}
 
 
@@ -65,8 +74,7 @@ Type Foam::Function1<Type>::value(const scalar x) const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type>>
-Foam::Function1<Type>::value
+Foam::tmp<Foam::Field<Type>> Foam::Function1<Type>::value
 (
     const scalarField& x
 ) const
@@ -85,8 +93,7 @@ Type Foam::Function1<Type>::integrate(const scalar x1, const scalar x2) const
 
 
 template<class Type>
-Foam::tmp<Foam::Field<Type>>
-Foam::Function1<Type>::integrate
+Foam::tmp<Foam::Field<Type>> Foam::Function1<Type>::integrate
 (
     const scalarField& x1,
     const scalarField& x2
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
index dacf265cd9..0e2cffdf31 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
@@ -84,8 +84,6 @@ namespace Foam
 {
 
 // Forward Declarations
-class Time;
-template<class Type> class Function1;
 template<class Type> Ostream& operator<<(Ostream&, const Function1<Type>&);
 
 /*---------------------------------------------------------------------------*\
@@ -142,10 +140,19 @@ public:
     // Constructors
 
         //- Construct from entry name
-        explicit Function1(const word& entryName);
+        explicit Function1
+        (
+            const word& entryName,
+            const objectRegistry* obrPtr = nullptr
+        );
 
         //- Construct from entry name and dictionary (unused)
-        Function1(const word& entryName, const dictionary& dict);
+        Function1
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
         //- Copy construct
         explicit Function1(const Function1<Type>& rhs);
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.C b/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.C
index c4a6e0a194..72494af305 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,37 +26,112 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "function1Base.H"
+#include "objectRegistry.H"
 #include "Time.H"
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+const Foam::objectRegistry* Foam::function1Base::whichDb
+(
+    const bool useTime
+) const noexcept
+{
+    if (obrPtr_ && useTime)
+    {
+        return &(obrPtr_->time());
+    }
+
+    return obrPtr_;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
 
-Foam::function1Base::function1Base(const word& entryName)
+Foam::function1Base::function1Base
+(
+    const word& entryName,
+    const objectRegistry* obrPtr
+)
 :
     refCount(),
-    name_(entryName)
+    name_(entryName),
+    obrPtr_(obrPtr)
 {}
 
 
 Foam::function1Base::function1Base
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
     refCount(),
-    name_(entryName)
+    name_(entryName),
+    obrPtr_(obrPtr)
 {}
 
 
 Foam::function1Base::function1Base(const function1Base& rhs)
 :
     refCount(),
-    name_(rhs.name_)
+    name_(rhs.name_),
+    obrPtr_(rhs.obrPtr_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+// NOTE : do not delete obrPtr_ (no ownership)
+Foam::function1Base::~function1Base()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+const Foam::objectRegistry& Foam::function1Base::obr() const
+{
+    if (!obrPtr_)
+    {
+        FatalErrorInFunction
+            << "Object registry not set"
+            << abort(FatalError);
+    }
+    return *obrPtr_;
+}
+
+
+const Foam::Time& Foam::function1Base::time() const
+{
+    if (!obrPtr_)
+    {
+        FatalErrorInFunction
+            << "Object registry not set"
+            << abort(FatalError);
+    }
+
+    return obrPtr_->time();
+}
+
+
+bool Foam::function1Base::isTime() const noexcept
+{
+    return (obrPtr_ && obrPtr_->isTimeDb());
+}
+
+
+void Foam::function1Base::resetDb(const objectRegistry* obrPtr) noexcept
+{
+    obrPtr_ = obrPtr;
+}
+
+
+void Foam::function1Base::resetDb(const objectRegistry& db) noexcept
+{
+    obrPtr_ = &db;
+}
+
+
 void Foam::function1Base::convertTimeBase(const Time& t)
 {}
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.H b/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.H
index a3191c7924..85188de82c 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,12 +27,7 @@ Class
     Foam::function1Base
 
 Description
-    Top level data entry class for use in dictionaries. Provides a mechanism
-    to specify a variable as a certain type, e.g. constant or time varying, and
-    provide functions to return the (interpolated) value, and integral between
-    limits.
-
-    Extends the Function1 class by adding autoMap and rMap functions
+    Base class for template-invariant parts of Function1
 
 SourceFiles
     function1Base.C
@@ -43,6 +38,7 @@ SourceFiles
 #define function1Base_H
 
 #include "dictionary.H"
+#include "objectRegistry.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,7 +46,7 @@ namespace Foam
 {
 
 // Forward Declarations
-class Time;
+template<class Type> class Function1;
 
 /*---------------------------------------------------------------------------*\
                      Class function1Base Declaration
@@ -60,6 +56,12 @@ class function1Base
 :
     public refCount
 {
+    // Private Member Functions
+
+        //- The associated registry, the time registry or nullptr
+        const objectRegistry* whichDb(const bool useTime) const noexcept;
+
+
 protected:
 
     // Protected Data
@@ -67,6 +69,9 @@ protected:
         //- Name of entry
         const word name_;
 
+        //- Pointer to an object registry
+        const objectRegistry* obrPtr_;
+
 
     // Protected Member Functions
 
@@ -78,18 +83,27 @@ public:
 
     // Constructors
 
-        //- Construct from entry name
-        explicit function1Base(const word& entryName);
+        //- Construct from entry name and optional registry
+        explicit function1Base
+        (
+            const word& entryName,
+            const objectRegistry* obrPtr = nullptr
+        );
 
-        //- Construct from entry name and dictionary (unused)
-        function1Base(const word& entryName, const dictionary& dict);
+        //- Construct from entry name, dictionary (unused) and optional registry
+        function1Base
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
         //- Copy construct
         explicit function1Base(const function1Base& rhs);
 
 
     //- Destructor
-    virtual ~function1Base() = default;
+    virtual ~function1Base();
 
 
     // Member Functions
@@ -97,11 +111,58 @@ public:
     // Access
 
         //- The name of the entry
-        const word& name() const
+        const word& name() const noexcept
         {
             return name_;
         }
 
+        //- Return the associated registry or nullptr.
+        const objectRegistry* whichDb() const noexcept
+        {
+            return obrPtr_;
+        }
+
+        //- Reset the associated objectRegistry
+        void resetDb(const objectRegistry* obrPtr = nullptr) noexcept;
+
+        //- Reset the associated objectRegistry
+        void resetDb(const objectRegistry& db) noexcept;
+
+        //- Return the object registry
+        //  FatalError if object registry is not set
+        const objectRegistry& obr() const;
+
+        //- Return true if this function was created with the time database
+        bool isTime() const noexcept;
+
+        //- Return the time database
+        //  FatalError if object registry is not set
+        const Time& time() const;
+
+        //- Return the mesh database if this Function1 was created using a mesh
+        //  Note: relies on refCast failure if the type is not correct
+        template<class MeshType>
+        const MeshType& mesh(const word& regionName = word::null) const
+        {
+            const objectRegistry* ptr = whichDb(!regionName.empty());
+
+            if (!ptr)
+            {
+                FatalErrorInFunction
+                    << "Object registry not set"
+                    << abort(FatalError);
+            }
+
+            if (regionName.empty())
+            {
+                return refCast<const MeshType>(*ptr);
+            }
+            else
+            {
+                return ptr->lookupObject<MeshType>(regionName);
+            }
+        }
+
 
     // Manipulation
 

From 70b55be684b6c969e60012ea21ea6b89ad98f010 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Tue, 5 Oct 2021 10:13:24 +0100
Subject: [PATCH 04/18] COMP: Function1 - propagated API change resulting from
 new objectRegistry access

---
 .../Function1/Function1Expression.C           | 15 ++++---
 .../Function1/Function1Expression.H           | 11 +++--
 .../primitives/functions/Function1/CSV/CSV.C  |  3 +-
 .../primitives/functions/Function1/CSV/CSV.H  |  5 ++-
 .../functions/Function1/Constant/Constant.C   | 10 +++--
 .../functions/Function1/Constant/Constant.H   | 16 +++++--
 .../functions/Function1/Cosine/Cosine.H       | 13 ++++--
 .../functions/Function1/Function1/Function1.C |  5 ++-
 .../functions/Function1/Function1/Function1.H | 26 ++++++++---
 .../Function1/Function1/Function1New.C        | 30 +++++++++----
 .../Function1/LimitRange/LimitRange.C         |  7 +--
 .../Function1/LimitRange/LimitRange.H         |  9 +++-
 .../functions/Function1/One/OneConstant.C     | 14 ++++--
 .../functions/Function1/One/OneConstant.H     | 19 +++++---
 .../Function1/Polynomial/PolynomialEntry.C    | 10 +++--
 .../Function1/Polynomial/PolynomialEntry.H    | 12 ++++--
 .../functions/Function1/Scale/Scale.C         | 11 +++--
 .../functions/Function1/Scale/Scale.H         |  7 +--
 .../functions/Function1/Sine/Sine.C           |  7 +--
 .../functions/Function1/Sine/Sine.H           | 11 +++--
 .../functions/Function1/Square/Square.C       |  7 +--
 .../functions/Function1/Square/Square.H       | 11 +++--
 .../functions/Function1/Table/Table.C         |  5 ++-
 .../functions/Function1/Table/Table.H         |  9 +++-
 .../functions/Function1/Table/TableBase.C     | 12 ++----
 .../functions/Function1/Table/TableBase.H     | 11 +++--
 .../functions/Function1/TableFile/TableFile.C |  7 +--
 .../functions/Function1/TableFile/TableFile.H |  9 +++-
 .../functions/Function1/Uniform/Uniform.C     | 43 -------------------
 .../functions/Function1/Uniform/Uniform.H     | 25 ++++++-----
 .../functions/Function1/Zero/ZeroConstant.C   | 15 ++++---
 .../functions/Function1/Zero/ZeroConstant.H   | 19 +++++---
 .../Function1/halfCosineRamp/halfCosineRamp.C |  6 ++-
 .../Function1/halfCosineRamp/halfCosineRamp.H | 11 +++--
 .../Function1/linearRamp/linearRamp.C         |  6 ++-
 .../Function1/linearRamp/linearRamp.H         | 11 +++--
 .../Function1/quadraticRamp/quadraticRamp.C   |  6 ++-
 .../Function1/quadraticRamp/quadraticRamp.H   | 11 +++--
 .../quarterCosineRamp/quarterCosineRamp.C     |  4 +-
 .../quarterCosineRamp/quarterCosineRamp.H     | 11 +++--
 .../quarterSineRamp/quarterSineRamp.C         |  6 ++-
 .../quarterSineRamp/quarterSineRamp.H         | 10 ++++-
 .../functions/Function1/ramp/ramp.C           |  7 +--
 .../functions/Function1/ramp/ramp.H           |  7 +--
 .../functions/Function1/step/stepFunction.C   |  7 +--
 .../functions/Function1/step/stepFunction.H   | 11 +++--
 .../functions/TimeFunction1/TimeFunction1.C   |  6 +--
 .../noise/noiseModels/pointNoise/pointNoise.C |  2 +-
 48 files changed, 332 insertions(+), 204 deletions(-)
 delete mode 100644 src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.C

diff --git a/src/OpenFOAM/expressions/Function1/Function1Expression.C b/src/OpenFOAM/expressions/Function1/Function1Expression.C
index 2575e0cb01..a33c1f01a2 100644
--- a/src/OpenFOAM/expressions/Function1/Function1Expression.C
+++ b/src/OpenFOAM/expressions/Function1/Function1Expression.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,10 +33,11 @@ template<class Type>
 Foam::Function1Types::Function1Expression<Type>::Function1Expression
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    Function1<Type>(entryName, dict),
+    Function1<Type>(entryName, dict, obrPtr),
     dict_(dict),
     valueExpr_(),
     driver_(1, dict_)
@@ -88,6 +89,8 @@ Type Foam::Function1Types::Function1Expression<Type>::value
 
     driver_.setArgument(x);
 
+    driver_.resetDb(this->whichDb());
+
     driver_.parse(this->valueExpr_);
 
     expressions::exprResult result(driver_.result());
@@ -98,7 +101,9 @@ Type Foam::Function1Types::Function1Expression<Type>::value
     if (!result.hasValue() || !result.size() || !result.isType<Type>())
     {
         FatalErrorInFunction
-            << "Could not evaluate: " << this->valueExpr_
+            << "Could not evaluate: " << this->valueExpr_ << nl
+            << "Result size:" << result.size()
+            << " type:" << result.valueType() << nl
             << exit(FatalError);
     }
 
@@ -124,7 +129,7 @@ void Foam::Function1Types::Function1Expression<Type>::writeData
     Ostream& os
 ) const
 {
-    // Function1-from-subdict so out dictionary contains
+    // Function1-from-subdict so output dictionary contains
     // only the relevant entries.
     dict_.writeEntry(this->name(), os);
 }
diff --git a/src/OpenFOAM/expressions/Function1/Function1Expression.H b/src/OpenFOAM/expressions/Function1/Function1Expression.H
index ccb91b9f6e..824f84312e 100644
--- a/src/OpenFOAM/expressions/Function1/Function1Expression.H
+++ b/src/OpenFOAM/expressions/Function1/Function1Expression.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -113,8 +113,13 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
-        Function1Expression(const word& entryName, const dictionary& dict);
+        //- Construct from entry name, dictionary and optional registry
+        Function1Expression
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
         //- Copy construct
         explicit Function1Expression(const Function1Expression<Type>& rhs);
diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
index 03fb6b86c0..f3d4c064ad 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
@@ -210,10 +210,11 @@ Foam::Function1Types::CSV<Type>::CSV
 (
     const word& entryName,
     const dictionary& dict,
+    const objectRegistry* obrPtr,
     const fileName& fName
 )
 :
-    TableBase<Type>(entryName, dict),
+    TableBase<Type>(entryName, dict, obrPtr),
     nHeaderLine_(dict.get<label>("nHeaderLine")),
     refColumn_(dict.get<label>("refColumn")),
     componentColumns_(getComponentColumns("componentColumns", dict)),
diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
index 1c5a2bb693..1ecaf41341 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -125,11 +125,12 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from entry name, dictionary and optional registry
         CSV
         (
             const word& entryName,
             const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr,
             const fileName& fName = fileName::null
         );
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
index 36c764e895..f2f1f592f9 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.C
@@ -34,10 +34,11 @@ template<class Type>
 Foam::Function1Types::Constant<Type>::Constant
 (
     const word& entryName,
-    const Type& value
+    const Type& value,
+    const objectRegistry* obrPtr
 )
 :
-    Function1<Type>(entryName),
+    Function1<Type>(entryName, obrPtr),
     value_(value)
 {}
 
@@ -46,10 +47,11 @@ template<class Type>
 Foam::Function1Types::Constant<Type>::Constant
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    Function1<Type>(entryName, dict),
+    Function1<Type>(entryName, dict, obrPtr),
     value_(Zero)
 {
     const entry* eptr = dict.findEntry(entryName, keyType::LITERAL);
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
index 4dfac6e68a..965bb7d464 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
@@ -95,10 +95,20 @@ public:
     // Constructors
 
         //- Construct from components
-        Constant(const word& entryName, const Type& value);
+        Constant
+        (
+            const word& entryName,
+            const Type& value,
+            const objectRegistry* obrPtr = nullptr
+        );
 
-        //- Construct from entry name and dictionary
-        Constant(const word& entryName, const dictionary& dict);
+        //- Construct from entry name, dictionary and optional registry
+        Constant
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
         //- Construct from entry name and Istream
         //  Reads the constant value without the Function1 type
diff --git a/src/OpenFOAM/primitives/functions/Function1/Cosine/Cosine.H b/src/OpenFOAM/primitives/functions/Function1/Cosine/Cosine.H
index 08383ac1c9..01b4294ca7 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Cosine/Cosine.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Cosine/Cosine.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -131,10 +131,15 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
-        Cosine(const word& entryName, const dictionary& dict)
+        //- Construct from entry name, dictionary and optional registry
+        Cosine
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        )
         :
-            Sine<Type>(entryName, dict)
+            Sine<Type>(entryName, dict, obrPtr)
         {}
 
         //- Copy construct
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
index e5a3834661..cfcde22801 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.C
@@ -126,10 +126,11 @@ template<class Function1Type>
 Foam::FieldFunction1<Function1Type>::FieldFunction1
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    Function1Type(entryName, dict)
+    Function1Type(entryName, dict, obrPtr)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
index 0e2cffdf31..8c3bb81bd6 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
@@ -104,6 +104,7 @@ class Function1
             const entry* eptr,       // Eg, dict.findEntry(entryName)
             const dictionary& dict,
             const word& redirectType,
+            const objectRegistry* obrPtr,
             const bool mandatory
         );
 
@@ -131,9 +132,10 @@ public:
         dictionary,
         (
             const word& entryName,
-            const dictionary& dict
+            const dictionary& dict,
+            const objectRegistry* obrPtr
         ),
-        (entryName, dict)
+        (entryName, dict, obrPtr)
     );
 
 
@@ -146,7 +148,8 @@ public:
             const objectRegistry* obrPtr = nullptr
         );
 
-        //- Construct from entry name and dictionary (unused)
+        //- Construct from entry name, (unused) dictionary
+        //- and optional registry
         Function1
         (
             const word& entryName,
@@ -169,6 +172,7 @@ public:
             const word& entryName,
             const dictionary& dict,
             const word& redirectType,
+            const objectRegistry* obrPtr = nullptr,
             const bool mandatory = true
         );
 
@@ -179,6 +183,7 @@ public:
             std::initializer_list<std::pair<const char*,int>> compat,
             const dictionary& dict,
             const word& redirectType = word::null,
+            const objectRegistry* obrPtr = nullptr,
             const bool mandatory = true
         );
 
@@ -187,6 +192,7 @@ public:
         (
             const word& entryName,
             const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr,
             const bool mandatory = true
         );
 
@@ -195,7 +201,8 @@ public:
         (
             const word& entryName,
             const dictionary& dict,
-            const word& redirectType = word::null
+            const word& redirectType = word::null,
+            const objectRegistry* obrPtr = nullptr
         );
 
 
@@ -209,6 +216,7 @@ public:
             const word& entryName,
             const dictionary& dict,
             enum keyType::option matchOpt = keyType::LITERAL,
+            const objectRegistry* obrPtr = nullptr,
             const bool mandatory = true
         );
 
@@ -221,7 +229,8 @@ public:
         ///     const word& entryName,
         ///     const dictionary& dict,
         ///     const Type& deflt,
-        ///     enum keyType::option matchOpt = keyType::LITERAL
+        ///     enum keyType::option matchOpt = keyType::LITERAL,
+        ///     const objectRegistry* obrPtr = nullptr
         /// );
 
 
@@ -286,7 +295,12 @@ public:
     // Constructors
 
         //- Construct from entry name and dictionary
-        FieldFunction1(const word& entryName, const dictionary& dict);
+        FieldFunction1
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
         //- Construct and return a clone
         virtual tmp<Function1<Type>> clone() const;
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
index 0cefa9e2ac..6b60839e00 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1New.C
@@ -38,6 +38,7 @@ Foam::Function1<Type>::New
     const entry* eptr,
     const dictionary& dict,
     const word& redirectType,
+    const objectRegistry* obrPtr,
     const bool mandatory
 )
 {
@@ -86,7 +87,12 @@ Foam::Function1<Type>::New
 
             return autoPtr<Function1<Type>>
             (
-                new Function1Types::Constant<Type>(entryName, constValue)
+                new Function1Types::Constant<Type>
+                (
+                    entryName,
+                    constValue,
+                    obrPtr
+                )
             );
         }
 
@@ -135,7 +141,7 @@ Foam::Function1<Type>::New
             << exit(FatalIOError);
     }
 
-    return ctorPtr(entryName, *coeffs);
+    return ctorPtr(entryName, *coeffs, obrPtr);
 }
 
 
@@ -146,6 +152,7 @@ Foam::Function1<Type>::New
     const word& entryName,
     const dictionary& dict,
     const word& redirectType,
+    const objectRegistry* obrPtr,
     const bool mandatory
 )
 {
@@ -155,6 +162,7 @@ Foam::Function1<Type>::New
         dict.findEntry(entryName, keyType::LITERAL),
         dict,
         redirectType,
+        obrPtr,
         mandatory
     );
 }
@@ -168,6 +176,7 @@ Foam::Function1<Type>::NewCompat
     std::initializer_list<std::pair<const char*,int>> compat,
     const dictionary& dict,
     const word& redirectType,
+    const objectRegistry* obrPtr,
     const bool mandatory
 )
 {
@@ -177,6 +186,7 @@ Foam::Function1<Type>::NewCompat
         dict.findCompat(entryName, compat, keyType::LITERAL),
         dict,
         redirectType,
+        obrPtr,
         mandatory
     );
 }
@@ -188,10 +198,11 @@ Foam::Function1<Type>::New
 (
     const word& entryName,
     const dictionary& dict,
+    const objectRegistry* obrPtr,
     const bool mandatory
 )
 {
-    return Function1<Type>::New(entryName, dict, word::null, mandatory);
+    return Function1<Type>::New(entryName, dict, word::null, obrPtr, mandatory);
 }
 
 
@@ -201,11 +212,12 @@ Foam::Function1<Type>::NewIfPresent
 (
     const word& entryName,
     const dictionary& dict,
-    const word& redirectType
+    const word& redirectType,
+    const objectRegistry* obrPtr
 )
 {
     // mandatory = false
-    return Function1<Type>::New(entryName, dict, redirectType, false);
+    return Function1<Type>::New(entryName, dict, redirectType, obrPtr, false);
 }
 
 
@@ -218,6 +230,7 @@ Foam::Function1<Type>::New
     const word& entryName,
     const dictionary& dict,
     enum keyType::option matchOpt,
+    const objectRegistry* obrPtr,
     const bool mandatory
 )
 {
@@ -259,6 +272,7 @@ Foam::Function1<Type>::New
                     eptr,  // Already resolved
                     dict,
                     word::null,
+                    obrPtr,
                     mandatory
                 )
             );
@@ -292,12 +306,13 @@ Foam::Function1<Type>::New
 ///     const word& entryName,
 ///     const dictionary& dict,
 ///     const Type& deflt,
-///     enum keyType::option matchOpt
+///     enum keyType::option matchOpt,
+///     const objectRegistry* obrPtr
 /// )
 /// {
 ///     auto fref
 ///     (
-///         Function1<Type>::New(entryName, dict, cache, matchOpt, false)
+///         Function1<Type>::New(entryName, dict, cache, matchOpt, obrPtr,false)
 ///     );
 ///
 ///     if (!fref)
@@ -308,5 +323,4 @@ Foam::Function1<Type>::New
 ///     return fref;
 /// }
 
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.C b/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.C
index 0537e48fc3..7beccbed7d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.C
+++ b/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,10 +42,11 @@ template<class Type>
 Foam::Function1Types::LimitRange<Type>::LimitRange
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    Function1<Type>(entryName)
+    Function1<Type>(entryName, obrPtr)
 {
     read(dict);
 }
diff --git a/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.H b/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.H
index e167ebba3c..3222af610a 100644
--- a/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.H
+++ b/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.H
@@ -135,8 +135,13 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
-        LimitRange(const word& entryName, const dictionary& dict);
+        //- Construct from entry name, dictionary and optional registry
+        LimitRange
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
         //- Copy construct
         explicit LimitRange(const LimitRange<Type>& rhs);
diff --git a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.C b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.C
index 25acd3a7dd..4131a04220 100644
--- a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.C
+++ b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -30,9 +31,13 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Function1Types::OneConstant<Type>::OneConstant(const word& entryName)
+Foam::Function1Types::OneConstant<Type>::OneConstant
+(
+    const word& entryName,
+    const objectRegistry* obrPtr
+)
 :
-    Function1<Type>(entryName)
+    Function1<Type>(entryName, obrPtr)
 {}
 
 
@@ -40,10 +45,11 @@ template<class Type>
 Foam::Function1Types::OneConstant<Type>::OneConstant
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    Function1<Type>(entryName, dict)
+    Function1<Type>(entryName, dict, obrPtr)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
index a072e0432d..ea50b0e998 100644
--- a/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/One/OneConstant.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -75,11 +75,20 @@ public:
 
     // Constructors
 
-        //- Construct from entry name
-        explicit OneConstant(const word& entryName);
+        //- Construct from entry name and optional registry
+        explicit OneConstant
+        (
+            const word& entryName,
+            const objectRegistry* obrPtr = nullptr
+        );
 
-        //- Construct from entry name and dictionary
-        OneConstant(const word& entryName, const dictionary& dict);
+        //- Construct from entry name, dictionary and optional registry
+        OneConstant
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
         //- Construct and return a clone
         virtual tmp<Function1<Type>> clone() const
diff --git a/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C b/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C
index b5b2cc6cfe..d72f9a7cf7 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C
@@ -65,10 +65,11 @@ template<class Type>
 Foam::Function1Types::Polynomial<Type>::Polynomial
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    Function1<Type>(entryName, dict),
+    Function1<Type>(entryName, dict, obrPtr),
     coeffs_(),
     canIntegrate_(true)
 {
@@ -104,10 +105,11 @@ template<class Type>
 Foam::Function1Types::Polynomial<Type>::Polynomial
 (
     const word& entryName,
-    const List<Tuple2<Type, Type>>& coeffs
+    const List<Tuple2<Type, Type>>& coeffs,
+    const objectRegistry* obrPtr
 )
 :
-    Function1<Type>(entryName),
+    Function1<Type>(entryName, obrPtr),
     coeffs_(coeffs),
     canIntegrate_(true)
 {
diff --git a/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.H b/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.H
index 6fc5cf9249..67d35b504e 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.H
@@ -108,14 +108,20 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
-        Polynomial(const word& entryName, const dictionary& dict);
+        //- Construct from entry name, dictionary and optional registry
+        Polynomial
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
         //- Construct from components
         Polynomial
         (
             const word& entryName,
-            const List<Tuple2<Type, Type>>& coeffs
+            const List<Tuple2<Type, Type>>& coeffs,
+            const objectRegistry* obrPtr = nullptr
         );
 
         //- Copy constructor
diff --git a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
index 52e7fdc8d3..20903c007a 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,7 +28,7 @@ License
 
 #include "Scale.H"
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class Type>
 void Foam::Function1Types::Scale<Type>::read(const dictionary& coeffs)
@@ -38,14 +38,17 @@ void Foam::Function1Types::Scale<Type>::read(const dictionary& coeffs)
 }
 
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
 template<class Type>
 Foam::Function1Types::Scale<Type>::Scale
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    Function1<Type>(entryName)
+    Function1<Type>(entryName, obrPtr)
 {
     read(dict);
 }
diff --git a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
index 7077203b59..16291de98d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -122,11 +122,12 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from entry name, dictionary and optional registry
         Scale
         (
             const word& entryName,
-            const dictionary& dict
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
         );
 
         //- Copy construct
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
index bfcafed6db..9b928c7e16 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2020 OpenCFD Ltd.
+    Copyright (C) 2016-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,10 +34,11 @@ template<class Type>
 Foam::Function1Types::Sine<Type>::Sine
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    Function1<Type>(entryName, dict),
+    Function1<Type>(entryName, dict, obrPtr),
     t0_(dict.getOrDefault<scalar>("t0", 0)),
     amplitude_(Function1<scalar>::NewIfPresent("amplitude", dict)),
     period_(Function1<scalar>::NewIfPresent("period", dict)),
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
index 64096352e7..be8fdecb8e 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -181,8 +181,13 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
-        Sine(const word& entryName, const dictionary& dict);
+        //- Construct from entry name, dictionary and optional registry
+        Sine
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
         //- Copy construct
         explicit Sine(const Sine<Type>& rhs);
diff --git a/src/OpenFOAM/primitives/functions/Function1/Square/Square.C b/src/OpenFOAM/primitives/functions/Function1/Square/Square.C
index adc4d91f35..c0295bd543 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Square/Square.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Square/Square.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2020 OpenCFD Ltd.
+    Copyright (C) 2016-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,10 +34,11 @@ template<class Type>
 Foam::Function1Types::Square<Type>::Square
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    Sine<Type>(entryName, dict),
+    Sine<Type>(entryName, dict, obrPtr),
     mark_(dict.getOrDefaultCompat<scalar>("mark", {{"markSpace", 2006}}, 1)),
     space_(dict.getOrDefault<scalar>("space", 1))
 {}
diff --git a/src/OpenFOAM/primitives/functions/Function1/Square/Square.H b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
index c79f6e12f3..da491a16f0 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Square/Square.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -144,8 +144,13 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
-        Square(const word& entryName, const dictionary& dict);
+        //- Construct from entry name, dictionary and optional registry
+        Square
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
         //- Copy construct
         explicit Square(const Square<Type>& rhs);
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.C b/src/OpenFOAM/primitives/functions/Function1/Table/Table.C
index cb57b87502..37146ea019 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.C
@@ -34,10 +34,11 @@ template<class Type>
 Foam::Function1Types::Table<Type>::Table
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    TableBase<Type>(entryName, dict),
+    TableBase<Type>(entryName, dict, obrPtr),
     fName_()
 {
     const entry* eptr = dict.findEntry(entryName, keyType::LITERAL);
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
index 154e18c8e2..c9832de5c0 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.H
@@ -119,8 +119,13 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary.
-        Table(const word& entryName, const dictionary& dict);
+        //- Construct from entry name, dictionary and optional registry
+        Table
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
         //- Copy construct
         explicit Table(const Table<Type>& tbl);
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
index 497e4b4cd6..bb8decf69d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
@@ -62,10 +62,11 @@ template<class Type>
 Foam::Function1Types::TableBase<Type>::TableBase
 (
     const word& name,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    Function1<Type>(name, dict),
+    Function1<Type>(name, dict, obrPtr),
     bounding_
     (
         bounds::repeatableBoundingNames.getOrDefault
@@ -103,13 +104,6 @@ Foam::Function1Types::TableBase<Type>::TableBase(const TableBase<Type>& tbl)
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::Function1Types::TableBase<Type>::~TableBase()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
index 57b05c7f2b..aed16b6919 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -101,14 +101,19 @@ public:
     // Constructors
 
         //- Construct from dictionary - note table is not populated
-        TableBase(const word& name, const dictionary& dict);
+        TableBase
+        (
+            const word& name,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
         //- Copy constructor. Note: steals interpolator, tableSamples
         explicit TableBase(const TableBase<Type>& tbl);
 
 
     //- Destructor
-    virtual ~TableBase();
+    virtual ~TableBase() = default;
 
 
     // Member Functions
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
index 0f06734ee9..0d8afbf43c 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2016-2019 OpenCFD Ltd.
+    Copyright (C) 2016-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -34,10 +34,11 @@ template<class Type>
 Foam::Function1Types::TableFile<Type>::TableFile
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    TableBase<Type>(entryName, dict),
+    TableBase<Type>(entryName, dict, obrPtr),
     fName_()
 {
     dict.readEntry("file", fName_);
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
index cabe6e2d9f..9cd1319d6d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -101,7 +101,12 @@ public:
     // Constructors
 
         //- Construct from entry name and "file" found in dictionary
-        TableFile(const word& entryName, const dictionary& dict);
+        TableFile
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
         //- Copy construct
         explicit TableFile(const TableFile<Type>& tbl);
diff --git a/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.C b/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.C
deleted file mode 100644
index fa48a8b659..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.C
+++ /dev/null
@@ -1,43 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenFOAM Foundation
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "Uniform.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::Function1Types::Uniform<Type>::Uniform
-(
-    const word& entryName,
-    const dictionary& dict
-)
-:
-    Constant<Type>(entryName, dict)
-{}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H b/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H
index 805480f504..2edc75a261 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Uniform/Uniform.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -38,15 +38,12 @@ Description
         <entryName>    uniform  <value>
     \endverbatim
 
-SourceFiles
-    Uniform.C
-
 \*---------------------------------------------------------------------------*/
 
 #ifndef Function1Types_Uniform_H
 #define Function1Types_Uniform_H
 
-#include "Function1.H"
+#include "Constant.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -81,8 +78,16 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
-        Uniform(const word& entryName, const dictionary& dict);
+        //- Construct from entry name, dictionary and optional registry
+        Uniform
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        )
+        :
+            Constant<Type>(entryName, dict, obrPtr)
+        {}
 };
 
 
@@ -93,12 +98,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifdef NoRepository
-    #include "Uniform.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.C b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.C
index a9261f2ce4..63cfa2a71f 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,9 +31,13 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Function1Types::ZeroConstant<Type>::ZeroConstant(const word& entryName)
+Foam::Function1Types::ZeroConstant<Type>::ZeroConstant
+(
+    const word& entryName,
+    const objectRegistry* obrPtr
+)
 :
-    Function1<Type>(entryName)
+    Function1<Type>(entryName, obrPtr)
 {}
 
 
@@ -41,10 +45,11 @@ template<class Type>
 Foam::Function1Types::ZeroConstant<Type>::ZeroConstant
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    Function1<Type>(entryName, dict)
+    Function1<Type>(entryName, dict, obrPtr)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
index 8563f6663d..d0eb1e69db 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Zero/ZeroConstant.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -84,11 +84,20 @@ public:
 
     // Constructors
 
-        //- Construct from entry name
-        explicit ZeroConstant(const word& entryName);
+        //- Construct from entry name and optional registry
+        explicit ZeroConstant
+        (
+            const word& entryName,
+            const objectRegistry* obrPtr = nullptr
+        );
 
-        //- Construct from entry name and dictionary
-        ZeroConstant(const word& entryName, const dictionary& dict);
+        //- Construct from entry name, dictionary and optional registry
+        ZeroConstant
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
 
     //- Destructor
diff --git a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.C b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.C
index c41dee3155..a682ff0c3c 100644
--- a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,10 +44,11 @@ namespace Function1Types
 Foam::Function1Types::halfCosineRamp::halfCosineRamp
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    ramp(entryName, dict)
+    ramp(entryName, dict, obrPtr)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
index 7d536988e8..96460832bf 100644
--- a/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/halfCosineRamp/halfCosineRamp.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,8 +67,13 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
-        halfCosineRamp(const word& entryName, const dictionary& dict);
+        //- Construct from entry name, dictionary and optional registry
+        halfCosineRamp
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
 
     //- Destructor
diff --git a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.C b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.C
index de2aca2812..e6ccee22de 100644
--- a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,10 +44,11 @@ namespace Function1Types
 Foam::Function1Types::linearRamp::linearRamp
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    ramp(entryName, dict)
+    ramp(entryName, dict, obrPtr)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
index d22271c839..509e5a4ab9 100644
--- a/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/linearRamp/linearRamp.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,8 +67,13 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
-        linearRamp(const word& entryName, const dictionary& dict);
+        //- Construct from entry name, dictionary and optional registry
+        linearRamp
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
 
     //- Destructor
diff --git a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.C b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.C
index ad1ba81e52..f39b9138b9 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,10 +44,11 @@ namespace Function1Types
 Foam::Function1Types::quadraticRamp::quadraticRamp
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    ramp(entryName, dict)
+    ramp(entryName, dict, obrPtr)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
index fcdfaeacb1..3d6fa2f6ec 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quadraticRamp/quadraticRamp.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,8 +67,13 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
-        quadraticRamp(const word& entryName, const dictionary& dict);
+        //- Construct from entry name, dictionary and optional registry
+        quadraticRamp
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
 
     //- Destructor
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.C b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.C
index c3b0b2085e..cf40c4da2a 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,7 +44,8 @@ namespace Function1Types
 Foam::Function1Types::quarterCosineRamp::quarterCosineRamp
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
     ramp(entryName, dict)
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
index 275d316e47..747eee90c3 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterCosineRamp/quarterCosineRamp.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,8 +67,13 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
-        quarterCosineRamp(const word& entryName, const dictionary& dict);
+        //- Construct from entry name, dictionary and optional registry
+        quarterCosineRamp
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
 
     //- Destructor
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.C b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.C
index 287c5dfd13..b4661e00e7 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,10 +44,11 @@ namespace Function1Types
 Foam::Function1Types::quarterSineRamp::quarterSineRamp
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    ramp(entryName, dict)
+    ramp(entryName, dict, obrPtr)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
index 37aec55d7e..e6d038aab6 100644
--- a/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/quarterSineRamp/quarterSineRamp.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -66,8 +67,13 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
-        quarterSineRamp(const word& entryName, const dictionary& dict);
+        //- Construct from entry name, dictionary and optional registry
+        quarterSineRamp
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
 
     //- Destructor
diff --git a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
index 4f3baec921..b66acd4f32 100644
--- a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,10 +40,11 @@ void Foam::Function1Types::ramp::read(const dictionary& coeffs)
 Foam::Function1Types::ramp::ramp
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    Function1<scalar>(entryName, dict)
+    Function1<scalar>(entryName, dict, obrPtr)
 {
     read(dict);
 }
diff --git a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
index df7ed6c00b..98ce696952 100644
--- a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -119,11 +119,12 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
+        //- Construct from entry name, dictionary and optional registry
         ramp
         (
             const word& entryName,
-            const dictionary& dict
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
         );
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/step/stepFunction.C b/src/OpenFOAM/primitives/functions/Function1/step/stepFunction.C
index 4ab76010f4..efed842cd8 100644
--- a/src/OpenFOAM/primitives/functions/Function1/step/stepFunction.C
+++ b/src/OpenFOAM/primitives/functions/Function1/step/stepFunction.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,10 +43,11 @@ namespace Function1Types
 Foam::Function1Types::stepFunction::stepFunction
 (
     const word& entryName,
-    const dictionary& dict
+    const dictionary& dict,
+    const objectRegistry* obrPtr
 )
 :
-    ramp(entryName, dict)
+    ramp(entryName, dict, obrPtr)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/step/stepFunction.H b/src/OpenFOAM/primitives/functions/Function1/step/stepFunction.H
index e6a6daa638..2b1760fb27 100644
--- a/src/OpenFOAM/primitives/functions/Function1/step/stepFunction.H
+++ b/src/OpenFOAM/primitives/functions/Function1/step/stepFunction.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -66,8 +66,13 @@ public:
 
     // Constructors
 
-        //- Construct from entry name and dictionary
-        stepFunction(const word& entryName, const dictionary& dict);
+        //- Construct from entry name, dictionary and optional registry
+        stepFunction
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
 
 
     //- Destructor
diff --git a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
index d516f0a74d..9dd5f3caea 100644
--- a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
+++ b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,7 +40,7 @@ Foam::TimeFunction1<Type>::TimeFunction1
 :
     time_(runTime),
     name_(entryName),
-    entry_(Function1<Type>::New(entryName, dict))
+    entry_(Function1<Type>::New(entryName, dict, &runTime))
 {
     entry_->convertTimeBase(runTime);
 }
@@ -81,7 +81,7 @@ Foam::TimeFunction1<Type>::TimeFunction1
 template<class Type>
 void Foam::TimeFunction1<Type>::reset(const dictionary& dict)
 {
-    entry_ = Function1<Type>::New(name_, dict);
+    entry_ = Function1<Type>::New(name_, dict, &time_);
     entry_->convertTimeBase(time_);
 }
 
diff --git a/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C b/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C
index 614840c075..9addd356ee 100644
--- a/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C
+++ b/src/randomProcesses/noise/noiseModels/pointNoise/pointNoise.C
@@ -253,7 +253,7 @@ void pointNoise::calculate()
             fName = argList::envGlobalPath()/fName;
         }
 
-        Function1Types::CSV<scalar> data("pressure", dict_, fName);
+        Function1Types::CSV<scalar> data("pressure", dict_, nullptr, fName);
         processData(filei, data);
     }
 }

From 2c2310dc178e0af94c780598cdac7236a8ed3b5d Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Wed, 13 Oct 2021 21:26:02 +0100
Subject: [PATCH 05/18] ENH: reference function object - retrieve reference
 using Function1

Note: previous behaviour to set the reference to a cell value can be recovered
by using the new 'sample' Function1
---
 .../field/reference/reference.C               | 29 ++-------------
 .../field/reference/reference.H               | 35 +++++++------------
 .../field/reference/referenceTemplates.C      | 34 ++++++------------
 3 files changed, 25 insertions(+), 73 deletions(-)

diff --git a/src/functionObjects/field/reference/reference.C b/src/functionObjects/field/reference/reference.C
index d9177443de..e3e4168337 100644
--- a/src/functionObjects/field/reference/reference.C
+++ b/src/functionObjects/field/reference/reference.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -68,12 +68,8 @@ Foam::functionObjects::reference::reference
 )
 :
     fieldExpression(name, runTime, dict),
-    positionIsSet_(false),
-    celli_(-1),
-    interpolationScheme_("cell"),
-    scale_(1),
     localDict_(dict),
-    position_(Zero)
+    scale_(1)
 {
     read(dict);
 
@@ -98,27 +94,6 @@ bool Foam::functionObjects::reference::read(const dictionary& dict)
             Log << "    scale: " << scale_ << nl;
         }
 
-        if (dict.readIfPresent("position", position_))
-        {
-            Log << "    sample position: " << position_ << nl;
-
-            positionIsSet_ = true;
-
-            celli_ = mesh_.findCell(position_);
-
-            label celli = returnReduce(celli_, maxOp<label>());
-
-            if (celli == -1)
-            {
-                FatalIOErrorInFunction(dict)
-                    << "Sample cell could not be found at position "
-                    << position_ << exit(FatalIOError);
-            }
-
-            interpolationScheme_ =
-                dict.getOrDefault<word>("interpolationScheme", "cell");
-        }
-
         Log << endl;
 
         return true;
diff --git a/src/functionObjects/field/reference/reference.H b/src/functionObjects/field/reference/reference.H
index 1c35615bff..f3c42ed8b1 100644
--- a/src/functionObjects/field/reference/reference.H
+++ b/src/functionObjects/field/reference/reference.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,7 +31,7 @@ Group
 
 Description
     Computes a field whose values are offset to a reference
-    value obtained by sampling the field at a user-specified location.
+    value obtained by from a Function1.
 
     The field values are calculated using:
 
@@ -44,7 +44,7 @@ Description
         r_c             | field values at cell
         s               | optional scale factor (default = 1)
         f_{c}(t)        | current field values at cell at this time
-        f_p             | field value at position
+        f_p             | reference value
         f_{off}         | offset field value (default = 0)
     \endvartable
 
@@ -72,11 +72,12 @@ Usage
         // Mandatory (inherited) entry (runtime modifiable)
         field       <field>;
 
+        // Reference value
+        refValue    <Function1>;
+
         // Optional entries (runtime modifiable)
-        position    (0 0 0);
         scale       1.0;
         offset      0.0;
-        interpolationScheme    cell;
 
         // Optional (inherited) entries
         ...
@@ -88,10 +89,9 @@ Usage
         Property     | Description                | Type | Req'd | Dflt
         type         | Type name: reference       | word | yes   | -
         field        | Name of the operand field  | word | yes   | -
-        position     | Position to sample         | vector | no  | \<not used\>
-        scale        | Scale value                | scalar | no  | 1.0
-        offset       | Offset value               | scalar | no  | 0.0
-        interpolationScheme  | Sampling scheme    | word   | no  | cell
+        refValue     | Function1 reference value  | Function1 | yes | -
+        offset       | Offset value               | type-value | no  | zero
+        scale        | Scale factor               | scalar | no  | 1
     \endtable
 
     The inherited entries are elaborated in:
@@ -104,6 +104,7 @@ See also
     - Foam::functionObject
     - Foam::functionObjects::fvMeshFunctionObject
     - Foam::functionObjects::fieldExpression
+    - Foam::Function1
     - ExtendedCodeGuide::functionObjects::field::reference
 
 SourceFiles
@@ -135,23 +136,11 @@ class reference
 {
     // Private Data
 
-        //- Flag to indicate that the position is set
-        bool positionIsSet_;
-
-        //- Sample cell
-        label celli_;
-
-        //- Interpolation scheme
-        word interpolationScheme_;
-
-        //- Scale factor
-        scalar scale_;
-
         //- Local copy of dictionary used for construction
         dictionary localDict_;
 
-        //- Sample location
-        point position_;
+        //- Scale factor
+        scalar scale_;
 
 
     // Private Member Functions
diff --git a/src/functionObjects/field/reference/referenceTemplates.C b/src/functionObjects/field/reference/referenceTemplates.C
index cda6bc56d0..500507023c 100644
--- a/src/functionObjects/field/reference/referenceTemplates.C
+++ b/src/functionObjects/field/reference/referenceTemplates.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,7 +25,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "interpolation.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -40,36 +40,24 @@ bool Foam::functionObjects::reference::calcType()
     {
         const VolFieldType& vf = *vfPtr;
 
+        // non-mandatory
         dimensioned<Type> offset("offset", vf.dimensions(), Zero, localDict_);
 
-        dimensioned<Type> cellValue("value", vf.dimensions(), Zero);
+        dimensioned<Type> refValue("refValue", vf.dimensions(), Zero);
 
-        if (positionIsSet_)
-        {
-            cellValue.value() = -pTraits<Type>::one*GREAT;
+        autoPtr<Function1<Type>> valuePtr
+        (
+            Function1<Type>::New("refValue", localDict_, &mesh_)
+        );
 
-            // Might trigger parallel comms (e.g. volPointInterpolation, if
-            // result is not yet cached) so have all processors do it
-            autoPtr<interpolation<Type>> interpolator
-            (
-                interpolation<Type>::New(interpolationScheme_, vf)
-            );
+        refValue.value() = valuePtr->value(this->time().value());
 
-            if (celli_ != -1)
-            {
-                cellValue.value() =
-                    interpolator().interpolate(position_, celli_, -1);
-            }
-
-            reduce(cellValue.value(), maxOp<Type>());
-
-            Log << "    sampled value: " << cellValue.value() << endl;
-        }
+        Info<< "    Reference value: " << refValue.value() << endl;
 
         return store
         (
             resultName_,
-            scale_*(vf - cellValue + offset)
+            scale_*(vf - refValue + offset)
         );
     }
 

From bc2b469f9d311a91577d6037b2a559212efc1192 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Tue, 21 Sep 2021 21:03:04 +0100
Subject: [PATCH 06/18] ENH: Added new Function1: FunctionObjectValue

Returns a value retrieved from a function object result.

Usage:
    <entryName> functionObjectValue;
    <entryName>Coeffs
    {
        functionObject          <name>;
        functionObjectResult    <function object result field name>
    }
---
 .../FunctionObjectValue/FunctionObjectValue.C | 109 ++++++++++++
 .../FunctionObjectValue/FunctionObjectValue.H | 163 ++++++++++++++++++
 .../FunctionObjectValueI.H                    |  96 +++++++++++
 .../functions/Function1/makeFunction1s.C      |   4 +-
 4 files changed, 371 insertions(+), 1 deletion(-)
 create mode 100644 src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValue.C
 create mode 100644 src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValue.H
 create mode 100644 src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValueI.H

diff --git a/src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValue.C b/src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValue.C
new file mode 100644
index 0000000000..97a411e7d3
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValue.C
@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2021 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "FunctionObjectValue.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::Function1Types::FunctionObjectValue<Type>::read
+(
+    const dictionary& coeffs
+)
+{
+    foName_ = coeffs.get<word>("functionObject");
+    foResultName_ = coeffs.get<word>("functionObjectResult");
+    haveDefaultValue_ = coeffs.readIfPresent("defaultValue", defaultValue_);
+}
+
+
+template<class Type>
+Foam::Function1Types::FunctionObjectValue<Type>::FunctionObjectValue
+(
+    const word& entryName,
+    const dictionary& dict,
+    const objectRegistry* obrPtr
+)
+:
+    Function1<Type>(entryName, dict, obrPtr),
+    foName_(),
+    foResultName_(),
+    defaultValue_(Zero),
+    haveDefaultValue_(false)
+{
+    read(dict);
+}
+
+
+template<class Type>
+Foam::Function1Types::FunctionObjectValue<Type>::FunctionObjectValue
+(
+    const FunctionObjectValue<Type>& rhs
+)
+:
+    Function1<Type>(rhs),
+    foName_(rhs.foName_),
+    foResultName_(rhs.foResultName_),
+    defaultValue_(rhs.defaultValue_),
+    haveDefaultValue_(rhs.haveDefaultValue_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::Function1Types::FunctionObjectValue<Type>::writeEntries
+(
+    Ostream& os
+) const
+{
+    os.writeEntry("functionObject", foName_);
+    os.writeEntry("functionObjectResult", foResultName_);
+
+    if (haveDefaultValue_)
+    {
+        os.writeEntry("defaultValue", defaultValue_);
+    }
+}
+
+
+template<class Type>
+void Foam::Function1Types::FunctionObjectValue<Type>::writeData
+(
+    Ostream& os
+) const
+{
+    Function1<Type>::writeData(os);
+    os.endEntry();
+
+    os.beginBlock(word(this->name() + "Coeffs"));
+    writeEntries(os);
+    os.endBlock();
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValue.H b/src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValue.H
new file mode 100644
index 0000000000..501b2b1a72
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValue.H
@@ -0,0 +1,163 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2021 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::Function1Types::FunctionObjectValue
+
+Description
+    Returns a value retrieved from a function object result.
+
+    Usage:
+    \verbatim
+        <entryName> functionObjectValue;
+        <entryName>Coeffs
+        {
+            functionObject          <name>;
+            functionObjectResult    <function object result field>;
+            defaultValue            <value>; // optional
+        }
+    \endverbatim
+
+
+Note
+- does not implement integrate()
+
+SourceFiles
+    FunctionObjectValue.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Function1Types_FunctionObjectValue_H
+#define Function1Types_FunctionObjectValue_H
+
+#include "Function1.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace Function1Types
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class FunctionObjectValue Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class FunctionObjectValue
+:
+    public Function1<Type>
+{
+    // Private Data
+
+        //- Function object name
+        word foName_;
+
+        //- Function object result name
+        word foResultName_;
+
+        //- Default value when function object result is unavailable
+        Type defaultValue_;
+
+        //- Flag to indicate that default value is available
+        bool haveDefaultValue_;
+
+
+    // Private Member Functions
+
+        //- Read the coefficients from the given dictionary
+        void read(const dictionary& coeffs);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("functionObjectValue");
+
+
+    // Generated Methods
+
+        //- No copy assignment
+        void operator=(const FunctionObjectValue<Type>&) = delete;
+
+
+    // Constructors
+
+        //- Construct from entry name, dictionary and optional registry
+        FunctionObjectValue
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
+
+        //- Copy construct
+        explicit FunctionObjectValue(const FunctionObjectValue<Type>& rhs);
+
+        //- Construct and return a clone
+        virtual tmp<Function1<Type>> clone() const
+        {
+            return tmp<Function1<Type>>(new FunctionObjectValue<Type>(*this));
+        }
+
+
+    //- Destructor
+    virtual ~FunctionObjectValue() = default;
+
+
+    // Member Functions
+
+        //- Return value for time t
+        virtual inline Type value(const scalar t) const;
+
+        //- Integrate between two (scalar) values
+        virtual Type integrate(const scalar x1, const scalar x2) const;
+
+        //- Write in dictionary format
+        virtual void writeData(Ostream& os) const;
+
+        //- Write coefficient entries in dictionary format
+        void writeEntries(Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Function1Types
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "FunctionObjectValueI.H"
+
+#ifdef NoRepository
+    #include "FunctionObjectValue.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValueI.H b/src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValueI.H
new file mode 100644
index 0000000000..c7fb61d546
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValueI.H
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2021 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "FunctionObjectValue.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+inline Type Foam::Function1Types::FunctionObjectValue<Type>::value
+(
+    const scalar /*unused*/
+) const
+{
+    const auto& props = this->time().functionObjects().propsDict();
+
+    if (!props.hasResultObject(foName_))
+    {
+        if (haveDefaultValue_)
+        {
+            Info<< "    Function object " << foName_
+                << " not found; using default value " << defaultValue_
+                << endl;
+
+            return defaultValue_;
+        }
+
+        FatalErrorInFunction
+            << "Function object " << foName_
+            << " results not found. Valid objects with results include: "
+            << props.objectResultNames()
+            << exit(FatalError);
+    }
+
+    if (!props.hasResultObjectEntry(foName_, foResultName_))
+    {
+        if (haveDefaultValue_)
+        {
+            Info<< "    Function object " << foName_
+                << " result " << foResultName_
+                << " not found; using default value " << defaultValue_
+                << endl;
+
+            return defaultValue_;
+        }
+
+        FatalErrorInFunction
+            << "Function object " << foName_
+            << " does not have a result field " << foResultName_ << nl
+            << " Available result fields include: "
+            << props.objectResultEntries(foName_)
+            << exit(FatalError);
+    }
+
+    Info<< "    Using " << foName_ << " function object value" << endl;
+
+    return props.template getObjectResult<Type>(foName_, foResultName_);
+}
+
+
+template<class Type>
+inline Type Foam::Function1Types::FunctionObjectValue<Type>::integrate
+(
+    const scalar x1,
+    const scalar x2
+) const
+{
+    NotImplemented;
+    return pTraits<Type>::zero;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C b/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C
index 680c49149c..52d6e3bb52 100644
--- a/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C
+++ b/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C
@@ -39,6 +39,7 @@ License
 #include "TableFile.H"
 #include "Scale.H"
 #include "LimitRange.H"
+#include "FunctionObjectValue.H"
 #include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -57,7 +58,8 @@ License
     makeFunction1Type(Table, Type);                                            \
     makeFunction1Type(TableFile, Type);                                        \
     makeFunction1Type(Scale, Type);                                            \
-    makeFunction1Type(LimitRange, Type);
+    makeFunction1Type(LimitRange, Type);                                       \
+    makeFunction1Type(FunctionObjectValue, Type);
 
 #define makeFieldFunction1s(Type)                                              \
     makeFunction1(Type);                                                       \

From b9b011f5ea1be0e9df1fe877d8789697342598c4 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Wed, 13 Oct 2021 21:31:43 +0100
Subject: [PATCH 07/18] ENH: Added new sample Function1

---
 src/sampling/Make/files                       |   1 +
 .../Function1/Sample/SampleFunction1.C        | 185 ++++++++++++++++++
 .../Function1/Sample/SampleFunction1.H        | 166 ++++++++++++++++
 .../functions/Function1/makeFunction1s.C      |  46 +++++
 4 files changed, 398 insertions(+)
 create mode 100644 src/sampling/functions/Function1/Sample/SampleFunction1.C
 create mode 100644 src/sampling/functions/Function1/Sample/SampleFunction1.H
 create mode 100644 src/sampling/functions/Function1/makeFunction1s.C

diff --git a/src/sampling/Make/files b/src/sampling/Make/files
index 22c32f0eeb..ad272d0e20 100644
--- a/src/sampling/Make/files
+++ b/src/sampling/Make/files
@@ -80,5 +80,6 @@ meshToMesh0/meshToMesh0.C
 meshToMesh0/calculateMeshToMesh0Addressing.C
 meshToMesh0/calculateMeshToMesh0Weights.C
 
+functions/Function1/makeFunction1s.C
 
 LIB = $(FOAM_LIBBIN)/libsampling
diff --git a/src/sampling/functions/Function1/Sample/SampleFunction1.C b/src/sampling/functions/Function1/Sample/SampleFunction1.C
new file mode 100644
index 0000000000..d617ec7d35
--- /dev/null
+++ b/src/sampling/functions/Function1/Sample/SampleFunction1.C
@@ -0,0 +1,185 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2021 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "SampleFunction1.H"
+#include "volFields.H"
+#include "interpolation.H"
+#include "pointIOField.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+void Foam::Function1Types::Sample<Type>::setSampleCell() const
+{
+    const polyMesh& mesh = this->template mesh<polyMesh>();
+
+    const auto& points = static_cast<const pointIOField&>(mesh.points());
+
+    if (pointEventNo_ < points.eventNo())
+    {
+        pointEventNo_ = points.eventNo();
+
+        celli_ = this->template mesh<fvMesh>().findCell(position_);
+
+        if (!returnReduce(celli_ != -1, orOp<bool>()))
+        {
+            FatalErrorInFunction
+                << "Sample cell could not be found at position "
+                << position_ << nl
+                << exit(FatalError);
+        }
+
+        if (debug)
+        {
+            Pout<< "Position: " << position_
+                << " celli:" << celli_
+                << " eventNo:" << pointEventNo_
+                << " points eventNo:" << points.eventNo()
+                << endl;
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::Function1Types::Sample<Type>::Sample
+(
+    const word& entryName,
+    const dictionary& dict,
+    const objectRegistry* obrPtr
+)
+:
+    Function1<Type>(entryName, dict, obrPtr),
+    fieldName_(dict.get<word>("field")),
+    position_(dict.get<point>("position")),
+    interpolationScheme_
+    (
+        dict.getOrDefault<word>("interpolationScheme", "cell")
+    ),
+    celli_(-1),
+    pointEventNo_(-1)
+{}
+
+
+template<class Type>
+Foam::Function1Types::Sample<Type>::Sample(const Sample& s)
+:
+    Function1<Type>(s),
+    fieldName_(s.fieldName_),
+    position_(s.position_),
+    interpolationScheme_(s.interpolationScheme_),
+    celli_(s.celli_),
+    pointEventNo_(s.pointEventNo_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Type Foam::Function1Types::Sample<Type>::value(const scalar x) const
+{
+    typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
+
+    const auto& mesh = this->template mesh<fvMesh>();
+
+    const auto* fieldPtr = mesh.template cfindObject<VolFieldType>(fieldName_);
+
+    if (!fieldPtr)
+    {
+        FatalErrorInFunction
+            << "Unable to find field " << fieldName_ << " on the mesh database"
+            << ". Valid " << VolFieldType::typeName << " fields are:"
+            << mesh.names(VolFieldType::typeName)
+            << exit(FatalError);
+    }
+
+
+    // Might trigger parallel comms (e.g. volPointInterpolation, if
+    // result is not yet cached) so have all processors do it
+    autoPtr<interpolation<Type>> interpolator
+    (
+        interpolation<Type>::New(interpolationScheme_, *fieldPtr)
+    );
+
+    Type result = pTraits<Type>::min;
+
+    setSampleCell();
+
+    if (celli_ != -1)
+    {
+        result = interpolator().interpolate(position_, celli_, -1);
+    }
+
+    reduce(result, maxOp<Type>());
+
+    DebugInfo << "sampled value: " << result << endl;
+
+    return result;
+}
+
+
+template<class Type>
+Type Foam::Function1Types::Sample<Type>::integrate
+(
+    const scalar x1,
+    const scalar x2
+) const
+{
+    NotImplemented;
+
+    return Zero;
+}
+
+
+template<class Type>
+void Foam::Function1Types::Sample<Type>::writeEntries(Ostream& os) const
+{
+    os.writeEntry("field", fieldName_);
+    os.writeEntry("position", position_);
+
+    os.writeEntryIfDifferent<word>
+    (
+        "interpolationScheme", "cell", interpolationScheme_
+    );
+}
+
+
+template<class Type>
+void Foam::Function1Types::Sample<Type>::writeData(Ostream& os) const
+{
+    Function1<Type>::writeData(os);
+    os.endEntry();
+
+    os.beginBlock(word(this->name() + "Coeffs"));
+    writeEntries(os);
+    os.endBlock();
+}
+
+
+// ************************************************************************* //
diff --git a/src/sampling/functions/Function1/Sample/SampleFunction1.H b/src/sampling/functions/Function1/Sample/SampleFunction1.H
new file mode 100644
index 0000000000..11e27aadc4
--- /dev/null
+++ b/src/sampling/functions/Function1/Sample/SampleFunction1.H
@@ -0,0 +1,166 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2021 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::Function1Types::sample
+
+Description
+    Minimal example by using \c system/controlDict.functions:
+    \verbatim
+
+    \verbatim
+        <entryName> sample;
+        <entryName>Coeffs
+        {
+            field           <field name>;
+            position        (0 0 0);
+            interpolationScheme cell;
+        }
+    \endverbatim
+
+SourceFiles
+    sampleFunction1.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Function1Types_Sample_H
+#define Function1Types_Sample_H
+
+#include "Function1.H"
+#include "point.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace Function1Types
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class Sample Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class Sample
+:
+    public Function1<Type>
+{
+    // Private Data
+
+        //- Name of field to sample
+        const word fieldName_;
+
+        //- Sample position
+        const point position_;
+
+        //- Interpolation scheme name; default = "cell"
+        const word interpolationScheme_;
+
+        //- Sample cell
+        mutable label celli_;
+
+        //- Points event number used to determine if celli should be updated
+        mutable label pointEventNo_;
+
+
+    // Private Member Functions
+
+        //- Set the sample celli; error on not found
+        void setSampleCell() const;
+
+        //- No copy assignment
+        void operator=(const Sample<Type>&) = delete;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("sample");
+
+
+    // Constructors
+
+        //- Construct from entry name, dictionary and optional registry
+        Sample
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
+
+        //- Construct from components
+        Sample
+        (
+            const word& entryName,
+            const List<Tuple2<Type, Type>>& coeffs,
+            const objectRegistry* obrPtr = nullptr
+        );
+
+        //- Copy constructor
+        explicit Sample(const Sample& poly);
+
+        //- Construct and return a clone
+        virtual tmp<Function1<Type>> clone() const
+        {
+            return tmp<Function1<Type>>(new Sample<Type>(*this));
+        }
+
+
+    //- Destructor
+    virtual ~Sample() = default;
+
+
+    // Member Functions
+
+        //- Return Sample value
+        virtual Type value(const scalar x) const;
+
+        //- Integrate between two (scalar) values
+        virtual Type integrate(const scalar x1, const scalar x2) const;
+
+        //- Write as primitive (inline) format
+        virtual void writeData(Ostream& os) const;
+
+        //- Write coefficient entries in dictionary format
+        void writeEntries(Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Function1Types
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "SampleFunction1.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/sampling/functions/Function1/makeFunction1s.C b/src/sampling/functions/Function1/makeFunction1s.C
new file mode 100644
index 0000000000..7739a872e7
--- /dev/null
+++ b/src/sampling/functions/Function1/makeFunction1s.C
@@ -0,0 +1,46 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2021 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "SampleFunction1.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeFunction1s(Type)                                                   \
+    makeFunction1Type(Sample, Type);
+
+namespace Foam
+{
+    makeFunction1s(scalar);
+    makeFunction1s(vector);
+    makeFunction1s(sphericalTensor);
+    makeFunction1s(symmTensor);
+    makeFunction1s(tensor);
+}
+
+
+// ************************************************************************* //

From f29eb55cee84a509b94e0c6b4b96b866a54919c1 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Wed, 13 Oct 2021 21:30:46 +0100
Subject: [PATCH 08/18] ENH: Refactored TimeFunction1 - now possible using
 Function1 directly

---
 src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C      | 2 +-
 .../functions/Function1/Polynomial/PolynomialEntry.C       | 5 +++++
 src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C    | 5 +++++
 src/OpenFOAM/primitives/functions/Function1/Table/Table.C  | 2 +-
 .../primitives/functions/Function1/Table/TableBase.C       | 7 ++++++-
 .../primitives/functions/Function1/Table/TableBase.H       | 2 +-
 .../primitives/functions/Function1/TableFile/TableFile.C   | 2 +-
 src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C    | 5 +++++
 .../primitives/functions/TimeFunction1/TimeFunction1.C     | 3 ++-
 9 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
index f3d4c064ad..fc2a40f257 100644
--- a/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
+++ b/src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C
@@ -224,7 +224,7 @@ Foam::Function1Types::CSV<Type>::CSV
 {
     read();
 
-    TableBase<Type>::check();
+    TableBase<Type>::initialise();
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C b/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C
index d72f9a7cf7..7d363bb2fc 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C
@@ -56,6 +56,11 @@ void Foam::Function1Types::Polynomial<Type>::checkCoefficients()
             << "Polynomial " << this->name() << " cannot be integrated"
             << endl;
     }
+
+    if (this->isTime())
+    {
+        convertTimeBase(this->time());
+    }
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
index 9b928c7e16..0fee1197a1 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
@@ -50,6 +50,11 @@ Foam::Function1Types::Sine<Type>::Sine
     {
         frequency_ = Function1<scalar>::New("frequency", dict);
     }
+
+    if (this->isTime())
+    {
+        convertTimeBase(this->time());
+    }
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/Table.C b/src/OpenFOAM/primitives/functions/Function1/Table/Table.C
index 37146ea019..566a547d8c 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/Table.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/Table.C
@@ -85,7 +85,7 @@ Foam::Function1Types::Table<Type>::Table
         dict.readEntry("values", this->table_);
     }
 
-    TableBase<Type>::check();
+    TableBase<Type>::initialise();
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
index bb8decf69d..45e7a6d6ee 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
@@ -107,7 +107,7 @@ Foam::Function1Types::TableBase<Type>::TableBase(const TableBase<Type>& tbl)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function1Types::TableBase<Type>::check() const
+void Foam::Function1Types::TableBase<Type>::initialise()
 {
     if (!table_.size())
     {
@@ -134,6 +134,11 @@ void Foam::Function1Types::TableBase<Type>::check() const
         prevValue = currValue;
         ++i;
     }
+
+    if (this->isTime())
+    {
+        convertTimeBase(this->time());
+    }
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
index aed16b6919..1b805a8c85 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
@@ -119,7 +119,7 @@ public:
     // Member Functions
 
         //- Check the table for size and consistency
-        void check() const;
+        void initialise();
 
         //- Check minimum table bounds
         bool checkMinBounds(const scalar x, scalar& xDash) const;
diff --git a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
index 0d8afbf43c..a0a27c3ed1 100644
--- a/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
+++ b/src/OpenFOAM/primitives/functions/Function1/TableFile/TableFile.C
@@ -57,7 +57,7 @@ Foam::Function1Types::TableFile<Type>::TableFile
 
     is  >> this->table_;
 
-    TableBase<Type>::check();
+    TableBase<Type>::initialise();
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
index b66acd4f32..76b236141b 100644
--- a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
@@ -34,6 +34,11 @@ void Foam::Function1Types::ramp::read(const dictionary& coeffs)
 {
     start_ = coeffs.getOrDefault<scalar>("start", 0);
     coeffs.readEntry("duration", duration_);
+
+    if (isTime())
+    {
+        convertTimeBase(time());
+    }
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
index 9dd5f3caea..60b95f2d8f 100644
--- a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
+++ b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
@@ -42,7 +42,8 @@ Foam::TimeFunction1<Type>::TimeFunction1
     name_(entryName),
     entry_(Function1<Type>::New(entryName, dict, &runTime))
 {
-    entry_->convertTimeBase(runTime);
+    // Time conversion now handled by Function1 directly
+    // entry_->convertTimeBase(runTime);
 }
 
 

From 925a2e724b257a04b05b6abcbcdb3abe82f7fafa Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Wed, 10 Nov 2021 13:01:27 +0100
Subject: [PATCH 09/18] ENH: add caching selector to PatchFunction1

- extend handling of uniform PatchFunction1 to include new Function1
  types and pass through the objectRegistry information
---
 .../PatchFunction1/PatchFunction1.H           | 19 ++++-
 .../PatchFunction1/PatchFunction1New.C        | 74 +++++++++++++++++++
 .../PatchFunction1/patchFunction1Base.C       | 25 ++++++-
 .../PatchFunction1/patchFunction1Base.H       | 30 +++++++-
 .../UniformValueField/UniformValueField.C     | 12 ++-
 .../UniformValueField/UniformValueField.H     | 13 +++-
 .../PatchFunction1/makePatchFunction1s.C      | 14 ++--
 .../functions/Function1/makeFunction1s.C      |  8 +-
 8 files changed, 177 insertions(+), 18 deletions(-)

diff --git a/src/meshTools/PatchFunction1/PatchFunction1/PatchFunction1.H b/src/meshTools/PatchFunction1/PatchFunction1/PatchFunction1.H
index b6039cf3d5..8072fb0193 100644
--- a/src/meshTools/PatchFunction1/PatchFunction1/PatchFunction1.H
+++ b/src/meshTools/PatchFunction1/PatchFunction1/PatchFunction1.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -49,6 +49,7 @@ SeeAlso
 #include "patchFunction1Base.H"
 #include "coordinateScaling.H"
 #include "Field.H"
+#include "HashPtrTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -192,6 +193,22 @@ public:
         );
 
 
+    // Caching Selectors - accept wildcards in dictionary
+
+        //- Selector with external storage.
+        //- This also allows wildcard matches in a dictionary
+        static refPtr<PatchFunction1<Type>> New
+        (
+            HashPtrTable<PatchFunction1<Type>>& cache,
+            const polyPatch& pp,
+            const word& entryName,
+            const dictionary& dict,
+            enum keyType::option matchOpt = keyType::LITERAL,
+            const bool faceValues = true,
+            const bool mandatory = true
+        );
+
+
     //- Destructor
     virtual ~PatchFunction1() = default;
 
diff --git a/src/meshTools/PatchFunction1/PatchFunction1/PatchFunction1New.C b/src/meshTools/PatchFunction1/PatchFunction1/PatchFunction1New.C
index 9337213313..f371329280 100644
--- a/src/meshTools/PatchFunction1/PatchFunction1/PatchFunction1New.C
+++ b/src/meshTools/PatchFunction1/PatchFunction1/PatchFunction1New.C
@@ -223,4 +223,78 @@ Foam::PatchFunction1<Type>::NewIfPresent
 }
 
 
+template<class Type>
+Foam::refPtr<Foam::PatchFunction1<Type>>
+Foam::PatchFunction1<Type>::New
+(
+    HashPtrTable<PatchFunction1<Type>>& cache,
+
+    const polyPatch& pp,
+    const word& entryName,
+    const dictionary& dict,
+    enum keyType::option matchOpt,
+    const bool faceValues,
+    const bool mandatory
+)
+{
+    // See corresponding comments in Function1::New (caching version)
+
+    refPtr<PatchFunction1<Type>> fref;  // return value
+
+    // Try for direct cache hit
+    fref.cref(cache.get(entryName));
+
+    if (fref)
+    {
+        return fref;
+    }
+
+
+    // Lookup from dictionary
+    const entry* eptr = dict.findEntry(entryName, matchOpt);
+
+    if (eptr)
+    {
+        // Use keyword (potentially a wildcard) instead of entry name
+        const auto& kw = eptr->keyword();
+
+        // Try for a cache hit
+        fref.cref(cache.get(kw));
+
+        if (!fref)
+        {
+            // Create new entry
+            auto fauto
+            (
+                PatchFunction1<Type>::New
+                (
+                    pp,
+                    kw,
+                    eptr,  // Already resolved
+                    dict,
+                    faceValues,
+                    mandatory
+                )
+            );
+
+            if (fauto)
+            {
+                // Cache the newly created function
+                fref.cref(fauto.get());
+                cache.set(kw, fauto);
+            }
+        }
+    }
+
+    if (mandatory && !fref)
+    {
+        FatalIOErrorInFunction(dict)
+            << "No match for " << entryName << nl
+            << exit(FatalIOError);
+    }
+
+    return fref;
+}
+
+
 // ************************************************************************* //
diff --git a/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.C b/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.C
index 6902e773bd..7a80721fd8 100644
--- a/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.C
+++ b/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,7 +26,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "patchFunction1Base.H"
+#include "polyBoundaryMesh.H"
+#include "polyMesh.H"
 #include "polyPatch.H"
+#include "objectRegistry.H"
 #include "Time.H"
 
 // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
@@ -81,7 +84,25 @@ Foam::patchFunction1Base::patchFunction1Base
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::patchFunction1Base::convertTimeBase(const Time&)
+const Foam::objectRegistry* Foam::patchFunction1Base::obrPtr() const
+{
+    return &(patch_.boundaryMesh().mesh());  // mesh registry
+}
+
+
+const Foam::objectRegistry& Foam::patchFunction1Base::obr() const
+{
+    return patch_.boundaryMesh().mesh();  // mesh registry
+}
+
+
+const Foam::Time& Foam::patchFunction1Base::time() const
+{
+    return patch_.boundaryMesh().mesh().time();
+}
+
+
+void Foam::patchFunction1Base::convertTimeBase(const Time& t)
 {}
 
 
diff --git a/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.H b/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.H
index f2c60158e5..d4065c0f21 100644
--- a/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.H
+++ b/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.H
@@ -51,6 +51,7 @@ namespace Foam
 {
 
 // Forward Declarations
+class objectRegistry;
 class Time;
 
 /*---------------------------------------------------------------------------*\
@@ -77,6 +78,9 @@ protected:
 
     // Protected Member Functions
 
+        //- Return the object registry (ie, the mesh) as pointer
+        const objectRegistry* obrPtr() const;
+
         //- No copy assignment
         void operator=(const patchFunction1Base&) = delete;
 
@@ -122,19 +126,19 @@ public:
     // Access
 
         //- The name of the entry
-        const word& name() const
+        const word& name() const noexcept
         {
             return name_;
         }
 
         //- Reference to the patch
-        const polyPatch& patch() const
+        const polyPatch& patch() const noexcept
         {
             return patch_;
         }
 
         //- Generate face or point values on patch?
-        bool faceValues() const
+        bool faceValues() const noexcept
         {
             return faceValues_;
         }
@@ -145,11 +149,29 @@ public:
             return (faceValues_ ? patch_.size() : patch_.nPoints());
         }
 
+        //- Has an associated objectRegistry (ie, from mesh)
+        /// bool hasDb() const noexcept
+        /// {
+        ///     return true;
+        /// }
+
+        //- Return the object registry (ie, the mesh)
+        const objectRegistry& obr() const;
+
+        //- False: not created with time
+        /// bool isTime() const noexcept
+        /// {
+        ///     return false;
+        /// }
+
+        //- Return the time database
+        const Time& time() const;
+
 
     // Manipulation
 
         //- Convert time
-        virtual void convertTimeBase(const Time&);
+        virtual void convertTimeBase(const Time& t);
 };
 
 
diff --git a/src/meshTools/PatchFunction1/UniformValueField/UniformValueField.C b/src/meshTools/PatchFunction1/UniformValueField/UniformValueField.C
index d18b079515..aabdc82bd6 100644
--- a/src/meshTools/PatchFunction1/UniformValueField/UniformValueField.C
+++ b/src/meshTools/PatchFunction1/UniformValueField/UniformValueField.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -47,7 +47,8 @@ Foam::PatchFunction1Types::UniformValueField<Type>::UniformValueField
         (
             entryName,
             dict,
-            redirectType
+            redirectType,
+            patchFunction1Base::obrPtr()  // mesh registry
         )
     )
 {}
@@ -72,7 +73,12 @@ Foam::PatchFunction1Types::UniformValueField<Type>::UniformValueField
 :
     PatchFunction1<Type>(rhs, pp),
     uniformValuePtr_(rhs.uniformValuePtr_.clone())
-{}
+{
+    if (uniformValuePtr_)
+    {
+        uniformValuePtr_->resetDb(patchFunction1Base::obrPtr());
+    }
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
diff --git a/src/meshTools/PatchFunction1/UniformValueField/UniformValueField.H b/src/meshTools/PatchFunction1/UniformValueField/UniformValueField.H
index 70b1e1170a..b942323531 100644
--- a/src/meshTools/PatchFunction1/UniformValueField/UniformValueField.H
+++ b/src/meshTools/PatchFunction1/UniformValueField/UniformValueField.H
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -173,6 +173,17 @@ public:
 } // End namespace PatchFunction1Types
 } // End namespace Foam
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Macros
+
+#undef  addUniformValueFieldFunction1s
+#define addUniformValueFieldFunction1s(F1Name, Type)                           \
+    PatchFunction1<Type>::adddictionaryConstructorToTable                      \
+    <PatchFunction1Types::UniformValueField<Type>>                             \
+        add##F1Name##UniformValueField##Type##ConstructorToTable_(#F1Name);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "UniformValueFieldI.H"
diff --git a/src/meshTools/PatchFunction1/makePatchFunction1s.C b/src/meshTools/PatchFunction1/makePatchFunction1s.C
index d2c3e324de..53619a4e60 100644
--- a/src/meshTools/PatchFunction1/makePatchFunction1s.C
+++ b/src/meshTools/PatchFunction1/makePatchFunction1s.C
@@ -29,9 +29,10 @@ License
 #include "fieldTypes.H"
 #include "ConstantField.H"
 #include "UniformValueField.H"
+#include "FunctionObjectValue.H"
 #include "MappedFile.H"
-#include "addToRunTimeSelectionTable.H"
 #include "Table.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -41,11 +42,6 @@ License
     makePatchFunction1Type(MappedFile, Type);                                  \
     makePatchFunction1Type(UniformValueField, Type);
 
-#define addUniformValueFieldFunction1s(F1Type, Type)                           \
-    PatchFunction1<Type>::adddictionaryConstructorToTable                      \
-    <PatchFunction1Types::UniformValueField<Type>>                             \
-        add##F1Type##UniformValueField##Type##ConstructorToTable_(#F1Type);
-
 namespace Foam
 {
     makePatchFunction1(label);
@@ -121,6 +117,12 @@ namespace Foam
     addUniformValueFieldFunction1s(scale, symmTensor);
     addUniformValueFieldFunction1s(scale, tensor);
 
+    addUniformValueFieldFunction1s(functionObjectValue, scalar);
+    addUniformValueFieldFunction1s(functionObjectValue, vector);
+    addUniformValueFieldFunction1s(functionObjectValue, sphericalTensor);
+    addUniformValueFieldFunction1s(functionObjectValue, symmTensor);
+    addUniformValueFieldFunction1s(functionObjectValue, tensor);
+
 
     ////- Option2 : at static initialisation add all Function1 types.
     ////  This does not work because we cannot guarantee that the Function1
diff --git a/src/sampling/functions/Function1/makeFunction1s.C b/src/sampling/functions/Function1/makeFunction1s.C
index 7739a872e7..a8e80122fb 100644
--- a/src/sampling/functions/Function1/makeFunction1s.C
+++ b/src/sampling/functions/Function1/makeFunction1s.C
@@ -26,6 +26,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "SampleFunction1.H"
+#include "UniformValueField.H"
 #include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -40,7 +41,12 @@ namespace Foam
     makeFunction1s(sphericalTensor);
     makeFunction1s(symmTensor);
     makeFunction1s(tensor);
+
+    addUniformValueFieldFunction1s(sample, scalar);
+    addUniformValueFieldFunction1s(sample, vector);
+    addUniformValueFieldFunction1s(sample, sphericalTensor);
+    addUniformValueFieldFunction1s(sample, symmTensor);
+    addUniformValueFieldFunction1s(sample, tensor);
 }
 
-
 // ************************************************************************* //

From 9194cd5203be12d1b04abd854527f3a92b70264b Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Thu, 18 Nov 2021 14:26:50 +0000
Subject: [PATCH 10/18] ENH: Deprecated TimeFunction1 usage in favour of
 Function1

---
 .../Function1/Polynomial/PolynomialEntry.C    |  5 --
 .../functions/Function1/Sine/Sine.C           |  5 --
 .../functions/Function1/Table/TableBase.C     |  5 --
 .../functions/Function1/ramp/ramp.C           |  5 --
 .../atmBoundaryLayer/atmBoundaryLayer.C       | 48 +++++------
 .../atmBoundaryLayer/atmBoundaryLayer.H       | 20 ++---
 ...entHeatFluxTemperatureFvPatchScalarField.C | 12 +--
 ...entHeatFluxTemperatureFvPatchScalarField.H | 10 +--
 ...atmAlphatkWallFunctionFvPatchScalarField.C | 12 +--
 ...atmAlphatkWallFunctionFvPatchScalarField.H | 10 +--
 .../ConeInjection/ConeInjection.C             | 46 +++++-----
 .../ConeInjection/ConeInjection.H             | 12 +--
 .../ConeNozzleInjection/ConeNozzleInjection.C | 86 ++++++++++++-------
 .../ConeNozzleInjection/ConeNozzleInjection.H | 16 ++--
 .../InflationInjection/InflationInjection.C   | 26 +++---
 .../InflationInjection/InflationInjection.H   |  5 +-
 .../InjectionModel/InjectionModel.C           | 20 +++--
 .../InjectionModel/InjectionModel.H           |  4 +-
 .../PatchFlowRateInjection.C                  | 13 ++-
 .../PatchFlowRateInjection.H                  |  3 +-
 .../PatchInjection/PatchInjection.C           | 15 ++--
 .../PatchInjection/PatchInjection.H           |  6 +-
 .../prescribedRotation/prescribedRotation.C   | 10 +--
 .../prescribedRotation/prescribedRotation.H   |  8 +-
 .../linearSpringDamper/linearSpringDamper.C   |  8 +-
 .../linearSpringDamper/linearSpringDamper.H   |  4 +-
 .../radiationModels/fvDOM/fvDOM/fvDOM.C       |  6 +-
 .../radiationModels/fvDOM/fvDOM/fvDOM.H       |  2 +-
 .../radiationModels/solarLoad/solarLoad.C     |  6 +-
 .../radiationModels/solarLoad/solarLoad.H     |  8 +-
 .../solarCalculator/solarCalculator.C         | 12 +--
 .../solarCalculator/solarCalculator.H         | 14 +--
 32 files changed, 237 insertions(+), 225 deletions(-)

diff --git a/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C b/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C
index 7d363bb2fc..d72f9a7cf7 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C
@@ -56,11 +56,6 @@ void Foam::Function1Types::Polynomial<Type>::checkCoefficients()
             << "Polynomial " << this->name() << " cannot be integrated"
             << endl;
     }
-
-    if (this->isTime())
-    {
-        convertTimeBase(this->time());
-    }
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
index 0fee1197a1..9b928c7e16 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
@@ -50,11 +50,6 @@ Foam::Function1Types::Sine<Type>::Sine
     {
         frequency_ = Function1<scalar>::New("frequency", dict);
     }
-
-    if (this->isTime())
-    {
-        convertTimeBase(this->time());
-    }
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
index 45e7a6d6ee..2bbfba78c2 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
@@ -134,11 +134,6 @@ void Foam::Function1Types::TableBase<Type>::initialise()
         prevValue = currValue;
         ++i;
     }
-
-    if (this->isTime())
-    {
-        convertTimeBase(this->time());
-    }
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
index 76b236141b..b66acd4f32 100644
--- a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
@@ -34,11 +34,6 @@ void Foam::Function1Types::ramp::read(const dictionary& coeffs)
 {
     start_ = coeffs.getOrDefault<scalar>("start", 0);
     coeffs.readEntry("duration", duration_);
-
-    if (isTime())
-    {
-        convertTimeBase(time());
-    }
 }
 
 
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
index a077f6391a..5c5d0b5acb 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2016 OpenFOAM Foundation
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,10 +45,10 @@ atmBoundaryLayer::atmBoundaryLayer(const Time& time, const polyPatch& pp)
     ppMin_((boundBox(pp.points())).min()),
     time_(time),
     patch_(pp),
-    flowDir_(time, "flowDir"),
-    zDir_(time, "zDir"),
-    Uref_(time, "Uref"),
-    Zref_(time, "Zref"),
+    flowDir_(nullptr),
+    zDir_(nullptr),
+    Uref_(nullptr),
+    Zref_(nullptr),
     z0_(nullptr),
     d_(nullptr)
 {}
@@ -72,10 +72,10 @@ atmBoundaryLayer::atmBoundaryLayer
     ppMin_((boundBox(pp.points())).min()),
     time_(time),
     patch_(pp),
-    flowDir_(TimeFunction1<vector>(time, "flowDir", dict)),
-    zDir_(TimeFunction1<vector>(time, "zDir", dict)),
-    Uref_(TimeFunction1<scalar>(time, "Uref", dict)),
-    Zref_(TimeFunction1<scalar>(time, "Zref", dict)),
+    flowDir_(Function1<vector>::New("flowDir", dict, &time)),
+    zDir_(Function1<vector>::New("zDir", dict, &time)),
+    Uref_(Function1<scalar>::New("Uref", dict, &time)),
+    Zref_(Function1<scalar>::New("Zref", dict, &time)),
     z0_(PatchFunction1<scalar>::New(pp, "z0", dict)),
     d_(PatchFunction1<scalar>::New(pp, "d", dict))
 {}
@@ -96,10 +96,10 @@ atmBoundaryLayer::atmBoundaryLayer
     ppMin_(abl.ppMin_),
     time_(abl.time_),
     patch_(patch.patch()),
-    flowDir_(abl.flowDir_),
-    zDir_(abl.zDir_),
-    Uref_(abl.Uref_),
-    Zref_(abl.Zref_),
+    flowDir_(abl.flowDir_.clone()),
+    zDir_(abl.zDir_.clone()),
+    Uref_(abl.Uref_.clone()),
+    Zref_(abl.Zref_.clone()),
     z0_(abl.z0_.clone(patch_)),
     d_(abl.d_.clone(patch_))
 {}
@@ -129,13 +129,13 @@ atmBoundaryLayer::atmBoundaryLayer(const atmBoundaryLayer& abl)
 vector atmBoundaryLayer::flowDir() const
 {
     const scalar t = time_.timeOutputValue();
-    const vector dir(flowDir_.value(t));
+    const vector dir(flowDir_->value(t));
     const scalar magDir = mag(dir);
 
     if (magDir < SMALL)
     {
         FatalErrorInFunction
-            << "magnitude of " << flowDir_.name() << " = " << magDir
+            << "magnitude of " << flowDir_->name() << " = " << magDir
             << " vector must be greater than zero"
             << abort(FatalError);
     }
@@ -147,13 +147,13 @@ vector atmBoundaryLayer::flowDir() const
 vector atmBoundaryLayer::zDir() const
 {
     const scalar t = time_.timeOutputValue();
-    const vector dir(zDir_.value(t));
+    const vector dir(zDir_->value(t));
     const scalar magDir = mag(dir);
 
     if (magDir < SMALL)
     {
         FatalErrorInFunction
-            << "magnitude of " << zDir_.name() << " = " << magDir
+            << "magnitude of " << zDir_->name() << " = " << magDir
             << " vector must be greater than zero"
             << abort(FatalError);
     }
@@ -165,13 +165,13 @@ vector atmBoundaryLayer::zDir() const
 tmp<scalarField> atmBoundaryLayer::Ustar(const scalarField& z0) const
 {
     const scalar t = time_.timeOutputValue();
-    const scalar Uref = Uref_.value(t);
-    const scalar Zref = Zref_.value(t);
+    const scalar Uref = Uref_->value(t);
+    const scalar Zref = Zref_->value(t);
 
     if (Zref < 0)
     {
         FatalErrorInFunction
-            << "Negative entry in " << Zref_.name() << " = " << Zref
+            << "Negative entry in " << Zref_->name() << " = " << Zref
             << abort(FatalError);
     }
 
@@ -274,10 +274,10 @@ void atmBoundaryLayer::write(Ostream& os) const
     os.writeEntry("Cmu", Cmu_);
     os.writeEntry("C1", C1_);
     os.writeEntry("C2", C2_);
-    flowDir_.writeData(os);
-    zDir_.writeData(os);
-    Uref_.writeData(os);
-    Zref_.writeData(os);
+    flowDir_->writeData(os);
+    zDir_->writeData(os);
+    Uref_->writeData(os);
+    Zref_->writeData(os);
     if (z0_)
     {
         z0_->writeData(os) ;
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H
index bc3e84dcfb..362ff099a2 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H
+++ b/src/atmosphericModels/derivedFvPatchFields/atmBoundaryLayer/atmBoundaryLayer.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2014-2018 OpenFOAM Foundation
-    Copyright (C) 2015-2020 OpenCFD Ltd.
+    Copyright (C) 2015-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -157,12 +157,12 @@ Usage
     where the entries mean:
     \table
       Property  | Description              | Type          | Reqd  | Deflt
-      flowDir   | Flow direction           | TimeFunction1<vector> | yes | -
-      zDir      | Ground-normal direction  | TimeFunction1<vector> | yes | -
+      flowDir   | Flow direction           | Function1<vector> | yes | -
+      zDir      | Ground-normal direction  | Function1<vector> | yes | -
       Uref      | Reference mean streamwise flow speed being used in <!--
-             --> \f$u^*\f$ estimations [m/s] | TimeFunction1<scalar> | yes | -
+             --> \f$u^*\f$ estimations [m/s] | Function1<scalar> | yes | -
       Zref      | Reference height being used in \f$u^*\f$ estimations [m]  <!--
-                                       --> | TimeFunction1<scalar> | yes | -
+                                       --> | Function1<scalar> | yes | -
       z0        | Surface roughness length [m] <!--
                                        --> | PatchFunction1<scalar> | yes | -
       d         | Displacement height [m] - see Notes <!--
@@ -217,7 +217,7 @@ SourceFiles
 #define atmBoundaryLayer_H
 
 #include "fvPatchFields.H"
-#include "TimeFunction1.H"
+#include "Function1.H"
 #include "PatchFunction1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -266,16 +266,16 @@ private:
         const polyPatch& patch_;
 
         //- Streamwise flow direction
-        TimeFunction1<vector> flowDir_;
+        autoPtr<Function1<vector>> flowDir_;
 
         //- Direction of the ground-normal coordinate
-        TimeFunction1<vector> zDir_;
+        autoPtr<Function1<vector>> zDir_;
 
         //- Reference mean streamwise flow speed being used in Ustar estimations
-        TimeFunction1<scalar> Uref_;
+        autoPtr<Function1<scalar>> Uref_;
 
         //- Reference height being used in Ustar estimations
-        TimeFunction1<scalar> Zref_;
+        autoPtr<Function1<scalar>> Zref_;
 
         //- Surface roughness length
         autoPtr<PatchFunction1<scalar>> z0_;
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
index bd376e47d0..f0907bfcc5 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2020 ENERCON GmbH
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -62,7 +62,7 @@ atmTurbulentHeatFluxTemperatureFvPatchScalarField
     fixedGradientFvPatchScalarField(p, iF),
     heatSource_(heatSourceType::POWER),
     alphaEffName_("undefinedAlphaEff"),
-    Cp0_(db().time(), "Cp0"),
+    Cp0_(nullptr),
     q_(nullptr)
 {}
 
@@ -79,7 +79,7 @@ atmTurbulentHeatFluxTemperatureFvPatchScalarField
     fixedGradientFvPatchScalarField(ptf, p, iF, mapper),
     heatSource_(ptf.heatSource_),
     alphaEffName_(ptf.alphaEffName_),
-    Cp0_(ptf.Cp0_),
+    Cp0_(ptf.Cp0_.clone()),
     q_(ptf.q_.clone(p.patch()))
 {}
 
@@ -103,7 +103,7 @@ atmTurbulentHeatFluxTemperatureFvPatchScalarField
         )
     ),
     alphaEffName_(dict.get<word>("alphaEff")),
-    Cp0_(TimeFunction1<scalar>(db().time(), "Cp0", dict)),
+    Cp0_(Function1<scalar>::New("Cp0", dict, &db().time())),
     q_(PatchFunction1<scalar>::New(p.patch(), "q", dict))
 {
     if (dict.found("value") && dict.found("gradient"))
@@ -189,7 +189,7 @@ void atmTurbulentHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
         patch().lookupPatchField<volScalarField, scalar>(alphaEffName_);
 
     const scalar t = db().time().timeOutputValue();
-    const scalar Cp0 = Cp0_.value(t);
+    const scalar Cp0 = Cp0_->value(t);
 
     if (Cp0 < SMALL)
     {
@@ -233,7 +233,7 @@ void atmTurbulentHeatFluxTemperatureFvPatchScalarField::write(Ostream& os) const
     fixedGradientFvPatchScalarField::write(os);
     os.writeEntry("heatSource", heatSourceTypeNames[heatSource_]);
     os.writeEntry("alphaEff", alphaEffName_);
-    Cp0_.writeData(os);
+    Cp0_->writeData(os);
     q_->writeData(os);
     writeEntry("value", os);
 }
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.H b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.H
index f58563d8cb..af5169c211 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.H
+++ b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2020 ENERCON GmbH
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,14 +67,14 @@ Usage
       alphaEff     | Name of turbulent thermal diff. field [kg/m/s] <!--
                                                      --> | word | yes   | -
       Cp0          | Specific heat capacity [m2/s2/K] <!--
-                                     --> | TimeFunction1<scalar>  | yes | -
+                                     --> | Function1<scalar>  | yes | -
       q            | Heat source value [W (power) or W/m2 (flux)] <!--
                                      --> | PatchFunction1<scalar> | yes | -
     \endtable
 
     The inherited entries are elaborated in:
      - \link fixedGradientFvPatchScalarField.H \endlink
-     - \link TimeFunction1.H \endlink
+     - \link Function1.H \endlink
      - \link PatchFunction1.H \endlink
 
     Options for the \c heatSource entry:
@@ -93,7 +93,7 @@ SourceFiles
 
 #include "fvPatchFields.H"
 #include "fixedGradientFvPatchFields.H"
-#include "TimeFunction1.H"
+#include "Function1.H"
 #include "PatchFunction1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -131,7 +131,7 @@ class atmTurbulentHeatFluxTemperatureFvPatchScalarField
         word alphaEffName_;
 
         //- Specific heat capacity [m2/s2/K]
-        TimeFunction1<scalar> Cp0_;
+        autoPtr<Function1<scalar>> Cp0_;
 
         //- Heat power [W] or flux [W/m2]
         //  Divided by density, rho, if used in kinematic form
diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C
index 844dcbc379..050997ca3a 100644
--- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2020 ENERCON GmbH
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -73,7 +73,7 @@ atmAlphatkWallFunctionFvPatchScalarField
     fixedValueFvPatchScalarField(p, iF),
     Cmu_(0.09),
     kappa_(0.41),
-    Pr_(db().time(), "Pr"),
+    Pr_(nullptr),
     Prt_(nullptr),
     z0_(nullptr)
 {
@@ -93,7 +93,7 @@ atmAlphatkWallFunctionFvPatchScalarField
     fixedValueFvPatchScalarField(ptf, p, iF, mapper),
     Cmu_(ptf.Cmu_),
     kappa_(ptf.kappa_),
-    Pr_(ptf.Pr_),
+    Pr_(ptf.Pr_.clone()),
     Prt_(ptf.Prt_.clone(p.patch())),
     z0_(ptf.z0_.clone(p.patch()))
 {
@@ -128,7 +128,7 @@ atmAlphatkWallFunctionFvPatchScalarField
             scalarMinMax::ge(SMALL)
         )
     ),
-    Pr_(TimeFunction1<scalar>(db().time(), "Pr", dict)),
+    Pr_(Function1<scalar>::New("Pr", dict, &db().time())),
     Prt_(PatchFunction1<scalar>::New(p.patch(), "Prt", dict)),
     z0_(PatchFunction1<scalar>::New(p.patch(), "z0", dict))
 {
@@ -204,7 +204,7 @@ void atmAlphatkWallFunctionFvPatchScalarField::updateCoeffs()
     const scalar Cmu25 = pow025(Cmu_);
 
     const scalar t = db().time().timeOutputValue();
-    const scalar Pr = Pr_.value(t);
+    const scalar Pr = Pr_->value(t);
 
     #ifdef FULLDEBUG
     if (Pr < VSMALL)
@@ -289,7 +289,7 @@ void atmAlphatkWallFunctionFvPatchScalarField::write(Ostream& os) const
     fvPatchField<scalar>::write(os);
     os.writeEntry("Cmu", Cmu_);
     os.writeEntry("kappa", kappa_);
-    Pr_.writeData(os);
+    Pr_->writeData(os);
     Prt_->writeData(os);
     z0_->writeData(os);
     writeEntry("value", os);
diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.H b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.H
index 598e1f4934..91a9eb7c53 100644
--- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.H
+++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2020 ENERCON GmbH
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -67,7 +67,7 @@ Usage
     \table
       Property | Description                       | Type   | Reqd     | Dflt
       type     | Type name: atmAlphatkWallFunction | word   | yes      | -
-      Pr       | Molecular Prandtl number     | TimeFunction1<scalar>  | yes | -
+      Pr       | Molecular Prandtl number     | Function1<scalar>  | yes | -
       Prt      | Turbulent Prandtl number     | PatchFunction1<scalar> | yes | -
       z0       | Surface roughness length [m] | PatchFunction1<scalar> | yes | -
       Cmu      | Empirical model constant         | scalar | no        | 0.09
@@ -76,7 +76,7 @@ Usage
 
     The inherited entries are elaborated in:
       - \link fixedValueFvPatchField.H \endlink
-      - \link TimeFunction1.H \endlink
+      - \link Function1.H \endlink
       - \link PatchFunction1.H \endlink
 
 See also
@@ -91,7 +91,7 @@ SourceFiles
 #define atmAlphatkWallFunctionFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
-#include "TimeFunction1.H"
+#include "Function1.H"
 #include "PatchFunction1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -120,7 +120,7 @@ protected:
         const scalar kappa_;
 
         //- Molecular Prandtl number
-        TimeFunction1<scalar> Pr_;
+        autoPtr<Function1<scalar>> Pr_;
 
         //- Turbulent Prandtl number field
         autoPtr<PatchFunction1<scalar>> Prt_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index 926ee6225c..3d80440db8 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -27,7 +27,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ConeInjection.H"
-#include "TimeFunction1.H"
+#include "Function1.H"
 #include "mathematicalConstants.H"
 #include "unitConversion.H"
 
@@ -55,38 +55,38 @@ Foam::ConeInjection<CloudType>::ConeInjection
     ),
     flowRateProfile_
     (
-        TimeFunction1<scalar>
+        Function1<scalar>::New
         (
-            owner.db().time(),
             "flowRateProfile",
-            this->coeffDict()
+            this->coeffDict(),
+            &owner.db().time()
         )
     ),
     Umag_
     (
-        TimeFunction1<scalar>
+        Function1<scalar>::New
         (
-            owner.db().time(),
             "Umag",
-            this->coeffDict()
+            this->coeffDict(),
+            &owner.db().time()
         )
     ),
     thetaInner_
     (
-        TimeFunction1<scalar>
+        Function1<scalar>::New
         (
-            owner.db().time(),
             "thetaInner",
-            this->coeffDict()
+            this->coeffDict(),
+            &owner.db().time()
         )
     ),
     thetaOuter_
     (
-        TimeFunction1<scalar>
+        Function1<scalar>::New
         (
-            owner.db().time(),
             "thetaOuter",
-            this->coeffDict()
+            this->coeffDict(),
+            &owner.db().time()
         )
     ),
     sizeDistribution_
@@ -132,7 +132,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
     }
 
     // Set total volume to inject
-    this->volumeTotal_ = flowRateProfile_.integrate(0.0, duration_);
+    this->volumeTotal_ = flowRateProfile_->integrate(0.0, duration_);
 }
 
 
@@ -149,10 +149,10 @@ Foam::ConeInjection<CloudType>::ConeInjection
     injectorTetPts_(im.injectorTetPts_),
     duration_(im.duration_),
     parcelsPerInjector_(im.parcelsPerInjector_),
-    flowRateProfile_(im.flowRateProfile_),
-    Umag_(im.Umag_),
-    thetaInner_(im.thetaInner_),
-    thetaOuter_(im.thetaOuter_),
+    flowRateProfile_(im.flowRateProfile_.clone()),
+    Umag_(im.Umag_.clone()),
+    thetaInner_(im.thetaInner_.clone()),
+    thetaOuter_(im.thetaOuter_.clone()),
     sizeDistribution_(im.sizeDistribution_.clone()),
     nInjected_(im.nInjected_),
     injectorOrder_(im.injectorOrder_),
@@ -220,7 +220,7 @@ Foam::label Foam::ConeInjection<CloudType>::parcelsToInject
 {
     if ((time0 >= 0.0) && (time0 < duration_))
     {
-        const scalar targetVolume = flowRateProfile_.integrate(0, time1);
+        const scalar targetVolume = flowRateProfile_->integrate(0, time1);
 
         const scalar volumeFraction = targetVolume/this->volumeTotal_;
 
@@ -243,7 +243,7 @@ Foam::scalar Foam::ConeInjection<CloudType>::volumeToInject
 {
     if ((time0 >= 0.0) && (time0 < duration_))
     {
-        return flowRateProfile_.integrate(time0, time1);
+        return flowRateProfile_->integrate(time0, time1);
     }
 
     return 0.0;
@@ -288,8 +288,8 @@ void Foam::ConeInjection<CloudType>::setProperties
 
     // Set direction vectors for position i
     scalar t = time - this->SOI_;
-    scalar ti = thetaInner_.value(t);
-    scalar to = thetaOuter_.value(t);
+    scalar ti = thetaInner_->value(t);
+    scalar to = thetaOuter_->value(t);
     scalar coneAngle = degToRad(rnd.position<scalar>(ti, to));
 
     scalar alpha = sin(coneAngle);
@@ -302,7 +302,7 @@ void Foam::ConeInjection<CloudType>::setProperties
     dirVec.normalise();
 
     // Set particle velocity
-    parcel.U() = Umag_.value(t)*dirVec;
+    parcel.U() = Umag_->value(t)*dirVec;
 
     // Set particle diameter
     parcel.d() = sizeDistribution_().sample();
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index 2fc12a51a3..69e3663e7b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2021-2017 OpenCFD Ltd.
+    Copyright (C) 2017-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -54,7 +54,7 @@ SourceFiles
 #include "InjectionModel.H"
 #include "distributionModel.H"
 #include "vectorList.H"
-#include "TimeFunction1.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -91,16 +91,16 @@ class ConeInjection
         const label parcelsPerInjector_;
 
         //- Flow rate profile relative to SOI []
-        const TimeFunction1<scalar> flowRateProfile_;
+        const autoPtr<Function1<scalar>> flowRateProfile_;
 
         //- Parcel velocity magnitude relative to SOI [m/s]
-        const TimeFunction1<scalar> Umag_;
+        const autoPtr<Function1<scalar>> Umag_;
 
         //- Inner half-cone angle relative to SOI [deg]
-        const TimeFunction1<scalar> thetaInner_;
+        const autoPtr<Function1<scalar>> thetaInner_;
 
         //- Outer half-cone angle relative to SOI [deg]
-        const TimeFunction1<scalar> thetaOuter_;
+        const autoPtr<Function1<scalar>> thetaOuter_;
 
         //- Parcel size distribution model
         const autoPtr<distributionModel> sizeDistribution_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
index 5e66eef113..a73f28650d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2015-2020 OpenCFD Ltd.
+    Copyright (C) 2015-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,7 +27,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ConeNozzleInjection.H"
-#include "TimeFunction1.H"
+#include "Function1.H"
 #include "unitConversion.H"
 #include "distributionModel.H"
 
@@ -74,7 +74,15 @@ void Foam::ConeNozzleInjection<CloudType>::setInjectionMethod()
         }
         case injectionMethod::imMovingPoint:
         {
-            positionVsTime_.reset(this->coeffDict());
+            positionVsTime_.reset
+            (
+                Function1<vector>::New
+                (
+                    "position",
+                    this->coeffDict(),
+                    &this->owner().db().time()
+                )
+            );
             break;
         }
         default:
@@ -100,12 +108,28 @@ void Foam::ConeNozzleInjection<CloudType>::setFlowType()
         }
         case flowType::ftPressureDrivenVelocity:
         {
-            Pinj_.reset(this->coeffDict());
+            Pinj_.reset
+            (
+                Function1<scalar>::New
+                (
+                    "Pinj",
+                    this->coeffDict(),
+                    &this->owner().db().time()
+                )
+            );
             break;
         }
         case flowType::ftFlowRateAndDischarge:
         {
-            Cd_.reset(this->coeffDict());
+            Cd_.reset
+            (
+                Function1<scalar>::New
+                (
+                    "Cd",
+                    this->coeffDict(),
+                    &this->owner().db().time()
+                )
+            );
             break;
         }
         default:
@@ -138,7 +162,7 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
     outerDiameter_(this->coeffDict().getScalar("outerDiameter")),
     innerDiameter_(this->coeffDict().getScalar("innerDiameter")),
     duration_(this->coeffDict().getScalar("duration")),
-    positionVsTime_(owner.db().time(), "position"),
+    positionVsTime_(nullptr),
     position_(Zero),
     injectorCell_(-1),
     tetFacei_(-1),
@@ -147,29 +171,29 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
     parcelsPerSecond_(this->coeffDict().getScalar("parcelsPerSecond")),
     flowRateProfile_
     (
-        TimeFunction1<scalar>
+        Function1<scalar>::New
         (
-            owner.db().time(),
             "flowRateProfile",
-            this->coeffDict()
+            this->coeffDict(),
+            &owner.db().time()
         )
     ),
     thetaInner_
     (
-        TimeFunction1<scalar>
+        Function1<scalar>::New
         (
-            owner.db().time(),
             "thetaInner",
-            this->coeffDict()
+            this->coeffDict(),
+            &owner.db().time()
         )
     ),
     thetaOuter_
     (
-        TimeFunction1<scalar>
+        Function1<scalar>::New
         (
-            owner.db().time(),
             "thetaOuter",
-            this->coeffDict()
+            this->coeffDict(),
+            &owner.db().time()
         )
     ),
     sizeDistribution_
@@ -185,8 +209,8 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
     normal_(Zero),
 
     UMag_(0.0),
-    Cd_(owner.db().time(), "Cd"),
-    Pinj_(owner.db().time(), "Pinj")
+    Cd_(nullptr),
+    Pinj_(nullptr)
 {
     if (innerDiameter_ >= outerDiameter_)
     {
@@ -224,7 +248,7 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
     tanVec2_ = direction_^tanVec1_;
 
     // Set total volume to inject
-    this->volumeTotal_ = flowRateProfile_.integrate(0.0, duration_);
+    this->volumeTotal_ = flowRateProfile_->integrate(0.0, duration_);
 
     updateMesh();
 }
@@ -242,23 +266,23 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
     outerDiameter_(im.outerDiameter_),
     innerDiameter_(im.innerDiameter_),
     duration_(im.duration_),
-    positionVsTime_(im.positionVsTime_),
+    positionVsTime_(im.positionVsTime_.clone()),
     position_(im.position_),
     injectorCell_(im.injectorCell_),
     tetFacei_(im.tetFacei_),
     tetPti_(im.tetPti_),
     direction_(im.direction_),
     parcelsPerSecond_(im.parcelsPerSecond_),
-    flowRateProfile_(im.flowRateProfile_),
-    thetaInner_(im.thetaInner_),
-    thetaOuter_(im.thetaOuter_),
+    flowRateProfile_(im.flowRateProfile_.clone()),
+    thetaInner_(im.thetaInner_.clone()),
+    thetaOuter_(im.thetaOuter_.clone()),
     sizeDistribution_(im.sizeDistribution_.clone()),
     tanVec1_(im.tanVec1_),
     tanVec2_(im.tanVec2_),
     normal_(im.normal_),
     UMag_(im.UMag_),
-    Cd_(im.Cd_),
-    Pinj_(im.Pinj_)
+    Cd_(im.Cd_.clone()),
+    Pinj_(im.Pinj_.clone())
 {}
 
 
@@ -329,7 +353,7 @@ Foam::scalar Foam::ConeNozzleInjection<CloudType>::volumeToInject
 {
     if ((time0 >= 0.0) && (time0 < duration_))
     {
-        return flowRateProfile_.integrate(time0, time1);
+        return flowRateProfile_->integrate(time0, time1);
     }
 
     return 0.0;
@@ -366,7 +390,7 @@ void Foam::ConeNozzleInjection<CloudType>::setPositionAndCell
         }
         case injectionMethod::imMovingPoint:
         {
-            position = positionVsTime_.value(time - this->SOI_);
+            position = positionVsTime_->value(time - this->SOI_);
 
             this->findCellAtPosition
             (
@@ -419,8 +443,8 @@ void Foam::ConeNozzleInjection<CloudType>::setProperties
 
     // Set particle velocity
     scalar t = time - this->SOI_;
-    scalar ti = thetaInner_.value(t);
-    scalar to = thetaOuter_.value(t);
+    scalar ti = thetaInner_->value(t);
+    scalar to = thetaOuter_->value(t);
     scalar coneAngle = degToRad(rndGen.sample01<scalar>()*(to - ti) + ti);
 
     scalar alpha = sin(coneAngle);
@@ -442,7 +466,7 @@ void Foam::ConeNozzleInjection<CloudType>::setProperties
         {
             scalar pAmbient = this->owner().pAmbient();
             scalar rho = parcel.rho();
-            scalar UMag = ::sqrt(2.0*(Pinj_.value(t) - pAmbient)/rho);
+            scalar UMag = ::sqrt(2.0*(Pinj_->value(t) - pAmbient)/rho);
             parcel.U() = UMag*dirVec;
             break;
         }
@@ -452,10 +476,10 @@ void Foam::ConeNozzleInjection<CloudType>::setProperties
             scalar Ai = 0.25*mathematical::pi*innerDiameter_*innerDiameter_;
             scalar massFlowRate =
                 this->massTotal()
-               *flowRateProfile_.value(t)
+               *flowRateProfile_->value(t)
                /this->volumeTotal();
 
-            scalar Umag = massFlowRate/(parcel.rho()*Cd_.value(t)*(Ao - Ai));
+            scalar Umag = massFlowRate/(parcel.rho()*Cd_->value(t)*(Ao - Ai));
             parcel.U() = Umag*dirVec;
             break;
         }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
index 2b3776b8db..90ea53a103 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018 OpenCFD Ltd.
+    Copyright (C) 2018-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -78,7 +78,7 @@ namespace Foam
 // Forward declaration of classes
 
 template<class Type>
-class TimeFunction1;
+class Function1;
 
 class distributionModel;
 
@@ -134,7 +134,7 @@ private:
         scalar duration_;
 
         //- Position relative to SOI []
-        TimeFunction1<vector> positionVsTime_;
+        autoPtr<Function1<vector>> positionVsTime_;
 
         //- Injector position [m]
         vector position_;
@@ -155,13 +155,13 @@ private:
         const label parcelsPerSecond_;
 
         //- Flow rate profile relative to SOI []
-        const TimeFunction1<scalar> flowRateProfile_;
+        const autoPtr<Function1<scalar>> flowRateProfile_;
 
         //- Inner half-cone angle relative to SOI [deg]
-        const TimeFunction1<scalar> thetaInner_;
+        const autoPtr<Function1<scalar>> thetaInner_;
 
         //- Outer half-cone angle relative to SOI [deg]
-        const TimeFunction1<scalar> thetaOuter_;
+        const autoPtr<Function1<scalar>> thetaOuter_;
 
         //- Parcel size PDF model
         const autoPtr<distributionModel> sizeDistribution_;
@@ -185,10 +185,10 @@ private:
             scalar UMag_;
 
             //- Discharge coefficient, relative to SOI [m/s]
-            TimeFunction1<scalar> Cd_;
+            autoPtr<Function1<scalar>> Cd_;
 
             //- Injection pressure [Pa]
-            TimeFunction1<scalar> Pinj_;
+            autoPtr<Function1<scalar>> Pinj_;
 
 
     // Private Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
index fa23c0c8ed..52dd82c6de 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2020 OpenCFD Ltd.
+    Copyright (C) 2015-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,20 +52,20 @@ Foam::InflationInjection<CloudType>::InflationInjection
     duration_(this->coeffDict().getScalar("duration")),
     flowRateProfile_
     (
-        TimeFunction1<scalar>
+        Function1<scalar>::New
         (
-            owner.db().time(),
             "flowRateProfile",
-            this->coeffDict()
+            this->coeffDict(),
+            &owner.db().time()
         )
     ),
     growthRate_
     (
-        TimeFunction1<scalar>
+        Function1<scalar>::New
         (
-            owner.db().time(),
             "growthRate",
-            this->coeffDict()
+            this->coeffDict(),
+            &owner.db().time()
         )
     ),
     newParticles_(),
@@ -119,7 +119,7 @@ Foam::InflationInjection<CloudType>::InflationInjection
     }
 
     // Set total volume/mass to inject
-    this->volumeTotal_ = fraction_*flowRateProfile_.integrate(0.0, duration_);
+    this->volumeTotal_ = fraction_*flowRateProfile_->integrate(0.0, duration_);
     this->massTotal_ *= fraction_;
 }
 
@@ -136,8 +136,8 @@ Foam::InflationInjection<CloudType>::InflationInjection
     generationCells_(im.generationCells_),
     inflationCells_(im.inflationCells_),
     duration_(im.duration_),
-    flowRateProfile_(im.flowRateProfile_),
-    growthRate_(im.growthRate_),
+    flowRateProfile_(im.flowRateProfile_.clone()),
+    growthRate_(im.growthRate_.clone()),
     newParticles_(im.newParticles_),
     volumeAccumulator_(im.volumeAccumulator_),
     fraction_(im.fraction_),
@@ -180,7 +180,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
     List<DynamicList<typename CloudType::parcelType*>>& cellOccupancy =
         this->owner().cellOccupancy();
 
-    scalar gR = growthRate_.value(time1);
+    scalar gR = growthRate_->value(time1);
 
     scalar dT = time1 - time0;
 
@@ -215,7 +215,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
     if ((time0 >= 0.0) && (time0 < duration_))
     {
         volumeAccumulator_ +=
-            fraction_*flowRateProfile_.integrate(time0, time1);
+            fraction_*flowRateProfile_->integrate(time0, time1);
     }
 
     labelHashSet cellCentresUsed;
@@ -429,7 +429,7 @@ Foam::scalar Foam::InflationInjection<CloudType>::volumeToInject
 {
     if ((time0 >= 0.0) && (time0 < duration_))
     {
-        return fraction_*flowRateProfile_.integrate(time0, time1);
+        return fraction_*flowRateProfile_->integrate(time0, time1);
     }
 
     return 0.0;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
index bfacebb97d..a02771badb 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -89,10 +90,10 @@ class InflationInjection
         scalar duration_;
 
         //- Flow rate profile relative to SOI [m3/s]
-        TimeFunction1<scalar> flowRateProfile_;
+        autoPtr<Function1<scalar>> flowRateProfile_;
 
         //- Growth rate of particle diameters towards target [m/s]
-        TimeFunction1<scalar> growthRate_;
+        autoPtr<Function1<scalar>> growthRate_;
 
         //- Positions, velocities, diameters and target diameters of
         //  new particles after splitting
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 94e4961ca8..58838ec65f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -266,7 +266,7 @@ Foam::InjectionModel<CloudType>::InjectionModel(CloudType& owner)
     SOI_(0.0),
     volumeTotal_(this->template getModelProperty<scalar>("volumeTotal")),
     massTotal_(0),
-    massFlowRate_(owner.db().time(), "massFlowRate"),
+    massFlowRate_(nullptr),
     massInjected_(this->template getModelProperty<scalar>("massInjected")),
     nInjections_(this->template getModelProperty<label>("nInjections")),
     parcelsAddedTotal_
@@ -297,7 +297,7 @@ Foam::InjectionModel<CloudType>::InjectionModel
     SOI_(0.0),
     volumeTotal_(this->template getModelProperty<scalar>("volumeTotal")),
     massTotal_(0),
-    massFlowRate_(owner.db().time(), "massFlowRate"),
+    massFlowRate_(nullptr),
     massInjected_(this->template getModelProperty<scalar>("massInjected")),
     nInjections_(this->template getModelProperty<scalar>("nInjections")),
     parcelsAddedTotal_
@@ -339,8 +339,16 @@ Foam::InjectionModel<CloudType>::InjectionModel
         }
         else
         {
-            massFlowRate_.reset(this->coeffDict());
-            massTotal_ = massFlowRate_.value(owner.db().time().value());
+            massFlowRate_.reset
+            (
+                Function1<scalar>::New
+                (
+                    "massFlowRate",
+                    this->coeffDict(),
+                    &owner.db().time()
+                )
+            );
+            massTotal_ = massFlowRate_->value(owner.db().time().value());
             this->coeffDict().readIfPresent("SOI", SOI_);
         }
     }
@@ -385,7 +393,7 @@ Foam::InjectionModel<CloudType>::InjectionModel
     SOI_(im.SOI_),
     volumeTotal_(im.volumeTotal_),
     massTotal_(im.massTotal_),
-    massFlowRate_(im.massFlowRate_),
+    massFlowRate_(im.massFlowRate_.clone()),
     massInjected_(im.massInjected_),
     nInjections_(im.nInjections_),
     parcelsAddedTotal_(im.parcelsAddedTotal_),
@@ -577,7 +585,7 @@ void Foam::InjectionModel<CloudType>::injectSteadyState
 
     const polyMesh& mesh = this->owner().mesh();
 
-    massTotal_ = massFlowRate_.value(mesh.time().value());
+    massTotal_ = massFlowRate_->value(mesh.time().value());
 
     // Reset counters
     time0_ = 0.0;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index ed50c0d609..7de7e4cf6f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -59,7 +59,7 @@ SourceFiles
 #include "runTimeSelectionTables.H"
 #include "CloudSubModelBase.H"
 #include "vector.H"
-#include "TimeFunction1.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -110,7 +110,7 @@ protected:
             scalar massTotal_;
 
             //- Mass flow rate profile for steady calculations
-            TimeFunction1<scalar> massFlowRate_;
+            autoPtr<Function1<scalar>> massFlowRate_;
 
             //- Total mass injected to date [kg]
             scalar massInjected_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index fb55090cf4..277ef57bd7 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
@@ -27,7 +27,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "PatchFlowRateInjection.H"
-#include "TimeFunction1.H"
 #include "distributionModel.H"
 #include "mathematicalConstants.H"
 #include "surfaceFields.H"
@@ -49,11 +48,11 @@ Foam::PatchFlowRateInjection<CloudType>::PatchFlowRateInjection
     duration_(this->coeffDict().getScalar("duration")),
     concentration_
     (
-        TimeFunction1<scalar>
+        Function1<scalar>::New
         (
-            owner.db().time(),
             "concentration",
-            this->coeffDict()
+            this->coeffDict(),
+            &owner.db().time()
         )
     ),
     parcelConcentration_
@@ -91,7 +90,7 @@ Foam::PatchFlowRateInjection<CloudType>::PatchFlowRateInjection
     phiName_(im.phiName_),
     rhoName_(im.rhoName_),
     duration_(im.duration_),
-    concentration_(im.concentration_),
+    concentration_(im.concentration_.clone()),
     parcelConcentration_(im.parcelConcentration_),
     sizeDistribution_(im.sizeDistribution_.clone())
 {}
@@ -161,7 +160,7 @@ Foam::label Foam::PatchFlowRateInjection<CloudType>::parcelsToInject
     {
         scalar dt = time1 - time0;
 
-        scalar c = concentration_.value(0.5*(time0 + time1));
+        scalar c = concentration_->value(0.5*(time0 + time1));
 
         scalar nParcels = parcelConcentration_*c*flowRate()*dt;
 
@@ -201,7 +200,7 @@ Foam::scalar Foam::PatchFlowRateInjection<CloudType>::volumeToInject
 
     if ((time0 >= 0.0) && (time0 < duration_))
     {
-        scalar c = concentration_.value(0.5*(time0 + time1));
+        scalar c = concentration_->value(0.5*(time0 + time1));
 
         volume = c*(time1 - time0)*flowRate();
     }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
index 2c3365ce3c..b33be4fe93 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
@@ -54,7 +54,6 @@ SourceFiles
 
 #include "InjectionModel.H"
 #include "patchInjectionBase.H"
-#include "TimeFunction1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -85,7 +84,7 @@ class PatchFlowRateInjection
         scalar duration_;
 
         //- Concentration profile of particle volume to carrier volume [-]
-        const TimeFunction1<scalar> concentration_;
+        const autoPtr<Function1<scalar>> concentration_;
 
         //- Parcels to introduce per unit volume flow rate m3 [n/m3]
         const scalar parcelConcentration_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index 22b09e236a..692474ef28 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2019 OpenCFD Ltd.
+    Copyright (C) 2015-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,7 +27,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "PatchInjection.H"
-#include "TimeFunction1.H"
 #include "distributionModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -50,11 +49,11 @@ Foam::PatchInjection<CloudType>::PatchInjection
     U0_(this->coeffDict().lookup("U0")),
     flowRateProfile_
     (
-        TimeFunction1<scalar>
+        Function1<scalar>::New
         (
-            owner.db().time(),
             "flowRateProfile",
-            this->coeffDict()
+            this->coeffDict(),
+            &owner.db().time()
         )
     ),
     sizeDistribution_
@@ -71,7 +70,7 @@ Foam::PatchInjection<CloudType>::PatchInjection
     patchInjectionBase::updateMesh(owner.mesh());
 
     // Set total volume/mass to inject
-    this->volumeTotal_ = flowRateProfile_.integrate(0.0, duration_);
+    this->volumeTotal_ = flowRateProfile_->integrate(0.0, duration_);
 }
 
 
@@ -86,7 +85,7 @@ Foam::PatchInjection<CloudType>::PatchInjection
     duration_(im.duration_),
     parcelsPerSecond_(im.parcelsPerSecond_),
     U0_(im.U0_),
-    flowRateProfile_(im.flowRateProfile_),
+    flowRateProfile_(im.flowRateProfile_.clone()),
     sizeDistribution_(im.sizeDistribution_.clone())
 {}
 
@@ -155,7 +154,7 @@ Foam::scalar Foam::PatchInjection<CloudType>::volumeToInject
 {
     if ((time0 >= 0.0) && (time0 < duration_))
     {
-        return flowRateProfile_.integrate(time0, time1);
+        return flowRateProfile_->integrate(time0, time1);
     }
 
     return 0.0;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
index ca9023ed11..e33a68d8af 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,9 +60,6 @@ SourceFiles
 namespace Foam
 {
 
-template<class Type>
-class TimeFunction1;
-
 class distributionModel;
 
 /*---------------------------------------------------------------------------*\
@@ -86,7 +84,7 @@ class PatchInjection
         const vector U0_;
 
         //- Flow rate profile relative to SOI []
-        const TimeFunction1<scalar> flowRateProfile_;
+        const autoPtr<Function1<scalar>> flowRateProfile_;
 
         //- Parcel size distribution model
         const autoPtr<distributionModel> sizeDistribution_;
diff --git a/src/rigidBodyDynamics/restraints/prescribedRotation/prescribedRotation.C b/src/rigidBodyDynamics/restraints/prescribedRotation/prescribedRotation.C
index c8de6a89d0..39eb4ad657 100644
--- a/src/rigidBodyDynamics/restraints/prescribedRotation/prescribedRotation.C
+++ b/src/rigidBodyDynamics/restraints/prescribedRotation/prescribedRotation.C
@@ -61,7 +61,7 @@ Foam::RBD::restraints::prescribedRotation::prescribedRotation
 )
 :
     restraint(name, dict, model),
-    omegaSet_(model_.time(), "omega"),
+    omegaSet_(nullptr),
     omega_(Zero),
     oldMom_(Zero),
     error0_(Zero),
@@ -133,7 +133,7 @@ void Foam::RBD::restraints::prescribedRotation::restrain
     // from the definition of the angular momentum:
     // moment = Inertia*ddt(omega)
 
-    vector error = omegaSet_.value(model_.time().value()) - omega;
+    vector error = omegaSet_->value(model_.time().value()) - omega;
     vector integral = integral0_ + error;
     vector derivative = (error - error0_);
 
@@ -146,7 +146,7 @@ void Foam::RBD::restraints::prescribedRotation::restrain
     {
         Info<< " angle  " << theta*sign(a & axis_) << endl
             << " omega  " << omega << endl
-            << " wanted " << omegaSet_.value(model_.time().value()) << endl
+            << " wanted " << omegaSet_->value(model_.time().value()) << endl
             << " moment " << moment << endl
             << " oldDir " << oldDir << endl
             << " newDir " << newDir << endl
@@ -207,7 +207,7 @@ bool Foam::RBD::restraints::prescribedRotation::read
     }
 
     // Read the actual entry
-    omegaSet_.reset(coeffs_);
+    omegaSet_.reset(Function1<vector>::New("omega", coeffs_, &model_.time()));
 
     return true;
 }
@@ -222,7 +222,7 @@ void Foam::RBD::restraints::prescribedRotation::write
 
     os.writeEntry("referenceOrientation", refQ_);
     os.writeEntry("axis", axis_);
-    omegaSet_.writeData(os);
+    omegaSet_->writeData(os);
 }
 
 
diff --git a/src/rigidBodyDynamics/restraints/prescribedRotation/prescribedRotation.H b/src/rigidBodyDynamics/restraints/prescribedRotation/prescribedRotation.H
index a587da3eb5..4b4d19167b 100644
--- a/src/rigidBodyDynamics/restraints/prescribedRotation/prescribedRotation.H
+++ b/src/rigidBodyDynamics/restraints/prescribedRotation/prescribedRotation.H
@@ -44,9 +44,9 @@ Usage
         referenceOrientation | Orientation          | no       | I
         axis         | Rotation axis (in reference) | yes      |
         omega        | Angular velocity (rad/s)     | yes      |
-        relax        | Relax moment with prevoius iter | yes
+        relax        | Relax moment with previous iter | yes
         p            | Propoptional corrector for PDI | yes
-        d            | Differencial corrector for PDI | yes
+        d            | Differential corrector for PDI | yes
         i            | Integral corrector for PDI     | yes
     \endtable
 
@@ -59,7 +59,7 @@ SourceFiles
 #define prescribedRotation_H
 
 #include "rigidBodyRestraint.H"
-#include "TimeFunction1.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -87,7 +87,7 @@ class prescribedRotation
         vector axis_;
 
         //- Rotational velocity [rad/sec]
-        TimeFunction1<vector> omegaSet_;
+        autoPtr<Function1<vector>> omegaSet_;
 
         //- Cache omega
         mutable vector omega_;
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpringDamper/linearSpringDamper.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpringDamper/linearSpringDamper.C
index 556b0c4ef7..0a6d987614 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpringDamper/linearSpringDamper.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpringDamper/linearSpringDamper.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -83,11 +83,11 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearSpringDamper::restrain
     {
         anchor_.reset
         (
-            new TimeFunction1<vector>
+            Function1<vector>::New
             (
-                motion.time(),
                 "anchor",
-                coeffDict()
+                coeffDict(),
+                &motion.time()
             )
         );
     }
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpringDamper/linearSpringDamper.H b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpringDamper/linearSpringDamper.H
index 1eaeca29e5..aaed31d195 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpringDamper/linearSpringDamper.H
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpringDamper/linearSpringDamper.H
@@ -44,7 +44,7 @@ SourceFiles
 
 #include "sixDoFRigidBodyMotionRestraint.H"
 #include "point.H"
-#include "TimeFunction1.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -66,7 +66,7 @@ class linearSpringDamper
 
         //- Anchor point, where the spring is attached to an immovable
         //  object
-        mutable autoPtr<TimeFunction1<vector>> anchor_;
+        mutable autoPtr<Function1<vector>> anchor_;
 
         //- Reference point of attachment to the solid body
         point refAttachmentPt_;
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
index 6914f54c25..4514b1c414 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
@@ -122,9 +122,11 @@ void Foam::radiation::fvDOM::initialise()
     {
         spectralDistributions_.reset
         (
-            new TimeFunction1<scalarField>
+            Function1<scalarField>::New
             (
-                mesh_.time(), "spectralDistribution", coeffs_
+                "spectralDistribution",
+                coeffs_,
+                &mesh_.time()
             )
         );
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H
index b6711383c9..35f118d357 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.H
@@ -183,7 +183,7 @@ class fvDOM
         scalarList spectralDistribution_;
 
         //- Time-dependent spectral distributions
-        autoPtr<TimeFunction1<scalarField>> spectralDistributions_;
+        autoPtr<Function1<scalarField>> spectralDistributions_;
 
         //- Solar calculator
         autoPtr<solarCalculator> solarCalculator_;
diff --git a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
index 076c5c2962..8b4baba1a4 100644
--- a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
+++ b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
@@ -369,9 +369,11 @@ void Foam::radiation::solarLoad::initialise(const dictionary& coeffs)
 {
     spectralDistributions_.reset
     (
-        new TimeFunction1<scalarField>
+        Function1<scalarField>::New
         (
-            mesh_.time(), "spectralDistribution", coeffs
+            "spectralDistribution",
+            coeffs,
+            &mesh_.time()
         )
     );
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.H b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.H
index 831a90229a..f657fac0bd 100644
--- a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.H
+++ b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.H
@@ -76,7 +76,7 @@ Usage
       Property     | Description                      | Type  | Reqd   | Deflt
       useReflectedRays | Flag to use reflected rays   | bool  | yes    | -
       spectralDistribution | Spectral distribution for the integrated <!--
-                   --> solar heat flux | TimeFunction1\<scalarField\> | yes | -
+                   --> solar heat flux | Function1\<scalarField\> | yes | -
       solidCoupled     | Flag to couple solids through mapped         <!--
                    --> boundary patch using qr        | bool  | no     | true
       wallCoupled      | Flag to couple wall patches using qr         <!--
@@ -88,7 +88,7 @@ Usage
     The inherited entries are elaborated in:
      - \link radiationModel.H \endlink
      - \link solarCalculator.H \endlink
-     - \link TimeFunction1.H \endlink
+     - \link Function1.H \endlink
 
 SourceFiles
     solarLoad.C
@@ -103,7 +103,7 @@ SourceFiles
 #include "faceShading.H"
 #include "faceReflecting.H"
 #include "solarCalculator.H"
-#include "TimeFunction1.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -148,7 +148,7 @@ class solarLoad
         scalarList spectralDistribution_;
 
         //- Time-dependent spectral distributions
-        autoPtr<TimeFunction1<scalarField>> spectralDistributions_;
+        autoPtr<Function1<scalarField>> spectralDistributions_;
 
         //- Primary solar radiative heat flux per band [W/m2]
         PtrList<volScalarField> qprimaryRad_;
diff --git a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
index 02d6704c26..dab33e9926 100644
--- a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
+++ b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
@@ -203,21 +203,21 @@ void Foam::solarCalculator::initialise()
         {
             directSolarRads_.reset
             (
-                new TimeFunction1<scalar>
+                Function1<scalar>::New
                 (
-                    mesh_.time(),
                     "directSolarRad",
-                    dict_
+                    dict_,
+                    &mesh_.time()
                 )
             );
 
             diffuseSolarRads_.reset
             (
-                new TimeFunction1<scalar>
+                Function1<scalar>::New
                 (
-                    mesh_.time(),
                     "diffuseSolarRad",
-                    dict_
+                    dict_,
+                    &mesh_.time()
                 )
             );
 
diff --git a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
index 352798c1de..0ed978ea71 100644
--- a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
+++ b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.H
@@ -122,8 +122,8 @@ Usage
     solarLoadCoeffs
     {
         sunLoadModel                timeDependent;
-        directSolarRad              <TimeFunction1<scalar>>;
-        diffuseSolarRad             <TimeFunction1<scalar>>;
+        directSolarRad              <Function1<scalar>>;
+        diffuseSolarRad             <Function1<scalar>>;
     }
     \endverbatim
 
@@ -131,10 +131,10 @@ Usage
     \table
       Property     | Description                       | Type    | Reqd | Deflt
       directSolarRad  | Time-series of direct solar irradiation        <!--
-                   --> [W/m2]          | TimeFunction1\<scalar\> | yes  | -
+                   --> [W/m2]          | Function1\<scalar\> | yes  | -
       diffuseSolarRad | Time-series of diffuse solar irradiation on    <!--
                    --> vertical surfaces [W/m2]                        <!--
-                   -->                  | TimeFunction1\<scalar\> | yes | -
+                   -->                  | Function1\<scalar\> | yes | -
     \endtable
 
 
@@ -223,7 +223,7 @@ SourceFiles
 #include "DynamicField.H"
 #include "HashSet.H"
 #include "coordinateSystem.H"
-#include "TimeFunction1.H"
+#include "Function1.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -316,10 +316,10 @@ private:
         // sunLoadModel = timeDependent
 
             //- Time-series of direct solar irradiation
-            autoPtr<TimeFunction1<scalar>> directSolarRads_;
+            autoPtr<Function1<scalar>> directSolarRads_;
 
             //- Time-series of diffuse solar irradiation on vertical surfaces
-            autoPtr<TimeFunction1<scalar>> diffuseSolarRads_;
+            autoPtr<Function1<scalar>> diffuseSolarRads_;
 
 
         // sunLoadModel = fairWeather

From c233961d454b50ecdaf076edff636060a2ee4598 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Fri, 19 Nov 2021 11:30:08 +0000
Subject: [PATCH 11/18] ENH: function objects - apply scoped name when
 registering objects

---
 .../functionObject/functionObject.C           | 23 +++++++++++++---
 .../functionObject/functionObject.H           | 18 ++++++++++---
 .../field/DESModelRegions/DESModelRegions.C   |  2 +-
 .../field/XiReactionRate/XiReactionRate.C     | 13 ++++------
 .../field/columnAverage/columnAverage.C       |  4 +--
 .../field/fieldAverage/fieldAverage.C         |  6 +++++
 .../fieldAverageItem/fieldAverageItem.H       |  6 +++++
 .../fieldAverageItem/fieldAverageItemI.H      | 21 ++++++++++++++-
 .../field/fieldExpression/fieldExpression.C   |  2 ++
 .../fieldExtents/fieldExtentsTemplates.C      |  3 +--
 .../heatTransferCoeff/heatTransferCoeff.C     |  2 +-
 .../particleDistribution.C                    |  2 +-
 src/functionObjects/field/pressure/pressure.C |  2 +-
 .../field/randomise/randomise.C               |  2 +-
 .../regionSizeDistribution.C                  |  4 +--
 .../field/wallHeatFlux/wallHeatFlux.C         |  7 ++---
 .../field/wallShearStress/wallShearStress.C   | 10 +++----
 src/functionObjects/field/yPlus/yPlus.C       |  8 +++---
 .../field/zeroGradient/zeroGradient.C         |  3 ++-
 .../forces/forceCoeffs/forceCoeffs.C          | 16 ++++++------
 src/functionObjects/forces/forces/forces.C    | 26 +++++++------------
 src/functionObjects/forces/forces/forces.H    |  3 ---
 .../reactingEulerHtcModel.C                   |  2 +-
 23 files changed, 116 insertions(+), 69 deletions(-)

diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
index 2229135ae3..1357a3348c 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
@@ -48,15 +48,25 @@ Foam::word Foam::functionObject::outputPrefix("postProcessing");
 
 Foam::word Foam::functionObject::scopedName(const word& name) const
 {
-    return name_ + ":" + name;
+    if (scopedNames_)
+    {
+        return IOobject::scopedName(name_, name);
+    }
+
+    return name_;
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::functionObject::functionObject(const word& name)
+Foam::functionObject::functionObject
+(
+    const word& name,
+    const bool scopedNames
+)
 :
     name_(name),
+    scopedNames_(scopedNames),
     log(postProcess)
 {}
 
@@ -128,16 +138,23 @@ Foam::autoPtr<Foam::functionObject> Foam::functionObject::New
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-const Foam::word& Foam::functionObject::name() const
+const Foam::word& Foam::functionObject::name() const noexcept
 {
     return name_;
 }
 
 
+bool Foam::functionObject::scopedNames() const noexcept
+{
+    return scopedNames_;
+}
+
+
 bool Foam::functionObject::read(const dictionary& dict)
 {
     if (!postProcess)
     {
+        scopedNames_ = dict.getOrDefault("scopedNames", true);
         log = dict.getOrDefault("log", true);
     }
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index e22b4dfa09..acef941c7d 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -221,6 +221,9 @@ class functionObject
         //- Name
         const word name_;
 
+        //- Flag to indicate that names should be scoped
+        bool scopedNames_;
+
 
 protected:
 
@@ -266,7 +269,11 @@ public:
     // Constructors
 
         //- Construct from components
-        functionObject(const word& name);
+        explicit functionObject
+        (
+            const word& name,
+            const bool scopedNames = true
+        );
 
         //- Return clone
         autoPtr<functionObject> clone() const
@@ -294,7 +301,10 @@ public:
     // Member Functions
 
         //- Return the name of this functionObject
-        const word& name() const;
+        const word& name() const noexcept;
+
+        //- Return the scoped names flag
+        bool scopedNames() const noexcept;
 
         //- Read and set the function object if its data have changed
         virtual bool read(const dictionary& dict);
@@ -347,7 +357,7 @@ class functionObject::unavailableFunctionObject
 protected:
 
     //- Construct with name
-    unavailableFunctionObject(const word& name);
+    explicit unavailableFunctionObject(const word& name);
 
     //- Report it is unavailable, emitting a FatalError for try/catch
     //- in the caller
diff --git a/src/functionObjects/field/DESModelRegions/DESModelRegions.C b/src/functionObjects/field/DESModelRegions/DESModelRegions.C
index 965bc86970..07bc912eda 100644
--- a/src/functionObjects/field/DESModelRegions/DESModelRegions.C
+++ b/src/functionObjects/field/DESModelRegions/DESModelRegions.C
@@ -68,7 +68,7 @@ Foam::functionObjects::DESModelRegions::DESModelRegions
 :
     fvMeshFunctionObject(name, runTime, dict),
     writeFile(obr_, name, typeName, dict),
-    resultName_(name)
+    resultName_(scopedName("regions"))
 {
     read(dict);
 
diff --git a/src/functionObjects/field/XiReactionRate/XiReactionRate.C b/src/functionObjects/field/XiReactionRate/XiReactionRate.C
index 6ec82a9dc7..8f97fecff3 100644
--- a/src/functionObjects/field/XiReactionRate/XiReactionRate.C
+++ b/src/functionObjects/field/XiReactionRate/XiReactionRate.C
@@ -74,20 +74,17 @@ bool Foam::functionObjects::XiReactionRate::execute()
 
 bool Foam::functionObjects::XiReactionRate::write()
 {
-    const volScalarField& b =
-        mesh_.lookupObject<volScalarField>("b");
+    const volScalarField& b = mesh_.lookupObject<volScalarField>("b");
 
-    const volScalarField& Su =
-        mesh_.lookupObject<volScalarField>("Su");
+    const volScalarField& Su = mesh_.lookupObject<volScalarField>("Su");
 
-    const volScalarField& Xi =
-        mesh_.lookupObject<volScalarField>("Xi");
+    const volScalarField& Xi = mesh_.lookupObject<volScalarField>("Xi");
 
     const volScalarField St
     (
         IOobject
         (
-            "St",
+            scopedName("St"),
             time_.timeName(),
             mesh_
         ),
@@ -103,7 +100,7 @@ bool Foam::functionObjects::XiReactionRate::write()
     (
         IOobject
         (
-            "wdot",
+            scopedName("wdot"),
             time_.timeName(),
             mesh_
         ),
diff --git a/src/functionObjects/field/columnAverage/columnAverage.C b/src/functionObjects/field/columnAverage/columnAverage.C
index 0ef1f074c9..599246d873 100644
--- a/src/functionObjects/field/columnAverage/columnAverage.C
+++ b/src/functionObjects/field/columnAverage/columnAverage.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -113,7 +113,7 @@ const Foam::word Foam::functionObjects::columnAverage::averageName
     const word& fieldName
 ) const
 {
-    return name() + ":columnAverage(" + fieldName + ")";
+    return scopedName("columnAverage(" + fieldName + ")");
 }
 
 
diff --git a/src/functionObjects/field/fieldAverage/fieldAverage.C b/src/functionObjects/field/fieldAverage/fieldAverage.C
index b51e52559a..ab2cf923bc 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverage.C
+++ b/src/functionObjects/field/fieldAverage/fieldAverage.C
@@ -310,6 +310,12 @@ bool Foam::functionObjects::fieldAverage::read(const dictionary& dict)
     dict.readIfPresent("periodicRestart",  periodicRestart_);
     dict.readEntry("fields", faItems_);
 
+    for (auto& item : faItems_)
+    {
+        item.setMeanFieldName(scopedName(item.meanFieldName()));
+        item.setPrime2MeanFieldName(scopedName(item.prime2MeanFieldName()));
+    }
+
     const scalar currentTime = obr().time().value();
 
     if (periodicRestart_)
diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
index 46cdf4b9c7..4ad0ea958e 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
+++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItem.H
@@ -236,6 +236,9 @@ public:
             //- Return const access to the mean field name
             inline const word& meanFieldName() const;
 
+            //- Set the mean field name
+            inline void setMeanFieldName(const word& name);
+
             //- Return const access to the prime-squared mean flag
             inline bool prime2Mean() const;
 
@@ -245,6 +248,9 @@ public:
             //- Return const access to the prime-squared mean field name
             inline const word& prime2MeanFieldName() const;
 
+            //- Set the prime-squared mean field name
+            inline void setPrime2MeanFieldName(const word& name);
+
             //- Return averaging base type name
             inline const word& base() const;
 
diff --git a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemI.H b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemI.H
index 8f67815e13..68b862be2d 100644
--- a/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemI.H
+++ b/src/functionObjects/field/fieldAverage/fieldAverageItem/fieldAverageItemI.H
@@ -64,6 +64,15 @@ Foam::functionObjects::fieldAverageItem::meanFieldName() const
 }
 
 
+void Foam::functionObjects::fieldAverageItem::setMeanFieldName
+(
+    const word& name
+)
+{
+    meanFieldName_ = name;
+}
+
+
 bool Foam::functionObjects::fieldAverageItem::prime2Mean() const
 {
     return prime2Mean_;
@@ -76,12 +85,22 @@ bool& Foam::functionObjects::fieldAverageItem::prime2Mean()
 }
 
 
-const Foam::word& Foam::functionObjects::fieldAverageItem::prime2MeanFieldName() const
+const Foam::word&
+Foam::functionObjects::fieldAverageItem::prime2MeanFieldName() const
 {
     return prime2MeanFieldName_;
 }
 
 
+void Foam::functionObjects::fieldAverageItem::setPrime2MeanFieldName
+(
+    const word& name
+)
+{
+    prime2MeanFieldName_ = name;
+}
+
+
 const Foam::word& Foam::functionObjects::fieldAverageItem::base() const
 {
     return baseTypeNames_[base_];
diff --git a/src/functionObjects/field/fieldExpression/fieldExpression.C b/src/functionObjects/field/fieldExpression/fieldExpression.C
index 53b22aba1e..870363d462 100644
--- a/src/functionObjects/field/fieldExpression/fieldExpression.C
+++ b/src/functionObjects/field/fieldExpression/fieldExpression.C
@@ -63,6 +63,8 @@ void Foam::functionObjects::fieldExpression::setResultName
         {
             resultName_ = typeName;
         }
+
+        resultName_ = scopedName(resultName_);
     }
 }
 
diff --git a/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C b/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C
index 75b4689574..c568fc59be 100644
--- a/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C
+++ b/src/functionObjects/field/fieldExtents/fieldExtentsTemplates.C
@@ -55,8 +55,7 @@ void Foam::functionObjects::fieldExtents::calcFieldExtents
 {
     typedef GeometricField<Type, fvPatchField, volMesh> VolFieldType;
 
-    const VolFieldType* fieldPtr =
-        obr_.findObject<VolFieldType>(fieldName);
+    const VolFieldType* fieldPtr = obr_.findObject<VolFieldType>(fieldName);
 
     if (!fieldPtr)
     {
diff --git a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeff.C b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeff.C
index d2ba2d10f7..16e0e78e85 100644
--- a/src/functionObjects/field/heatTransferCoeff/heatTransferCoeff.C
+++ b/src/functionObjects/field/heatTransferCoeff/heatTransferCoeff.C
@@ -71,7 +71,7 @@ Foam::functionObjects::heatTransferCoeff::heatTransferCoeff
 {
     read(dict);
 
-    setResultName(typeName, name + ":htc:" + htcModelPtr_->type());
+    setResultName(typeName, "htc:" + htcModelPtr_->type());
 
     auto* heatTransferCoeffPtr =
         new volScalarField
diff --git a/src/functionObjects/field/particleDistribution/particleDistribution.C b/src/functionObjects/field/particleDistribution/particleDistribution.C
index 491c1f20a0..7d77828aa3 100644
--- a/src/functionObjects/field/particleDistribution/particleDistribution.C
+++ b/src/functionObjects/field/particleDistribution/particleDistribution.C
@@ -120,7 +120,7 @@ bool Foam::functionObjects::particleDistribution::write()
     (
         IOobject
         (
-            name() & "CloudRegistry",
+            scopedName("CloudRegistry"),
             mesh_.time().timeName(),
             cloud::prefix,
             mesh_.time(),
diff --git a/src/functionObjects/field/pressure/pressure.C b/src/functionObjects/field/pressure/pressure.C
index f4bd0ba3e9..f254c3815d 100644
--- a/src/functionObjects/field/pressure/pressure.C
+++ b/src/functionObjects/field/pressure/pressure.C
@@ -236,7 +236,7 @@ Foam::tmp<Foam::volScalarField> Foam::functionObjects::pressure::calcPressure
         (
             IOobject
             (
-                name() + ":p",
+                scopedName("p"),
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ
diff --git a/src/functionObjects/field/randomise/randomise.C b/src/functionObjects/field/randomise/randomise.C
index acdc1aea87..a83eab7af6 100644
--- a/src/functionObjects/field/randomise/randomise.C
+++ b/src/functionObjects/field/randomise/randomise.C
@@ -56,7 +56,7 @@ bool Foam::functionObjects::randomise::calcTemplate()
     {
         const auto& field = *fieldPtr;
 
-        resultName_ = fieldName_ & "Random";
+        resultName_ = scopedName(fieldName_ & "Random");
 
         auto trfield = tmp<VolFieldType>::New(field);
         auto& rfield = trfield.ref();
diff --git a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
index bb0f702dc5..c391923fc3 100644
--- a/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
+++ b/src/functionObjects/field/regionSizeDistribution/regionSizeDistribution.C
@@ -95,7 +95,7 @@ void Foam::functionObjects::regionSizeDistribution::writeAlphaFields
     (
         IOobject
         (
-            alphaName_ + "_liquidCore",
+            scopedName(alphaName_ + "_liquidCore"),
             obr_.time().timeName(),
             obr_,
             IOobject::NO_READ
@@ -108,7 +108,7 @@ void Foam::functionObjects::regionSizeDistribution::writeAlphaFields
     (
         IOobject
         (
-            alphaName_ + "_background",
+            scopedName(alphaName_ + "_background"),
             obr_.time().timeName(),
             obr_,
             IOobject::NO_READ
diff --git a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
index dc4b82ca70..c7dcf4a887 100644
--- a/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
+++ b/src/functionObjects/field/wallHeatFlux/wallHeatFlux.C
@@ -114,7 +114,7 @@ Foam::functionObjects::wallHeatFlux::wallHeatFlux
         (
             IOobject
             (
-                type(),
+                scopedName(typeName),
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
@@ -194,7 +194,7 @@ bool Foam::functionObjects::wallHeatFlux::read(const dictionary& dict)
 
 bool Foam::functionObjects::wallHeatFlux::execute()
 {
-    volScalarField& wallHeatFlux = lookupObjectRef<volScalarField>(type());
+    auto& wallHeatFlux = lookupObjectRef<volScalarField>(scopedName(typeName));
 
     if
     (
@@ -284,7 +284,8 @@ bool Foam::functionObjects::wallHeatFlux::execute()
 
 bool Foam::functionObjects::wallHeatFlux::write()
 {
-    const volScalarField& wallHeatFlux = lookupObject<volScalarField>(type());
+    const auto& wallHeatFlux =
+        lookupObject<volScalarField>(scopedName(typeName));
 
     Log << type() << " " << name() << " write:" << nl
         << "    writing field " << wallHeatFlux.name() << endl;
diff --git a/src/functionObjects/field/wallShearStress/wallShearStress.C b/src/functionObjects/field/wallShearStress/wallShearStress.C
index f88cd74945..8f9ee5b751 100644
--- a/src/functionObjects/field/wallShearStress/wallShearStress.C
+++ b/src/functionObjects/field/wallShearStress/wallShearStress.C
@@ -102,7 +102,7 @@ Foam::functionObjects::wallShearStress::wallShearStress
         (
             IOobject
             (
-                typeName,
+                scopedName(typeName),
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
@@ -176,8 +176,8 @@ bool Foam::functionObjects::wallShearStress::read(const dictionary& dict)
 
 bool Foam::functionObjects::wallShearStress::execute()
 {
-    volVectorField& wallShearStress =
-        mesh_.lookupObjectRef<volVectorField>(type());
+    auto& wallShearStress =
+        mesh_.lookupObjectRef<volVectorField>(scopedName(typeName));
 
     // Compressible
     {
@@ -217,8 +217,8 @@ bool Foam::functionObjects::wallShearStress::execute()
 
 bool Foam::functionObjects::wallShearStress::write()
 {
-    const volVectorField& wallShearStress =
-        obr_.lookupObject<volVectorField>(type());
+    const auto& wallShearStress =
+        obr_.lookupObject<volVectorField>(scopedName(typeName));
 
     Log << type() << " " << name() << " write:" << nl
         << "    writing field " << wallShearStress.name() << endl;
diff --git a/src/functionObjects/field/yPlus/yPlus.C b/src/functionObjects/field/yPlus/yPlus.C
index 99895924eb..b17622fa7f 100644
--- a/src/functionObjects/field/yPlus/yPlus.C
+++ b/src/functionObjects/field/yPlus/yPlus.C
@@ -83,7 +83,7 @@ Foam::functionObjects::yPlus::yPlus
         (
             IOobject
             (
-                typeName,
+                scopedName(typeName),
                 mesh_.time().timeName(),
                 mesh_,
                 IOobject::NO_READ,
@@ -115,8 +115,7 @@ bool Foam::functionObjects::yPlus::read(const dictionary& dict)
 
 bool Foam::functionObjects::yPlus::execute()
 {
-    volScalarField& yPlus =
-        lookupObjectRef<volScalarField>(typeName);
+    auto& yPlus = lookupObjectRef<volScalarField>(scopedName(typeName));
 
     if (foundObject<turbulenceModel>(turbulenceModel::propertiesName))
     {
@@ -192,8 +191,7 @@ bool Foam::functionObjects::yPlus::execute()
 
 bool Foam::functionObjects::yPlus::write()
 {
-    const volScalarField& yPlus =
-        obr_.lookupObject<volScalarField>(type());
+    const auto& yPlus = obr_.lookupObject<volScalarField>(scopedName(typeName));
 
     Log << type() << " " << name() << " write:" << nl
         << "    writing field " << yPlus.name() << endl;
diff --git a/src/functionObjects/field/zeroGradient/zeroGradient.C b/src/functionObjects/field/zeroGradient/zeroGradient.C
index 766f1283fe..cdcb08667f 100644
--- a/src/functionObjects/field/zeroGradient/zeroGradient.C
+++ b/src/functionObjects/field/zeroGradient/zeroGradient.C
@@ -113,7 +113,8 @@ bool Foam::functionObjects::zeroGradient::read(const dictionary& dict)
 
     Info<< type() << " fields: " << selectFields_ << nl;
 
-    resultName_ = dict.getOrDefault<word>("result", type() + "(@@)");
+    resultName_ =
+        dict.getOrDefault<word>("result", scopedName(type() + "(@@)"));
 
     // Require '@@' token for result, unless a single (non-regex) source field
     return
diff --git a/src/functionObjects/forces/forceCoeffs/forceCoeffs.C b/src/functionObjects/forces/forceCoeffs/forceCoeffs.C
index 5b5e2b2d7c..b57bf9d2b8 100644
--- a/src/functionObjects/forces/forceCoeffs/forceCoeffs.C
+++ b/src/functionObjects/forces/forceCoeffs/forceCoeffs.C
@@ -287,7 +287,7 @@ bool Foam::functionObjects::forceCoeffs::read(const dictionary& dict)
             (
                 IOobject
                 (
-                    fieldName("forceCoeff"),
+                    scopedName("forceCoeff"),
                     mesh_.time().timeName(),
                     mesh_,
                     IOobject::NO_READ,
@@ -306,7 +306,7 @@ bool Foam::functionObjects::forceCoeffs::read(const dictionary& dict)
             (
                 IOobject
                 (
-                    fieldName("momentCoeff"),
+                    scopedName("momentCoeff"),
                     mesh_.time().timeName(),
                     mesh_,
                     IOobject::NO_READ,
@@ -467,16 +467,16 @@ bool Foam::functionObjects::forceCoeffs::execute()
     if (writeFields_)
     {
         const volVectorField& force =
-            lookupObject<volVectorField>(fieldName("force"));
+            lookupObject<volVectorField>(scopedName("force"));
 
         const volVectorField& moment =
-            lookupObject<volVectorField>(fieldName("moment"));
+            lookupObject<volVectorField>(scopedName("moment"));
 
         volVectorField& forceCoeff =
-            lookupObjectRef<volVectorField>(fieldName("forceCoeff"));
+            lookupObjectRef<volVectorField>(scopedName("forceCoeff"));
 
         volVectorField& momentCoeff =
-            lookupObjectRef<volVectorField>(fieldName("momentCoeff"));
+            lookupObjectRef<volVectorField>(scopedName("momentCoeff"));
 
         dimensionedScalar f0("f0", dimForce, Aref_*pDyn);
         dimensionedScalar m0("m0", dimForce*dimLength, Aref_*lRef_*pDyn);
@@ -494,10 +494,10 @@ bool Foam::functionObjects::forceCoeffs::write()
     if (writeFields_)
     {
         const volVectorField& forceCoeff =
-            lookupObject<volVectorField>(fieldName("forceCoeff"));
+            lookupObject<volVectorField>(scopedName("forceCoeff"));
 
         const volVectorField& momentCoeff =
-            lookupObject<volVectorField>(fieldName("momentCoeff"));
+            lookupObject<volVectorField>(scopedName("momentCoeff"));
 
         forceCoeff.write();
         momentCoeff.write();
diff --git a/src/functionObjects/forces/forces/forces.C b/src/functionObjects/forces/forces/forces.C
index 70a34aba18..dbf2abe1e4 100644
--- a/src/functionObjects/forces/forces/forces.C
+++ b/src/functionObjects/forces/forces/forces.C
@@ -48,12 +48,6 @@ namespace functionObjects
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-Foam::word Foam::functionObjects::forces::fieldName(const word& name) const
-{
-    return this->name() + ":" + name;
-}
-
-
 void Foam::functionObjects::forces::createFiles()
 {
     // Note: Only possible to create bin files after bins have been initialised
@@ -332,12 +326,12 @@ void Foam::functionObjects::forces::resetFields()
     if (writeFields_)
     {
         volVectorField& force =
-            lookupObjectRef<volVectorField>(fieldName("force"));
+            lookupObjectRef<volVectorField>(scopedName("force"));
 
         force == dimensionedVector(force.dimensions(), Zero);
 
         volVectorField& moment =
-            lookupObjectRef<volVectorField>(fieldName("moment"));
+            lookupObjectRef<volVectorField>(scopedName("moment"));
 
         moment == dimensionedVector(moment.dimensions(), Zero);
     }
@@ -526,11 +520,11 @@ void Foam::functionObjects::forces::addToFields
         return;
     }
 
-    auto& force = lookupObjectRef<volVectorField>(fieldName("force"));
+    auto& force = lookupObjectRef<volVectorField>(scopedName("force"));
     vectorField& pf = force.boundaryFieldRef()[patchi];
     pf += fN + fT + fP;
 
-    auto& moment = lookupObjectRef<volVectorField>(fieldName("moment"));
+    auto& moment = lookupObjectRef<volVectorField>(scopedName("moment"));
     vectorField& pm = moment.boundaryFieldRef()[patchi];
     pm = Md^pf;
 }
@@ -550,8 +544,8 @@ void Foam::functionObjects::forces::addToFields
         return;
     }
 
-    auto& force = lookupObjectRef<volVectorField>(fieldName("force"));
-    auto& moment = lookupObjectRef<volVectorField>(fieldName("moment"));
+    auto& force = lookupObjectRef<volVectorField>(scopedName("force"));
+    auto& moment = lookupObjectRef<volVectorField>(scopedName("moment"));
 
     forAll(cellIDs, i)
     {
@@ -913,7 +907,7 @@ bool Foam::functionObjects::forces::read(const dictionary& dict)
             (
                 IOobject
                 (
-                    fieldName("force"),
+                    scopedName("force"),
                     time_.timeName(),
                     mesh_,
                     IOobject::NO_READ,
@@ -932,7 +926,7 @@ bool Foam::functionObjects::forces::read(const dictionary& dict)
             (
                 IOobject
                 (
-                    fieldName("moment"),
+                    scopedName("moment"),
                     time_.timeName(),
                     mesh_,
                     IOobject::NO_READ,
@@ -1120,8 +1114,8 @@ bool Foam::functionObjects::forces::write()
 {
     if (writeFields_)
     {
-        lookupObject<volVectorField>(fieldName("force")).write();
-        lookupObject<volVectorField>(fieldName("moment")).write();
+        lookupObject<volVectorField>(scopedName("force")).write();
+        lookupObject<volVectorField>(scopedName("moment")).write();
     }
 
     return true;
diff --git a/src/functionObjects/forces/forces/forces.H b/src/functionObjects/forces/forces/forces.H
index b92c9089a1..6abb8cec65 100644
--- a/src/functionObjects/forces/forces/forces.H
+++ b/src/functionObjects/forces/forces/forces.H
@@ -256,9 +256,6 @@ protected:
 
     // Protected Member Functions
 
-        //- Create a field name
-        word fieldName(const word& name) const;
-
         //- Create the output files
         void createFiles();
 
diff --git a/src/phaseSystemModels/reactingEuler/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.C b/src/phaseSystemModels/reactingEuler/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.C
index 85eb2500ba..be169e7fb2 100644
--- a/src/phaseSystemModels/reactingEuler/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.C
+++ b/src/phaseSystemModels/reactingEuler/functionObjects/reactingEulerHtcModel/reactingEulerHtcModel.C
@@ -137,7 +137,7 @@ Foam::functionObjects::reactingEulerHtcModel::reactingEulerHtcModel
 {
     read(dict);
 
-    setResultName(typeName, name + ":htc:" + htcModelPtr_->type());
+    setResultName(typeName, "htc:" + htcModelPtr_->type());
 
     volScalarField* htcPtr =
         new volScalarField

From 889bc171d959d7a8ce9bd8fcb268c54c18f563d0 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Fri, 19 Nov 2021 18:41:10 +0000
Subject: [PATCH 12/18] TUT: Added example showing use of functionObject result
 lookup from a Function1

---
 .../simpleFoam/simpleCar/README               | 95 +++++++++++++++++++
 .../simpleFoam/simpleCar/system/controlDict   |  1 +
 .../simpleCar/system/referencePressure        | 66 +++++++++++++
 3 files changed, 162 insertions(+)
 create mode 100644 tutorials/incompressible/simpleFoam/simpleCar/README
 create mode 100644 tutorials/incompressible/simpleFoam/simpleCar/system/referencePressure

diff --git a/tutorials/incompressible/simpleFoam/simpleCar/README b/tutorials/incompressible/simpleFoam/simpleCar/README
new file mode 100644
index 0000000000..0e731901c9
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/simpleCar/README
@@ -0,0 +1,95 @@
+# Tutorial case: simpleCar
+
+Provides example of using the function objects:
+
+- forceCoeffs
+- fieldAverage
+- reference
+- runTimeControls
+
+The case automatically terminates according to the runTimeControls:
+
+- The first condition monitors the average drag coefficient, derived from a
+  combination of the forceCoeffs and valueAverage function objects.  When the
+  average stabilises to a tolerance of 1e-3 it sets the trigger 1 index
+
+```
+    runTimeControl1
+    {
+        type            runTimeControl;
+        libs            (utilityFunctionObjects);
+        conditions
+        {
+            condition1
+            {
+                type            average;
+                functionObject  forceCoeffs1;
+                fields          (Cd);
+                tolerance       1e-3;
+                window          20;
+                windowType      exact;
+            }
+        }
+        satisfiedAction setTrigger;
+        trigger         1;
+    }
+```
+
+- This starts the second condition, which instructs the code to terminate
+  after a further 100 time steps.
+
+```
+    runTimeControl2
+    {
+        type            runTimeControl;
+        libs            (utilityFunctionObjects);
+        controlMode     trigger;
+        triggerStart    1;
+        conditions
+        {
+            condition1
+            {
+                type            maxDuration;
+                duration        100;
+            }
+        }
+        satisfiedAction end;
+    }
+```
+
+The `reference` function object provides an additional example where:
+
+- the average of the sample object values are averaged in time:
+
+```
+    average1
+    {
+        type            valueAverage;
+        libs            (fieldFunctionObjects);
+        writeControl    writeTime;
+
+        // Average the result of the `sample1` function object, where the
+        // result is given by the name `average(p)`
+        functionObject  sample1;
+        fields          (average(p));
+    }
+```
+
+- this value is used by the `reference` function object, where the refValue
+  is a Function1 entry:
+
+```
+    reference1
+    {
+        type            reference;
+        libs            (fieldFunctionObjects);
+        writeControl    writeTime;
+        field           p;
+
+        // Set the refValue according to the result of the `average1` function
+        // object, where the result is given by the name `average(p)Mean`
+        refValue        functionObjectValue;
+        functionObject  average1;
+        functionObjectResult average(p)Mean;
+    }
+```
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/system/controlDict b/tutorials/incompressible/simpleFoam/simpleCar/system/controlDict
index c257be3bc3..5d4059e848 100644
--- a/tutorials/incompressible/simpleFoam/simpleCar/system/controlDict
+++ b/tutorials/incompressible/simpleFoam/simpleCar/system/controlDict
@@ -48,6 +48,7 @@ functions
 {
     #include "forceCoeffs"
     #include "fieldAverage"
+    #include "referencePressure"
     #include "runTimeControls"
 }
 
diff --git a/tutorials/incompressible/simpleFoam/simpleCar/system/referencePressure b/tutorials/incompressible/simpleFoam/simpleCar/system/referencePressure
new file mode 100644
index 0000000000..e71a93b47c
--- /dev/null
+++ b/tutorials/incompressible/simpleFoam/simpleCar/system/referencePressure
@@ -0,0 +1,66 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  v2106                                 |
+|   \\  /    A nd           | Website:  www.openfoam.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+sample1
+{
+    type            sets;
+    libs            (sampling);
+    interpolationScheme cellPointFace;
+    setFormat       raw;
+    fields          ( p );
+
+    sets
+    (
+        cloud
+        {
+            type    cloud;
+            axis    xyz;
+            points
+            (
+                (1 0.2 0.05)
+                (1 0.4 0.05)
+                (1 0.6 0.05)
+                (1 0.8 0.05)
+                (1 1.0 0.05)
+            );
+        }
+    );
+}
+
+average1
+{
+    type            valueAverage;
+    libs            (fieldFunctionObjects);
+    writeControl    writeTime;
+    functionObject  sample1;
+    fields          (average(p));
+}
+
+reference1
+{
+    type            reference;
+    libs            (fieldFunctionObjects);
+    writeControl    writeTime;
+    field           p;
+    refValue        functionObjectValue;
+    functionObject  average1;
+    functionObjectResult average(p)Mean;
+}
+
+reference2
+{
+    type            reference;
+    libs            (fieldFunctionObjects);
+    writeControl    writeTime;
+    field           p;
+    refValue        sample;
+    position        (1 0.2 0.05);
+}
+
+
+// ************************************************************************* //

From 098aec4962056928c4044a859500803d3f9cb690 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Mon, 22 Nov 2021 11:56:49 +0000
Subject: [PATCH 13/18] ENH: Function1's - added objectRegistry access

---
 .../VoFSolidificationMeltingSource.C             |  2 +-
 .../VoFSolidificationMeltingSourceIO.C           |  2 +-
 .../laserDTRM/laserDTRM.C                        | 12 ++++++------
 .../preProcessing/createBoxTurb/createFields.H   |  2 +-
 etc/codeTemplates/BC/BC.C                        |  2 +-
 .../functions/Function1/Function1/Function1.H    |  4 ++--
 .../functions/Function1/LimitRange/LimitRange.C  |  2 +-
 .../primitives/functions/Function1/Scale/Scale.C |  4 ++--
 .../primitives/functions/Function1/Sine/Sine.C   | 16 +++++++++++-----
 ...alWallHeatFluxTemperatureFvPatchScalarField.C |  4 ++--
 .../porousBafflePressureFvPatchField.C           |  4 ++--
 ...bulentHeatFluxTemperatureFvPatchScalarField.C |  2 +-
 .../atmAlphatkWallFunctionFvPatchScalarField.C   |  2 +-
 .../powerLawLopesdaCosta/powerLawLopesdaCosta.C  |  2 +-
 .../rotatingMotion/rotatingMotion.C              |  6 +++---
 .../externalHeatFluxSource.C                     |  4 ++--
 .../jouleHeatingSourceTemplates.C                |  2 +-
 src/finiteVolume/cfdTools/general/MRF/MRFZone.C  |  4 ++--
 .../solidification/solidification.C              |  4 ++--
 .../cylindricalInletVelocityFvPatchVectorField.C | 10 +++++++---
 .../fvPatchFields/derived/fan/fanFvPatchField.C  |  2 +-
 .../fanPressure/fanPressureFvPatchScalarField.C  |  7 ++-----
 .../derived/fixedMean/fixedMeanFvPatchField.C    |  2 +-
 .../fixedMeanOutletInletFvPatchField.C           |  2 +-
 .../fixedProfile/fixedProfileFvPatchField.C      |  4 ++--
 .../flowRateInletVelocityFvPatchVectorField.C    |  5 +++--
 .../flowRateOutletVelocityFvPatchVectorField.C   |  5 +++--
 ...essureInletOutletVelocityFvPatchVectorField.C |  4 ++--
 .../rotatingTotalPressureFvPatchScalarField.C    |  3 ++-
 .../rotatingWallVelocityFvPatchVectorField.C     |  3 ++-
 .../surfaceNormalFixedValueFvPatchVectorField.C  |  4 ++--
 .../swirlFanVelocityFvPatchField.C               |  4 ++--
 ...wirlFlowRateInletVelocityFvPatchVectorField.C |  6 +++---
 .../swirlInletVelocityFvPatchVectorField.C       | 13 ++++++++++---
 .../translatingWallVelocityFvPatchVectorField.C  |  3 ++-
 .../uniformInletOutletFvPatchField.C             |  7 +++++--
 .../uniformJump/uniformJumpFvPatchField.C        |  3 ++-
 .../uniformJumpAMI/uniformJumpAMIFvPatchField.C  |  3 ++-
 .../uniformNormalFixedValueFvPatchVectorField.C  |  4 ++--
 .../uniformTotalPressureFvPatchScalarField.C     |  4 ++--
 ...ightFlowRateInletVelocityFvPatchVectorField.C |  3 ++-
 .../CrankNicolsonDdtScheme.C                     |  4 ++--
 ...alCoupledTemperatureMixedFvPatchScalarField.C |  4 ++--
 .../field/reference/referenceTemplates.C         |  2 +-
 src/functionObjects/field/setFlow/setFlow.C      |  6 +++---
 .../setTimeStep/setTimeStepFunctionObject.C      |  4 ++--
 .../timeVaryingMappedFixedValuePointPatchField.C |  5 ++++-
 .../fixedTemperatureConstraint.C                 |  4 ++--
 .../actuationDiskSource/actuationDiskSource.C    |  4 ++--
 .../jouleHeatingSourceTemplates.C                |  2 +-
 .../semiImplicitSource/SemiImplicitSource.C      |  4 ++--
 .../InjectionModel/ConeInjection/ConeInjection.C |  8 ++++----
 .../ConeNozzleInjection/ConeNozzleInjection.C    | 12 ++++++------
 .../InflationInjection/InflationInjection.C      |  4 ++--
 .../InjectionModel/InjectionModel.C              |  2 +-
 .../PatchFlowRateInjection.C                     |  2 +-
 .../PatchInjection/PatchInjection.C              |  2 +-
 ...jointRotatingWallVelocityFvPatchVectorField.C |  2 +-
 ...atWallBoilingWallFunctionFvPatchScalarField.C |  2 +-
 .../saturationModels/function1/function1.C       |  2 +-
 ...turbedTemperatureDependentContactAngleForce.C |  2 +-
 ...inclinedFilmNusseltHeightFvPatchScalarField.C |  6 +++---
 ...dFilmNusseltInletVelocityFvPatchVectorField.C |  6 +++---
 ...turbedTemperatureDependentContactAngleForce.C |  2 +-
 .../temperatureDependentContactAngleForce.C      |  2 +-
 .../function1Viscosity/function1Viscosity.C      |  2 +-
 .../waxSolventEvaporation.C                      |  2 +-
 .../rigidBodyMeshMotion/rigidBodyMeshMotion.C    |  5 ++++-
 .../radiationModels/fvDOM/fvDOM/fvDOM.C          |  2 +-
 .../radiationModels/solarLoad/solarLoad.C        |  2 +-
 .../submodels/solarCalculator/solarCalculator.C  |  4 ++--
 .../strainRateFunction/strainRateFunction.C      | 12 +++++++++---
 .../temperatureDependentSurfaceTension.C         |  4 ++--
 ...ependentAlphaContactAngleFvPatchScalarField.C |  2 +-
 74 files changed, 173 insertions(+), 136 deletions(-)

diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
index 51a46046fc..71e6bd708f 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSource.C
@@ -123,7 +123,7 @@ Foam::fv::VoFSolidificationMeltingSource::VoFSolidificationMeltingSource
 )
 :
     fv::cellSetOption(sourceName, modelType, dict, mesh),
-    alphaSolidT_(Function1<scalar>::New("alphaSolidT", coeffs_)),
+    alphaSolidT_(Function1<scalar>::New("alphaSolidT", coeffs_, &mesh)),
     L_("L", dimEnergy/dimMass, coeffs_),
     relax_(coeffs_.getOrDefault("relax", 0.9)),
     Cu_(coeffs_.getOrDefault<scalar>("Cu", 100000)),
diff --git a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSourceIO.C b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSourceIO.C
index 2119ba1e62..c452f60dab 100644
--- a/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSourceIO.C
+++ b/applications/solvers/multiphase/compressibleInterFoam/compressibleInterFilmFoam/VoFSolidificationMeltingSource/VoFSolidificationMeltingSourceIO.C
@@ -33,7 +33,7 @@ bool Foam::fv::VoFSolidificationMeltingSource::read(const dictionary& dict)
 {
     if (fv::cellSetOption::read(dict))
     {
-        alphaSolidT_ = Function1<scalar>::New("alphaSolidT", coeffs_);
+        alphaSolidT_ = Function1<scalar>::New("alphaSolidT", coeffs_, &mesh_);
         coeffs_.readEntry("L", L_);
         coeffs_.readIfPresent("relax", relax_);
         coeffs_.readIfPresent("Cu", Cu_);
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
index c7c1a4ac4e..4e75bf8c40 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/laserDTRM.C
@@ -343,12 +343,12 @@ Foam::radiation::laserDTRM::laserDTRM(const volScalarField& T)
 
     focalLaserPosition_
     (
-        Function1<point>::New("focalLaserPosition", *this)
+        Function1<point>::New("focalLaserPosition", *this, &mesh_)
     ),
 
     laserDirection_
     (
-        Function1<vector>::New("laserDirection", *this)
+        Function1<vector>::New("laserDirection", *this, &mesh_)
     ),
 
     focalLaserRadius_(get<scalar>("focalLaserRadius")),
@@ -359,7 +359,7 @@ Foam::radiation::laserDTRM::laserDTRM(const volScalarField& T)
 
     sigma_(0),
     I0_(0),
-    laserPower_(Function1<scalar>::New("laserPower", *this)),
+    laserPower_(Function1<scalar>::New("laserPower", *this, &mesh_)),
     powerDistribution_(),
 
     reflectionSwitch_(false),
@@ -441,11 +441,11 @@ Foam::radiation::laserDTRM::laserDTRM
 
     focalLaserPosition_
     (
-        Function1<point>::New("focalLaserPosition", *this)
+        Function1<point>::New("focalLaserPosition", *this, &mesh_)
     ),
     laserDirection_
     (
-        Function1<vector>::New("laserDirection", *this)
+        Function1<vector>::New("laserDirection", *this, &mesh_)
     ),
 
     focalLaserRadius_(get<scalar>("focalLaserRadius")),
@@ -456,7 +456,7 @@ Foam::radiation::laserDTRM::laserDTRM
 
     sigma_(0),
     I0_(0),
-    laserPower_(Function1<scalar>::New("laserPower", *this)),
+    laserPower_(Function1<scalar>::New("laserPower", *this, &mesh_)),
     powerDistribution_(),
 
     reflectionSwitch_(false),
diff --git a/applications/utilities/preProcessing/createBoxTurb/createFields.H b/applications/utilities/preProcessing/createBoxTurb/createFields.H
index 124d6ed8e5..92f5a0c128 100644
--- a/applications/utilities/preProcessing/createBoxTurb/createFields.H
+++ b/applications/utilities/preProcessing/createBoxTurb/createFields.H
@@ -16,7 +16,7 @@ const vector L(dict.get<vector>("L"));
 const Vector<label> N(dict.get<Vector<label>>("N"));
 
 // Wave number vs energy profile
-autoPtr<Function1<scalar>> Ek(Function1<scalar>::New("Ek", dict));
+autoPtr<Function1<scalar>> Ek(Function1<scalar>::New("Ek", dict, &runTime));
 
 // Number of modes
 const label nModes = dict.get<label>("nModes");
diff --git a/etc/codeTemplates/BC/BC.C b/etc/codeTemplates/BC/BC.C
index beeb273e14..bc945fb23c 100644
--- a/etc/codeTemplates/BC/BC.C
+++ b/etc/codeTemplates/BC/BC.C
@@ -78,7 +78,7 @@ CONSTRUCT
     scalarData_(dict.get<scalar>("scalarData")),
     data_(dict.get<TYPE>("data")),
     fieldData_("fieldData", dict, p.size()),
-    timeVsData_(Function1<TYPE>::New("timeVsData", dict)),
+    timeVsData_(Function1<TYPE>::New("timeVsData", dict, &this->db())),
     wordData_(dict.getOrDefault<word>("wordName", "wordDefault")),
     labelData_(-1),
     boolData_(false)
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
index 8c3bb81bd6..0a85b62ca3 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/Function1.H
@@ -37,7 +37,7 @@ Description
     It accepts primitive or dictionary entries for dispatching to different
     function types, but wraps unspecified types as "constant".
 
-    In the dictionary form, the coefficents are the dictionary itself.
+    In the dictionary form, the coefficients are the dictionary itself.
     This is arguably the more readable form.
     For example,
     \verbatim
@@ -49,7 +49,7 @@ Description
         }
     \endverbatim
 
-    In the primitive form, the coefficents are provided separately.
+    In the primitive form, the coefficients are provided separately.
     For example,
     \verbatim
         <entryName>   linearRamp;
diff --git a/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.C b/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.C
index 7beccbed7d..579309eb65 100644
--- a/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.C
+++ b/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.C
@@ -34,7 +34,7 @@ void Foam::Function1Types::LimitRange<Type>::read(const dictionary& coeffs)
 {
     min_ = coeffs.get<scalar>("min");
     max_ = coeffs.get<scalar>("max");
-    value_ = Function1<Type>::New("value", coeffs);
+    value_ = Function1<Type>::New("value", coeffs, this->obrPtr_);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
index 20903c007a..770a490757 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Scale/Scale.C
@@ -33,8 +33,8 @@ License
 template<class Type>
 void Foam::Function1Types::Scale<Type>::read(const dictionary& coeffs)
 {
-    scale_ = Function1<scalar>::New("scale", coeffs);
-    value_ = Function1<Type>::New("value", coeffs);
+    scale_ = Function1<scalar>::New("scale", coeffs, this->obrPtr_);
+    value_ = Function1<Type>::New("value", coeffs, this->obrPtr_);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
index 9b928c7e16..ea3fc38380 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
@@ -40,15 +40,21 @@ Foam::Function1Types::Sine<Type>::Sine
 :
     Function1<Type>(entryName, dict, obrPtr),
     t0_(dict.getOrDefault<scalar>("t0", 0)),
-    amplitude_(Function1<scalar>::NewIfPresent("amplitude", dict)),
-    period_(Function1<scalar>::NewIfPresent("period", dict)),
+    amplitude_
+    (
+        Function1<scalar>::NewIfPresent("amplitude", dict, word::null, obrPtr)
+    ),
+    period_
+    (
+        Function1<scalar>::NewIfPresent("period", dict, word::null, obrPtr)
+    ),
     frequency_(nullptr),
-    scale_(Function1<Type>::New("scale", dict)),
-    level_(Function1<Type>::New("level", dict))
+    scale_(Function1<Type>::New("scale", dict, obrPtr)),
+    level_(Function1<Type>::New("level", dict, obrPtr))
 {
     if (!period_)
     {
-        frequency_ = Function1<scalar>::New("frequency", dict);
+        frequency_ = Function1<scalar>::New("frequency", dict, obrPtr);
     }
 }
 
diff --git a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
index 41f30631b7..2211770a15 100644
--- a/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/TurbulenceModels/compressible/turbulentFluidThermoModels/derivedFvPatchFields/externalWallHeatFluxTemperature/externalWallHeatFluxTemperatureFvPatchScalarField.C
@@ -110,7 +110,7 @@ externalWallHeatFluxTemperatureFvPatchScalarField
     {
         case fixedPower:
         {
-            Q_ = Function1<scalar>::New("Q", dict);
+            Q_ = Function1<scalar>::New("Q", dict, &db());
             break;
         }
         case fixedHeatFlux:
@@ -121,7 +121,7 @@ externalWallHeatFluxTemperatureFvPatchScalarField
         case fixedHeatTransferCoeff:
         {
             h_ = PatchFunction1<scalar>::New(patch().patch(), "h", dict);
-            Ta_ = Function1<scalar>::New("Ta", dict);
+            Ta_ = Function1<scalar>::New("Ta", dict, &db());
 
             if (dict.readIfPresent("thicknessLayers", thicknessLayers_))
             {
diff --git a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
index f1c573f471..f249e419bc 100644
--- a/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
+++ b/src/TurbulenceModels/turbulenceModels/derivedFvPatchFields/porousBafflePressure/porousBafflePressureFvPatchField.C
@@ -59,8 +59,8 @@ Foam::porousBafflePressureFvPatchField::porousBafflePressureFvPatchField
     fixedJumpFvPatchField<scalar>(p, iF),
     phiName_(dict.getOrDefault<word>("phi", "phi")),
     rhoName_(dict.getOrDefault<word>("rho", "rho")),
-    D_(Function1<scalar>::New("D", dict)),
-    I_(Function1<scalar>::New("I", dict)),
+    D_(Function1<scalar>::New("D", dict, &db())),
+    I_(Function1<scalar>::New("I", dict, &db())),
     length_(dict.get<scalar>("length")),
     uniformJump_(dict.getOrDefault("uniformJump", false))
 {
diff --git a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
index f0907bfcc5..6d0649285d 100644
--- a/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/atmTurbulentHeatFluxTemperature/atmTurbulentHeatFluxTemperatureFvPatchScalarField.C
@@ -103,7 +103,7 @@ atmTurbulentHeatFluxTemperatureFvPatchScalarField
         )
     ),
     alphaEffName_(dict.get<word>("alphaEff")),
-    Cp0_(Function1<scalar>::New("Cp0", dict, &db().time())),
+    Cp0_(Function1<scalar>::New("Cp0", dict, &db())),
     q_(PatchFunction1<scalar>::New(p.patch(), "q", dict))
 {
     if (dict.found("value") && dict.found("gradient"))
diff --git a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C
index 050997ca3a..0f0be2ac92 100644
--- a/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C
+++ b/src/atmosphericModels/derivedFvPatchFields/wallFunctions/atmAlphatkWallFunction/atmAlphatkWallFunctionFvPatchScalarField.C
@@ -128,7 +128,7 @@ atmAlphatkWallFunctionFvPatchScalarField
             scalarMinMax::ge(SMALL)
         )
     ),
-    Pr_(Function1<scalar>::New("Pr", dict, &db().time())),
+    Pr_(Function1<scalar>::New("Pr", dict, &db())),
     Prt_(PatchFunction1<scalar>::New(p.patch(), "Prt", dict)),
     z0_(PatchFunction1<scalar>::New(p.patch(), "z0", dict))
 {
diff --git a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C
index c8e4175268..c7524fc835 100644
--- a/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C
+++ b/src/atmosphericModels/porosityModels/powerLawLopesdaCosta/powerLawLopesdaCosta.C
@@ -76,7 +76,7 @@ Foam::porosityModels::powerLawLopesdaCostaZone::powerLawLopesdaCostaZone
     // function of the normalized vertical position
     autoPtr<Function1<scalar>> SigmaFunc
     (
-        Function1<scalar>::New("Sigma", dict)
+        Function1<scalar>::New("Sigma", dict, &mesh)
     );
 
     // Searchable triSurface for the top of the porous region
diff --git a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
index b90a19836f..2fa1a69b2e 100644
--- a/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
+++ b/src/dynamicMesh/motionSolvers/displacement/solidBody/solidBodyMotionFunctions/rotatingMotion/rotatingMotion.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,7 +57,7 @@ Foam::solidBodyMotionFunctions::rotatingMotion::rotatingMotion
     solidBodyMotionFunction(SBMFCoeffs, runTime),
     origin_(SBMFCoeffs_.get<vector>("origin")),
     axis_(SBMFCoeffs_.get<vector>("axis")),
-    omega_(Function1<scalar>::New("omega", SBMFCoeffs_))
+    omega_(Function1<scalar>::New("omega", SBMFCoeffs_, &runTime))
 {}
 
 
@@ -89,7 +89,7 @@ bool Foam::solidBodyMotionFunctions::rotatingMotion::read
 
     omega_.reset
     (
-        Function1<scalar>::New("omega", SBMFCoeffs_)
+        Function1<scalar>::New("omega", SBMFCoeffs_, &time_)
     );
 
     return true;
diff --git a/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.C b/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.C
index 6c177730c5..c36fb0ae51 100644
--- a/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.C
+++ b/src/faOptions/sources/derived/externalHeatFluxSource/externalHeatFluxSource.C
@@ -74,7 +74,7 @@ Foam::fa::externalHeatFluxSource::externalHeatFluxSource
     Q_(0),
     q_(0),
     h_(0),
-    Ta_(),
+    Ta_(nullptr),
     emissivity_(dict.getOrDefault<scalar>("emissivity", 0))
 {
     fieldNames_.resize(1, TName_);
@@ -194,7 +194,7 @@ bool Foam::fa::externalHeatFluxSource::read(const dictionary& dict)
             case fixedHeatTransferCoeff:
             {
                 dict.readEntry("h", h_);
-                Ta_ = Function1<scalar>::New("Ta", dict);
+                Ta_ = Function1<scalar>::New("Ta", dict, &mesh_);
                 break;
             }
         }
diff --git a/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSourceTemplates.C b/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSourceTemplates.C
index 55f8b8da19..405453f521 100644
--- a/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSourceTemplates.C
+++ b/src/faOptions/sources/derived/jouleHeatingSource/jouleHeatingSourceTemplates.C
@@ -41,7 +41,7 @@ void Foam::fa::jouleHeatingSource::initialiseSigma
     if (dict.found("sigma"))
     {
         // Sigma to be defined using a Function1 type
-        sigmaVsTPtr = Function1<Type>::New("sigma", dict);
+        sigmaVsTPtr = Function1<Type>::New("sigma", dict, &mesh_);
 
         auto tsigma = tmp<AreaFieldType>::New
         (
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
index a6d3653599..fa04a6baee 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZone.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -256,7 +256,7 @@ Foam::MRFZone::MRFZone
     ),
     origin_(coeffs_.get<vector>("origin")),
     axis_(coeffs_.get<vector>("axis").normalise()),
-    omega_(Function1<scalar>::New("omega", coeffs_))
+    omega_(Function1<scalar>::New("omega", coeffs_, &mesh_))
 {
     if (cellZoneName_ == word::null)
     {
diff --git a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C
index 1281b2955f..d5fee71115 100644
--- a/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C
+++ b/src/finiteVolume/cfdTools/general/porosityModel/solidification/solidification.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -58,7 +58,7 @@ Foam::porosityModels::solidification::solidification
     TName_(coeffs_.getOrDefault<word>("T", "T")),
     alphaName_(coeffs_.getOrDefault<word>("alpha", "none")),
     rhoName_(coeffs_.getOrDefault<word>("rho", "rho")),
-    D_(Function1<scalar>::New("D", coeffs_))
+    D_(Function1<scalar>::New("D", coeffs_, &mesh))
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
index 87b129d07e..b946c66c7d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/cylindricalInletVelocity/cylindricalInletVelocityFvPatchVectorField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -79,9 +80,12 @@ cylindricalInletVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(p, iF, dict),
     origin_(dict.getCompat<vector>("origin", {{"centre", 1712}})),
     axis_(dict.lookup("axis")),
-    axialVelocity_(Function1<scalar>::New("axialVelocity", dict)),
-    radialVelocity_(Function1<scalar>::New("radialVelocity", dict)),
-    rpm_(Function1<scalar>::New("rpm", dict))
+    axialVelocity_(Function1<scalar>::New("axialVelocity", dict, &db())),
+    radialVelocity_
+    (
+        Function1<scalar>::New("radialVelocity", dict, &db())
+    ),
+    rpm_(Function1<scalar>::New("rpm", dict, &db()))
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
index 0054c3def6..109b4badda 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fan/fanFvPatchField.C
@@ -84,7 +84,7 @@ Foam::fanFvPatchField<Type>::fanFvPatchField
 
     if (this->cyclicPatch().owner())
     {
-        this->jumpTable_ = Function1<Type>::New("jumpTable", dict);
+        this->jumpTable_ = Function1<Type>::New("jumpTable", dict, &this->db());
     }
 
     if (dict.found("value"))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
index 17ab5f33a1..f733770aa6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fanPressure/fanPressureFvPatchScalarField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd
+    Copyright (C) 2017-2021 OpenCFD Ltd
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -103,10 +103,7 @@ Foam::fanPressureFvPatchScalarField::fanPressureFvPatchScalarField
     }
     else
     {
-        fanCurve_.reset
-        (
-            Function1<scalar>::New("fanCurve", dict)
-        );
+        fanCurve_.reset(Function1<scalar>::New("fanCurve", dict, &db()));
     }
 
     if (nonDimensional_)
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
index adfdc5299f..f8a4c70fc6 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMean/fixedMeanFvPatchField.C
@@ -52,7 +52,7 @@ Foam::fixedMeanFvPatchField<Type>::fixedMeanFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(p, iF, dict),
-    meanValue_(Function1<Type>::New("meanValue", dict))
+    meanValue_(Function1<Type>::New("meanValue", dict, &this->db()))
 {
     this->patchType() = dict.getOrDefault<word>("patchType", word::null);
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C
index 09b86e529f..8157fe7bd8 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedMeanOutletInlet/fixedMeanOutletInletFvPatchField.C
@@ -53,7 +53,7 @@ Foam::fixedMeanOutletInletFvPatchField<Type>::fixedMeanOutletInletFvPatchField
 )
 :
     outletInletFvPatchField<Type>(p, iF),
-    meanValue_(Function1<Type>::New("meanValue", dict))
+    meanValue_(Function1<Type>::New("meanValue", dict, &this->db()))
 {
     this->phiName_ = dict.getOrDefault<word>("phi", "phi");
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
index b9bbdedf81..8cdf7aa347 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedProfile/fixedProfileFvPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2015-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -68,7 +68,7 @@ Foam::fixedProfileFvPatchField<Type>::fixedProfileFvPatchField
 )
 :
     fixedValueFvPatchField<Type>(p, iF, dict, false),
-    profile_(Function1<Type>::New("profile", dict)),
+    profile_(Function1<Type>::New("profile", dict, &this->db())),
     dir_(dict.lookup("direction")),
     origin_(dict.get<scalar>("origin"))
 {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
index d17a7c4cb6..d32e3b94fd 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateInletVelocity/flowRateInletVelocityFvPatchVectorField.C
@@ -70,12 +70,13 @@ flowRateInletVelocityFvPatchVectorField
     if (dict.found("volumetricFlowRate"))
     {
         volumetric_ = true;
-        flowRate_ = Function1<scalar>::New("volumetricFlowRate", dict);
+        flowRate_ =
+            Function1<scalar>::New("volumetricFlowRate", dict, &db());
     }
     else if (dict.found("massFlowRate"))
     {
         volumetric_ = false;
-        flowRate_ = Function1<scalar>::New("massFlowRate", dict);
+        flowRate_ = Function1<scalar>::New("massFlowRate", dict, &db());
         rhoName_ = dict.getOrDefault<word>("rho", "rho");
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
index 65e665cbd3..ac49bd1c70 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/flowRateOutletVelocity/flowRateOutletVelocityFvPatchVectorField.C
@@ -62,13 +62,14 @@ flowRateOutletVelocityFvPatchVectorField
     if (dict.found("volumetricFlowRate"))
     {
         volumetric_ = true;
-        flowRate_ = Function1<scalar>::New("volumetricFlowRate", dict);
+        flowRate_ =
+            Function1<scalar>::New("volumetricFlowRate", dict, &db());
         rhoName_ = "rho";
     }
     else if (dict.found("massFlowRate"))
     {
         volumetric_ = false;
-        flowRate_ = Function1<scalar>::New("massFlowRate", dict);
+        flowRate_ = Function1<scalar>::New("massFlowRate", dict, &db());
         rhoName_ = dict.getOrDefault<word>("rho", "rho");
     }
     else
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
index 0148fa6b68..b5578dd091 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingPressureInletOutletVelocity/rotatingPressureInletOutletVelocityFvPatchVectorField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -89,7 +89,7 @@ rotatingPressureInletOutletVelocityFvPatchVectorField
 )
 :
     pressureInletOutletVelocityFvPatchVectorField(p, iF, dict),
-    omega_(Function1<vector>::New("omega", dict))
+    omega_(Function1<vector>::New("omega", dict, &db()))
 {
     patchType() = dict.getOrDefault<word>("patchType", word::null);
     calcTangentialVelocity();
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
index 01d501895e..0034ab05c1 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingTotalPressure/rotatingTotalPressureFvPatchScalarField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -68,7 +69,7 @@ rotatingTotalPressureFvPatchScalarField
 )
 :
     totalPressureFvPatchScalarField(p, iF, dict),
-    omega_(Function1<vector>::New("omega", dict))
+    omega_(Function1<vector>::New("omega", dict, &db()))
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
index 0ab83cd6b7..9a8aad29f2 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/rotatingWallVelocity/rotatingWallVelocityFvPatchVectorField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,7 +58,7 @@ rotatingWallVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(p, iF, dict, false),
     origin_(dict.lookup("origin")),
     axis_(dict.lookup("axis")),
-    omega_(Function1<scalar>::New("omega", dict))
+    omega_(Function1<scalar>::New("omega", dict, &db()))
 {
     if (dict.found("value"))
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
index 22ba3f5885..2d700f99e5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/surfaceNormalFixedValue/surfaceNormalFixedValueFvPatchVectorField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,7 +56,7 @@ surfaceNormalFixedValueFvPatchVectorField
 :
     fixedValueFvPatchVectorField(p, iF, dict, false),
     refValue_("refValue", dict, p.size()),
-    ramp_(Function1<scalar>::NewIfPresent("ramp", dict))
+    ramp_(Function1<scalar>::NewIfPresent("ramp", dict, word::null, &db()))
 {
     tmp<vectorField> tvalues(refValue_*patch().nf());
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFanVelocity/swirlFanVelocityFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFanVelocity/swirlFanVelocityFvPatchField.C
index b75e4b3222..eadd53def9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFanVelocity/swirlFanVelocityFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFanVelocity/swirlFanVelocityFvPatchField.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -155,7 +155,7 @@ Foam::swirlFanVelocityFvPatchField::swirlFanVelocityFvPatchField
     rpm_
     (
         this->cyclicPatch().owner()
-      ? Function1<scalar>::New("rpm", dict)
+      ? Function1<scalar>::New("rpm", dict, &db())
       : nullptr
     ),
     rEff_(dict.getOrDefault<scalar>("rEff", 0)),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
index 26dfa9976a..4ad0e8cf06 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlFlowRateInletVelocity/swirlFlowRateInletVelocityFvPatchVectorField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2018-2020 OpenCFD Ltd.
+    Copyright (C) 2018-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -83,8 +83,8 @@ swirlFlowRateInletVelocityFvPatchVectorField
           : Zero
         )
     ),
-    flowRate_(Function1<scalar>::New("flowRate", dict)),
-    rpm_(Function1<scalar>::New("rpm", dict))
+    flowRate_(Function1<scalar>::New("flowRate", dict, &db())),
+    rpm_(Function1<scalar>::New("rpm", dict, &db()))
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
index 2db8329019..1bd5718888 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/swirlInletVelocity/swirlInletVelocityFvPatchVectorField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2017 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -75,9 +76,15 @@ swirlInletVelocityFvPatchVectorField
     fixedValueFvPatchField<vector>(p, iF, dict),
     origin_(dict.lookup("origin")),
     axis_(dict.lookup("axis")),
-    axialVelocity_(Function1<scalar>::New("axialVelocity", dict)),
-    radialVelocity_(Function1<scalar>::New("radialVelocity", dict)),
-    tangentialVelocity_(Function1<scalar>::New("tangentialVelocity", dict))
+    axialVelocity_(Function1<scalar>::New("axialVelocity", dict, &db())),
+    radialVelocity_
+    (
+        Function1<scalar>::New("radialVelocity", dict, &db())
+    ),
+    tangentialVelocity_
+    (
+        Function1<scalar>::New("tangentialVelocity", dict, &db())
+    )
 {}
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
index 0bf20ad2b8..6e5e2dfc5c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/translatingWallVelocity/translatingWallVelocityFvPatchVectorField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,7 +53,7 @@ translatingWallVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF, dict, false),
-    U_(Function1<vector>::New("U", dict))
+    U_(Function1<vector>::New("U", dict, &db()))
 {
     // Evaluate the wall velocity
     updateCoeffs();
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
index 9ef14f817b..66ac85ac11 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformInletOutlet/uniformInletOutletFvPatchField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2017 OpenFOAM Foundation
-    Copyright (C) 2015-2020 OpenCFD Ltd.
+    Copyright (C) 2015-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -56,7 +56,10 @@ Foam::uniformInletOutletFvPatchField<Type>::uniformInletOutletFvPatchField
 :
     mixedFvPatchField<Type>(p, iF),
     phiName_(dict.getOrDefault<word>("phi", "phi")),
-    uniformInletValue_(Function1<Type>::New("uniformInletValue", dict))
+    uniformInletValue_
+    (
+        Function1<Type>::New("uniformInletValue", dict, &this->db())
+    )
 {
     this->patchType() = dict.getOrDefault<word>("patchType", word::null);
     this->refValue() =
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
index 06ff6d907e..fe33dd32c5 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJump/uniformJumpFvPatchField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2017 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -71,7 +72,7 @@ Foam::uniformJumpFvPatchField<Type>::uniformJumpFvPatchField
     {
         if (this->cyclicPatch().owner())
         {
-            jumpTable_ = Function1<Type>::New("jumpTable", dict);
+            jumpTable_ = Function1<Type>::New("jumpTable", dict, &this->db());
         }
 
         if (dict.found("value"))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
index 0d801bf40e..45ed242bfe 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformJumpAMI/uniformJumpAMIFvPatchField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2017 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -68,7 +69,7 @@ Foam::uniformJumpAMIFvPatchField<Type>::uniformJumpAMIFvPatchField
 {
     if (this->cyclicAMIPatch().owner())
     {
-        jumpTable_ = Function1<Type>::New("jumpTable", dict);
+        jumpTable_ = Function1<Type>::New("jumpTable", dict, &this->db());
     }
 
     if (dict.found("value"))
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C
index 7903bf3b1e..4bede8adaa 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformNormalFixedValue/uniformNormalFixedValueFvPatchVectorField.C
@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2019-2020 OpenCFD Ltd.
+    Copyright (C) 2019-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -55,7 +55,7 @@ uniformNormalFixedValueFvPatchVectorField
 :
     fixedValueFvPatchVectorField(p, iF, dict, false),
     uniformValue_(PatchFunction1<scalar>::New(p.patch(), "uniformValue", dict)),
-    ramp_(Function1<scalar>::NewIfPresent("ramp", dict))
+    ramp_(Function1<scalar>::NewIfPresent("ramp", dict, word::null, &db()))
 {
     if (dict.found("value"))
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
index 93ceb35c00..8199cee64c 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/uniformTotalPressure/uniformTotalPressureFvPatchScalarField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2017 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,7 +65,7 @@ uniformTotalPressureFvPatchScalarField
     rhoName_(dict.getOrDefault<word>("rho", "rho")),
     psiName_(dict.getOrDefault<word>("psi", "none")),
     gamma_(psiName_ != "none" ? dict.get<scalar>("gamma") : 1),
-    p0_(Function1<scalar>::New("p0", dict))
+    p0_(Function1<scalar>::New("p0", dict, &db()))
 {
     if (dict.found("value"))
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
index 7db23d934e..d90a4d89a9 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/variableHeightFlowRateInletVelocity/variableHeightFlowRateInletVelocityFvPatchVectorField.C
@@ -6,6 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2012-2016 OpenFOAM Foundation
+    Copyright (C) 2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,7 +54,7 @@ Foam::variableHeightFlowRateInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchField<vector>(p, iF, dict),
-    flowRate_(Function1<scalar>::New("flowRate", dict)),
+    flowRate_(Function1<scalar>::New("flowRate", dict, &db())),
     alphaName_(dict.lookup("alpha"))
 {}
 
diff --git a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
index 089dcb9199..e3feba86eb 100644
--- a/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
+++ b/src/finiteVolume/finiteVolume/ddtSchemes/CrankNicolsonDdtScheme/CrankNicolsonDdtScheme.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2018 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -328,7 +328,7 @@ CrankNicolsonDdtScheme<Type>::CrankNicolsonDdtScheme
     {
         is.putBack(firstToken);
         dictionary dict(is);
-        ocCoeff_ = Function1<scalar>::New("ocCoeff", dict);
+        ocCoeff_ = Function1<scalar>::New("ocCoeff", dict, &mesh);
     }
 
     // Ensure the old-old-time cell volumes are available
diff --git a/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C b/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
index 2500429a6e..a6552c8df6 100644
--- a/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
+++ b/src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2017-2020 OpenCFD Ltd.
+    Copyright (C) 2017-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -146,7 +146,7 @@ externalCoupledTemperatureMixedFvPatchScalarField
 
     if (refTempType_ == refTemperatureType::USER)
     {
-        Tref_ = Function1<scalar>::New("Tref", dict);
+        Tref_ = Function1<scalar>::New("Tref", dict, &db());
     }
 
     if (dict.found("refValue"))
diff --git a/src/functionObjects/field/reference/referenceTemplates.C b/src/functionObjects/field/reference/referenceTemplates.C
index 500507023c..449f2a6ce5 100644
--- a/src/functionObjects/field/reference/referenceTemplates.C
+++ b/src/functionObjects/field/reference/referenceTemplates.C
@@ -47,7 +47,7 @@ bool Foam::functionObjects::reference::calcType()
 
         autoPtr<Function1<Type>> valuePtr
         (
-            Function1<Type>::New("refValue", localDict_, &mesh_)
+            Function1<Type>::New("refValue", localDict_, &this->mesh_)
         );
 
         refValue.value() = valuePtr->value(this->time().value());
diff --git a/src/functionObjects/field/setFlow/setFlow.C b/src/functionObjects/field/setFlow/setFlow.C
index fbd45ac896..bd12f0ef08 100644
--- a/src/functionObjects/field/setFlow/setFlow.C
+++ b/src/functionObjects/field/setFlow/setFlow.C
@@ -155,18 +155,18 @@ bool Foam::functionObjects::setFlow::read(const dictionary& dict)
         }
 
         // Scaling is applied across all modes
-        scalePtr_ = Function1<scalar>::New("scale", dict);
+        scalePtr_ = Function1<scalar>::New("scale", dict, &mesh_);
 
         switch (mode_)
         {
             case modeType::FUNCTION:
             {
-                velocityPtr_ = Function1<vector>::New("velocity", dict);
+                velocityPtr_ = Function1<vector>::New("velocity", dict, &mesh_);
                 break;
             }
             case modeType::ROTATION:
             {
-                omegaPtr_ = Function1<scalar>::New("omega", dict);
+                omegaPtr_ = Function1<scalar>::New("omega", dict, &mesh_);
 
                 dict.readEntry("origin", origin_);
                 const vector refDir(dict.get<vector>("refDir").normalise());
diff --git a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
index ecc5a47185..1b40d7c8b6 100644
--- a/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
+++ b/src/functionObjects/utilities/setTimeStep/setTimeStepFunctionObject.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2013-2016 OpenFOAM Foundation
-    Copyright (C) 2016-2020 OpenCFD Ltd.
+    Copyright (C) 2016-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -92,7 +92,7 @@ bool Foam::functionObjects::setTimeStepFunctionObject::read
 {
     timeFunctionObject::read(dict);
 
-    timeStepPtr_ = Function1<scalar>::New("deltaT", dict);
+    timeStepPtr_ = Function1<scalar>::New("deltaT", dict, &time_);
 
     // Ensure that adjustTimeStep is active
     if (!time_.controlDict().getOrDefault("adjustTimeStep", false))
diff --git a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
index a40cd67244..28c1e7285b 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValuePointPatchField.C
@@ -85,7 +85,10 @@ timeVaryingMappedFixedValuePointPatchField
     endSampleTime_(-1),
     endSampledValues_(0),
     endAverage_(Zero),
-    offset_(Function1<Type>::NewIfPresent("offset", dict))
+    offset_
+    (
+        Function1<Type>::NewIfPresent("offset", dict, word::null, &this->db())
+    )
 {
     if
     (
diff --git a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
index 17669fd837..93c192c1f0 100644
--- a/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
+++ b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
@@ -80,7 +80,7 @@ Foam::fv::fixedTemperatureConstraint::fixedTemperatureConstraint
         {
             Tuniform_.reset
             (
-                Function1<scalar>::New("temperature", coeffs_).ptr()
+                Function1<scalar>::New("temperature", coeffs_, &mesh_)
             );
             break;
         }
@@ -152,7 +152,7 @@ bool Foam::fv::fixedTemperatureConstraint::read(const dictionary& dict)
         {
             Tuniform_.reset
             (
-                Function1<scalar>::New(Tuniform_->name(), dict).ptr()
+                Function1<scalar>::New(Tuniform_->name(), dict, &mesh_)
             );
         }
 
diff --git a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
index 78b4013226..20e81dd826 100644
--- a/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
+++ b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
@@ -213,8 +213,8 @@ Foam::fv::actuationDiskSource::actuationDiskSource
             [&](const vector& vec){ return mag(vec) > VSMALL; }
         ).normalise()
     ),
-    UvsCpPtr_(Function1<scalar>::New("Cp", coeffs_)),
-    UvsCtPtr_(Function1<scalar>::New("Ct", coeffs_)),
+    UvsCpPtr_(Function1<scalar>::New("Cp", coeffs_, &mesh)),
+    UvsCtPtr_(Function1<scalar>::New("Ct", coeffs_, &mesh)),
     monitorCells_()
 {
     setMonitorCells(coeffs_);
diff --git a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSourceTemplates.C b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSourceTemplates.C
index 37480861ed..95cb6a05b9 100644
--- a/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSourceTemplates.C
+++ b/src/fvOptions/sources/derived/jouleHeatingSource/jouleHeatingSourceTemplates.C
@@ -39,7 +39,7 @@ void Foam::fv::jouleHeatingSource::initialiseSigma
     if (dict.found("sigma"))
     {
         // Sigma to be defined using a Function1 type
-        sigmaVsTPtr = Function1<Type>::New("sigma", dict);
+        sigmaVsTPtr = Function1<Type>::New("sigma", dict, &mesh_);
 
         auto tsigma = tmp<VolFieldType>::New
         (
diff --git a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
index cbb84b1b71..777d944635 100644
--- a/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
+++ b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
@@ -91,8 +91,8 @@ void Foam::fv::SemiImplicitSource<Type>::setFieldData(const dictionary& dict)
         else
         {
             const dictionary& Sdict = dEntry.dict();
-            Su_.set(count, Function1<Type>::New("Su", Sdict));
-            Sp_.set(count, Function1<scalar>::New("Sp", Sdict));
+            Su_.set(count, Function1<Type>::New("Su", Sdict, &mesh_));
+            Sp_.set(count, Function1<scalar>::New("Sp", Sdict, &mesh_));
         }
 
         ++count;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index 3d80440db8..a06fe5803d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -59,7 +59,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
         (
             "flowRateProfile",
             this->coeffDict(),
-            &owner.db().time()
+            &owner.mesh()
         )
     ),
     Umag_
@@ -68,7 +68,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
         (
             "Umag",
             this->coeffDict(),
-            &owner.db().time()
+            &owner.mesh()
         )
     ),
     thetaInner_
@@ -77,7 +77,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
         (
             "thetaInner",
             this->coeffDict(),
-            &owner.db().time()
+            &owner.mesh()
         )
     ),
     thetaOuter_
@@ -86,7 +86,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
         (
             "thetaOuter",
             this->coeffDict(),
-            &owner.db().time()
+            &owner.mesh()
         )
     ),
     sizeDistribution_
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
index a73f28650d..5ffc3b4bea 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
@@ -80,7 +80,7 @@ void Foam::ConeNozzleInjection<CloudType>::setInjectionMethod()
                 (
                     "position",
                     this->coeffDict(),
-                    &this->owner().db().time()
+                    &this->owner().mesh()
                 )
             );
             break;
@@ -114,7 +114,7 @@ void Foam::ConeNozzleInjection<CloudType>::setFlowType()
                 (
                     "Pinj",
                     this->coeffDict(),
-                    &this->owner().db().time()
+                    &this->owner().mesh()
                 )
             );
             break;
@@ -127,7 +127,7 @@ void Foam::ConeNozzleInjection<CloudType>::setFlowType()
                 (
                     "Cd",
                     this->coeffDict(),
-                    &this->owner().db().time()
+                    &this->owner().mesh()
                 )
             );
             break;
@@ -175,7 +175,7 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
         (
             "flowRateProfile",
             this->coeffDict(),
-            &owner.db().time()
+            &owner.mesh()
         )
     ),
     thetaInner_
@@ -184,7 +184,7 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
         (
             "thetaInner",
             this->coeffDict(),
-            &owner.db().time()
+            &owner.mesh()
         )
     ),
     thetaOuter_
@@ -193,7 +193,7 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
         (
             "thetaOuter",
             this->coeffDict(),
-            &owner.db().time()
+            &owner.mesh()
         )
     ),
     sizeDistribution_
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
index 52dd82c6de..74741ef8b3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
@@ -56,7 +56,7 @@ Foam::InflationInjection<CloudType>::InflationInjection
         (
             "flowRateProfile",
             this->coeffDict(),
-            &owner.db().time()
+            &owner.mesh()
         )
     ),
     growthRate_
@@ -65,7 +65,7 @@ Foam::InflationInjection<CloudType>::InflationInjection
         (
             "growthRate",
             this->coeffDict(),
-            &owner.db().time()
+            &owner.mesh()
         )
     ),
     newParticles_(),
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 58838ec65f..6731f675f4 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -345,7 +345,7 @@ Foam::InjectionModel<CloudType>::InjectionModel
                 (
                     "massFlowRate",
                     this->coeffDict(),
-                    &owner.db().time()
+                    &owner.mesh()
                 )
             );
             massTotal_ = massFlowRate_->value(owner.db().time().value());
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index 277ef57bd7..e5a9663ecc 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
@@ -52,7 +52,7 @@ Foam::PatchFlowRateInjection<CloudType>::PatchFlowRateInjection
         (
             "concentration",
             this->coeffDict(),
-            &owner.db().time()
+            &owner.mesh()
         )
     ),
     parcelConcentration_
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index 692474ef28..1552c8f3bd 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -53,7 +53,7 @@ Foam::PatchInjection<CloudType>::PatchInjection
         (
             "flowRateProfile",
             this->coeffDict(),
-            &owner.db().time()
+            &owner.mesh()
         )
     ),
     sizeDistribution_
diff --git a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointRotatingWallVelocity/adjointRotatingWallVelocityFvPatchVectorField.C b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointRotatingWallVelocity/adjointRotatingWallVelocityFvPatchVectorField.C
index c7d4487a47..ad2e887809 100644
--- a/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointRotatingWallVelocity/adjointRotatingWallVelocityFvPatchVectorField.C
+++ b/src/optimisation/adjointOptimisation/adjoint/adjointBoundaryConditions/adjointRotatingWallVelocity/adjointRotatingWallVelocityFvPatchVectorField.C
@@ -72,7 +72,7 @@ adjointRotatingWallVelocityFvPatchVectorField
     adjointWallVelocityFvPatchVectorField(p, iF, dict),
     origin_(dict.get<vector>("origin")),
     axis_(dict.get<vector>("axis")),
-    omega_(Function1<scalar>::New("omega", dict))
+    omega_(Function1<scalar>::New("omega", dict, &db()))
 {}
 
 
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
index 92f9c06aaf..f29120d2c4 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/derivedFvPatchFields/alphatWallBoilingWallFunction/alphatWallBoilingWallFunctionFvPatchScalarField.C
@@ -113,7 +113,7 @@ alphatWallBoilingWallFunctionFvPatchScalarField
     alphatPhaseChangeJayatillekeWallFunctionFvPatchScalarField(p, iF, dict),
     otherPhaseName_(dict.get<word>("otherPhase")),
     phaseType_(phaseTypeNames_.get("phaseType", dict)),
-    relax_(Function1<scalar>::New("relax", dict)),
+    relax_(Function1<scalar>::New("relax", dict, &db())),
     AbyV_(p.size(), 0),
     alphatConv_(p.size(), 0),
     dDep_(p.size(), 1e-5),
diff --git a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/function1/function1.C b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/function1/function1.C
index ff01eea5de..5fe61e9f82 100644
--- a/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/function1/function1.C
+++ b/src/phaseSystemModels/reactingEuler/multiphaseSystem/interfacialCompositionModels/saturationModels/function1/function1.C
@@ -51,7 +51,7 @@ Foam::saturationModels::function1::function1
     saturationModel(db),
     function_
     (
-        Function1<scalar>::New("function", dict)
+        Function1<scalar>::New("function", dict, &db)
     )
 {}
 
diff --git a/src/regionFaModels/liquidFilm/subModels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C b/src/regionFaModels/liquidFilm/subModels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C
index 10858e865f..85cf19f2c5 100644
--- a/src/regionFaModels/liquidFilm/subModels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C
+++ b/src/regionFaModels/liquidFilm/subModels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C
@@ -58,7 +58,7 @@ perturbedTemperatureDependentContactAngleForce
 )
 :
     contactAngleForce(typeName, film, dict),
-    thetaPtr_(Function1<scalar>::New("theta", coeffDict_)),
+    thetaPtr_(Function1<scalar>::New("theta", coeffDict_, &film.primaryMesh())),
     rndGen_(label(0)),
     distribution_
     (
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
index 6215864b51..dca945f905 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltHeight/inclinedFilmNusseltHeightFvPatchScalarField.C
@@ -78,9 +78,9 @@ inclinedFilmNusseltHeightFvPatchScalarField
     (
         dict.getOrDefault<word>("filmRegion", "surfaceFilmProperties")
     ),
-    GammaMean_(Function1<scalar>::New("GammaMean", dict)),
-    a_(Function1<scalar>::New("a", dict)),
-    omega_(Function1<scalar>::New("omega", dict))
+    GammaMean_(Function1<scalar>::New("GammaMean", dict, &db())),
+    a_(Function1<scalar>::New("a", dict, &db())),
+    omega_(Function1<scalar>::New("omega", dict, &db()))
 {}
 
 
diff --git a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
index 252d4243e8..5bd9ea6a50 100644
--- a/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
+++ b/src/regionModels/surfaceFilmModels/derivedFvPatchFields/inclinedFilmNusseltInletVelocity/inclinedFilmNusseltInletVelocityFvPatchVectorField.C
@@ -78,9 +78,9 @@ inclinedFilmNusseltInletVelocityFvPatchVectorField
     (
         dict.getOrDefault<word>("filmRegion", "surfaceFilmProperties")
     ),
-    GammaMean_(Function1<scalar>::New("GammaMean", dict)),
-    a_(Function1<scalar>::New("a", dict)),
-    omega_(Function1<scalar>::New("omega", dict))
+    GammaMean_(Function1<scalar>::New("GammaMean", dict, &db())),
+    a_(Function1<scalar>::New("a", dict, &db())),
+    omega_(Function1<scalar>::New("omega", dict, &db()))
 {}
 
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C
index cd8ec315e3..f6ff1170d6 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C
@@ -58,7 +58,7 @@ perturbedTemperatureDependentContactAngleForce
 )
 :
     contactAngleForce(typeName, film, dict),
-    thetaPtr_(Function1<scalar>::New("theta", coeffDict_)),
+    thetaPtr_(Function1<scalar>::New("theta", coeffDict_, &film.regionMesh())),
     rndGen_(label(0)),
     distribution_
     (
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C
index b4c6f1ae5b..d78200a0a6 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/temperatureDependent/temperatureDependentContactAngleForce.C
@@ -57,7 +57,7 @@ temperatureDependentContactAngleForce::temperatureDependentContactAngleForce
 )
 :
     contactAngleForce(typeName, film, dict),
-    thetaPtr_(Function1<scalar>::New("theta", coeffDict_))
+    thetaPtr_(Function1<scalar>::New("theta", coeffDict_, &film.regionMesh()))
 {}
 
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/function1Viscosity/function1Viscosity.C b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/function1Viscosity/function1Viscosity.C
index 0de9ad6860..9dcb679ca8 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/function1Viscosity/function1Viscosity.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/filmViscosityModel/function1Viscosity/function1Viscosity.C
@@ -62,7 +62,7 @@ function1Viscosity::function1Viscosity
     viscosity_(filmViscosityModel::New(film, coeffDict_, mu)),
     function_
     (
-        Function1<scalar>::New("function", coeffDict_)
+        Function1<scalar>::New("function", coeffDict_, &film.regionMesh())
     )
 {}
 
diff --git a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
index 642c56d170..376d29b3ff 100644
--- a/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
+++ b/src/regionModels/surfaceFilmModels/submodels/thermo/phaseChangeModel/waxSolventEvaporation/waxSolventEvaporation.C
@@ -133,7 +133,7 @@ waxSolventEvaporation::waxSolventEvaporation
     YInfZero_(coeffDict_.getOrDefault("YInfZero", false)),
     activityCoeff_
     (
-        Function1<scalar>::New("activityCoeff", coeffDict_)
+        Function1<scalar>::New("activityCoeff", coeffDict_, &film.regionMesh())
     )
 {}
 
diff --git a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
index 5c8abccc54..71767b5a99 100644
--- a/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
+++ b/src/rigidBodyMeshMotion/rigidBodyMeshMotion/rigidBodyMeshMotion.C
@@ -119,7 +119,10 @@ Foam::rigidBodyMeshMotion::rigidBodyMeshMotion
     test_(coeffDict().getOrDefault("test", false)),
     rhoInf_(1.0),
     rhoName_(coeffDict().getOrDefault<word>("rho", "rho")),
-    ramp_(Function1<scalar>::NewIfPresent("ramp", coeffDict())),
+    ramp_
+    (
+        Function1<scalar>::NewIfPresent("ramp", coeffDict(), word::null, &mesh)
+    ),
     curTimeIndex_(-1),
     cOfGdisplacement_
     (
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
index 4514b1c414..78b13ef350 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
@@ -126,7 +126,7 @@ void Foam::radiation::fvDOM::initialise()
             (
                 "spectralDistribution",
                 coeffs_,
-                &mesh_.time()
+                &mesh_
             )
         );
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
index 8b4baba1a4..347b0df313 100644
--- a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
+++ b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
@@ -373,7 +373,7 @@ void Foam::radiation::solarLoad::initialise(const dictionary& coeffs)
         (
             "spectralDistribution",
             coeffs,
-            &mesh_.time()
+            &mesh_
         )
     );
 
diff --git a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
index dab33e9926..ca2f49accb 100644
--- a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
+++ b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
@@ -207,7 +207,7 @@ void Foam::solarCalculator::initialise()
                 (
                     "directSolarRad",
                     dict_,
-                    &mesh_.time()
+                    &mesh_
                 )
             );
 
@@ -217,7 +217,7 @@ void Foam::solarCalculator::initialise()
                 (
                     "diffuseSolarRad",
                     dict_,
-                    &mesh_.time()
+                    &mesh_
                 )
             );
 
diff --git a/src/transportModels/incompressible/viscosityModels/strainRateFunction/strainRateFunction.C b/src/transportModels/incompressible/viscosityModels/strainRateFunction/strainRateFunction.C
index 4c97933b5c..b65bca347a 100644
--- a/src/transportModels/incompressible/viscosityModels/strainRateFunction/strainRateFunction.C
+++ b/src/transportModels/incompressible/viscosityModels/strainRateFunction/strainRateFunction.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2016-2017 OpenFOAM Foundation
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,7 +65,12 @@ Foam::viscosityModels::strainRateFunction::strainRateFunction
     ),
     strainRateFunction_
     (
-        Function1<scalar>::New("function", strainRateFunctionCoeffs_)
+        Function1<scalar>::New
+        (
+            "function",
+            strainRateFunctionCoeffs_,
+            &U_.db()
+        )
     ),
     nu_
     (
@@ -134,7 +139,8 @@ bool Foam::viscosityModels::strainRateFunction::read
     strainRateFunction_ = Function1<scalar>::New
     (
         "function",
-        strainRateFunctionCoeffs_
+        strainRateFunctionCoeffs_,
+        &U_.db()
     );
 
     return true;
diff --git a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
index 38774b96a7..dc942889e1 100644
--- a/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
+++ b/src/transportModels/interfaceProperties/surfaceTensionModels/temperatureDependent/temperatureDependentSurfaceTension.C
@@ -57,7 +57,7 @@ Foam::surfaceTensionModels::temperatureDependent::temperatureDependent
 :
     surfaceTensionModel(mesh),
     TName_(dict.getOrDefault<word>("T", "T")),
-    sigma_(Function1<scalar>::New("sigma", dict))
+    sigma_(Function1<scalar>::New("sigma", dict, &mesh))
 {}
 
 
@@ -112,7 +112,7 @@ bool Foam::surfaceTensionModels::temperatureDependent::readDict
     const dictionary& sigmaDict = surfaceTensionModel::sigmaDict(dict);
 
     TName_ = sigmaDict.getOrDefault<word>("T", "T");
-    sigma_ = Function1<scalar>::New("sigma", sigmaDict);
+    sigma_ = Function1<scalar>::New("sigma", sigmaDict, &mesh_);
 
     return true;
 }
diff --git a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
index 820fdfd906..91e9007bd7 100644
--- a/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/twoPhaseProperties/alphaContactAngle/temperatureDependentAlphaContactAngle/temperatureDependentAlphaContactAngleFvPatchScalarField.C
@@ -56,7 +56,7 @@ temperatureDependentAlphaContactAngleFvPatchScalarField
 :
     alphaContactAngleTwoPhaseFvPatchScalarField(p, iF, dict),
     TName_(dict.getOrDefault<word>("T", "T")),
-    theta0_(Function1<scalar>::New("theta0", dict))
+    theta0_(Function1<scalar>::New("theta0", dict, &db()))
 {
     evaluate();
 }

From f6ee1811e760a1f5e712f25400f11be2834b07c0 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Mon, 22 Nov 2021 16:50:21 +0000
Subject: [PATCH 14/18] STYLE: renamed convertTimeBase to more descriptive
 userTimeToTime

---
 .../primitives/functions/Function1/Function1/function1Base.C  | 2 +-
 .../primitives/functions/Function1/Function1/function1Base.H  | 2 +-
 .../functions/Function1/Polynomial/PolynomialEntry.C          | 2 +-
 .../functions/Function1/Polynomial/PolynomialEntry.H          | 2 +-
 src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C       | 2 +-
 src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H       | 2 +-
 src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C | 2 +-
 src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H | 2 +-
 src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C       | 2 +-
 src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H       | 2 +-
 .../primitives/functions/TimeFunction1/TimeFunction1.C        | 4 ++--
 .../PatchFunction1/PatchFunction1/patchFunction1Base.C        | 2 +-
 .../PatchFunction1/PatchFunction1/patchFunction1Base.H        | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.C b/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.C
index 72494af305..60eef5b7d0 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.C
@@ -132,7 +132,7 @@ void Foam::function1Base::resetDb(const objectRegistry& db) noexcept
 }
 
 
-void Foam::function1Base::convertTimeBase(const Time& t)
+void Foam::function1Base::userTimeToTime(const Time& t)
 {}
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.H b/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.H
index 85188de82c..42b0efdcb7 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Function1/function1Base.H
@@ -167,7 +167,7 @@ public:
     // Manipulation
 
         //- Convert time
-        virtual void convertTimeBase(const Time& t);
+        virtual void userTimeToTime(const Time& t);
 };
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C b/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C
index d72f9a7cf7..1a477262c3 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.C
@@ -129,7 +129,7 @@ Foam::Function1Types::Polynomial<Type>::Polynomial(const Polynomial& poly)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function1Types::Polynomial<Type>::convertTimeBase(const Time& t)
+void Foam::Function1Types::Polynomial<Type>::userTimeToTime(const Time& t)
 {
     forAll(coeffs_, i)
     {
diff --git a/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.H b/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.H
index 67d35b504e..bf165ed22d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Polynomial/PolynomialEntry.H
@@ -141,7 +141,7 @@ public:
     // Member Functions
 
         //- Convert time
-        virtual void convertTimeBase(const Time& t);
+        virtual void userTimeToTime(const Time& t);
 
         //- Return Polynomial value
         virtual Type value(const scalar x) const;
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
index ea3fc38380..8dcd13f5e5 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
@@ -75,7 +75,7 @@ Foam::Function1Types::Sine<Type>::Sine(const Sine<Type>& rhs)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-void Foam::Function1Types::Sine<Type>::convertTimeBase(const Time& t)
+void Foam::Function1Types::Sine<Type>::userTimeToTime(const Time& t)
 {
     t0_ = t.timeToUserTime(t0_);
 }
diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
index be8fdecb8e..ac06f7c18a 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.H
@@ -200,7 +200,7 @@ public:
     // Member Functions
 
         //- Convert time
-        virtual void convertTimeBase(const Time& t);
+        virtual void userTimeToTime(const Time& t);
 
         //- Return value for time t
         virtual inline Type value(const scalar t) const
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
index 2bbfba78c2..36ec5a6f8b 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.C
@@ -254,7 +254,7 @@ bool Foam::Function1Types::TableBase<Type>::checkMaxBounds
 
 
 template<class Type>
-void Foam::Function1Types::TableBase<Type>::convertTimeBase(const Time& t)
+void Foam::Function1Types::TableBase<Type>::userTimeToTime(const Time& t)
 {
     for (auto& item : table_)
     {
diff --git a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
index 1b805a8c85..51836dd5db 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Table/TableBase.H
@@ -128,7 +128,7 @@ public:
         bool checkMaxBounds(const scalar x, scalar& xDash) const;
 
         //- Convert time
-        virtual void convertTimeBase(const Time& t);
+        virtual void userTimeToTime(const Time& t);
 
         //- Return Table value
         virtual Type value(const scalar x) const;
diff --git a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
index b66acd4f32..23f14ce817 100644
--- a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
@@ -59,7 +59,7 @@ void Foam::Function1Types::ramp::writeEntries(Ostream& os) const
 }
 
 
-void Foam::Function1Types::ramp::convertTimeBase(const Time& t)
+void Foam::Function1Types::ramp::userTimeToTime(const Time& t)
 {
     start_ = t.timeToUserTime(start_);
     duration_ = t.timeToUserTime(duration_);
diff --git a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
index 98ce696952..09b8154bf5 100644
--- a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
+++ b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.H
@@ -135,7 +135,7 @@ public:
     // Member Functions
 
         //- Convert time
-        virtual void convertTimeBase(const Time& t);
+        virtual void userTimeToTime(const Time& t);
 
         //- Return value for time t
         virtual scalar value(const scalar t) const = 0;
diff --git a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
index 60b95f2d8f..0cdf552cd2 100644
--- a/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
+++ b/src/OpenFOAM/primitives/functions/TimeFunction1/TimeFunction1.C
@@ -43,7 +43,7 @@ Foam::TimeFunction1<Type>::TimeFunction1
     entry_(Function1<Type>::New(entryName, dict, &runTime))
 {
     // Time conversion now handled by Function1 directly
-    // entry_->convertTimeBase(runTime);
+    // entry_->userTimeToTime(runTime);
 }
 
 
@@ -83,7 +83,7 @@ template<class Type>
 void Foam::TimeFunction1<Type>::reset(const dictionary& dict)
 {
     entry_ = Function1<Type>::New(name_, dict, &time_);
-    entry_->convertTimeBase(time_);
+    entry_->userTimeToTime(time_);
 }
 
 
diff --git a/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.C b/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.C
index 7a80721fd8..d62c7d105b 100644
--- a/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.C
+++ b/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.C
@@ -102,7 +102,7 @@ const Foam::Time& Foam::patchFunction1Base::time() const
 }
 
 
-void Foam::patchFunction1Base::convertTimeBase(const Time& t)
+void Foam::patchFunction1Base::userTimeToTime(const Time& t)
 {}
 
 
diff --git a/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.H b/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.H
index d4065c0f21..826618336b 100644
--- a/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.H
+++ b/src/meshTools/PatchFunction1/PatchFunction1/patchFunction1Base.H
@@ -171,7 +171,7 @@ public:
     // Manipulation
 
         //- Convert time
-        virtual void convertTimeBase(const Time& t);
+        virtual void userTimeToTime(const Time& t);
 };
 
 

From ba45fb2cbaa4f9a1ab95a60f7d9b0586d2bc7935 Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Mon, 22 Nov 2021 17:23:38 +0000
Subject: [PATCH 15/18] ENH: Function1 - updated time-based Function1 usage

---
 .../primitives/functions/Function1/Sine/Sine.C         |  2 +-
 .../primitives/functions/Function1/ramp/ramp.C         |  4 ++--
 .../InjectionModel/ConeInjection/ConeInjection.C       |  8 +++++++-
 .../InjectionModel/ConeInjection/ConeInjection.H       | 10 +++++-----
 .../ConeNozzleInjection/ConeNozzleInjection.C          | 10 +++++++++-
 .../ConeNozzleInjection/ConeNozzleInjection.H          |  8 ++++----
 .../InflationInjection/InflationInjection.C            |  6 +++++-
 .../InjectionModel/InjectionModel/InjectionModel.C     |  1 +
 .../PatchFlowRateInjection/PatchFlowRateInjection.C    |  5 ++++-
 .../PatchFlowRateInjection/PatchFlowRateInjection.H    |  2 +-
 .../InjectionModel/PatchInjection/PatchInjection.C     |  5 ++++-
 .../InjectionModel/PatchInjection/PatchInjection.H     |  2 +-
 .../restraints/linearSpringDamper/linearSpringDamper.C |  2 +-
 .../radiation/radiationModels/fvDOM/fvDOM/fvDOM.C      |  2 +-
 .../radiation/radiationModels/solarLoad/solarLoad.C    |  2 +-
 .../submodels/solarCalculator/solarCalculator.C        |  6 ++++--
 16 files changed, 51 insertions(+), 24 deletions(-)

diff --git a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
index 8dcd13f5e5..87a1cf9c26 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
+++ b/src/OpenFOAM/primitives/functions/Function1/Sine/Sine.C
@@ -77,7 +77,7 @@ Foam::Function1Types::Sine<Type>::Sine(const Sine<Type>& rhs)
 template<class Type>
 void Foam::Function1Types::Sine<Type>::userTimeToTime(const Time& t)
 {
-    t0_ = t.timeToUserTime(t0_);
+    t0_ = t.userTimeToTime(t0_);
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
index 23f14ce817..660e4deaf9 100644
--- a/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
+++ b/src/OpenFOAM/primitives/functions/Function1/ramp/ramp.C
@@ -61,8 +61,8 @@ void Foam::Function1Types::ramp::writeEntries(Ostream& os) const
 
 void Foam::Function1Types::ramp::userTimeToTime(const Time& t)
 {
-    start_ = t.timeToUserTime(start_);
-    duration_ = t.timeToUserTime(duration_);
+    start_ = t.userTimeToTime(start_);
+    duration_ = t.userTimeToTime(duration_);
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index a06fe5803d..59cc22beba 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -106,7 +106,13 @@ Foam::ConeInjection<CloudType>::ConeInjection
     tanVec1_.setSize(positionAxis_.size());
     tanVec2_.setSize(positionAxis_.size());
 
-    duration_ = owner.db().time().userTimeToTime(duration_);
+    // Convert from user time to reduce the number of time conversion calls
+    const Time& time = owner.db().time();
+    duration_ = time.userTimeToTime(duration_);
+    flowRateProfile_->userTimeToTime(time);
+    Umag_->userTimeToTime(time);
+    thetaInner_->userTimeToTime(time);
+    thetaOuter_->userTimeToTime(time);
 
     // Normalise direction vector and determine direction vectors
     // tangential to injector axis direction
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index 69e3663e7b..15a4486aad 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -91,19 +91,19 @@ class ConeInjection
         const label parcelsPerInjector_;
 
         //- Flow rate profile relative to SOI []
-        const autoPtr<Function1<scalar>> flowRateProfile_;
+        autoPtr<Function1<scalar>> flowRateProfile_;
 
         //- Parcel velocity magnitude relative to SOI [m/s]
-        const autoPtr<Function1<scalar>> Umag_;
+        autoPtr<Function1<scalar>> Umag_;
 
         //- Inner half-cone angle relative to SOI [deg]
-        const autoPtr<Function1<scalar>> thetaInner_;
+        autoPtr<Function1<scalar>> thetaInner_;
 
         //- Outer half-cone angle relative to SOI [deg]
-        const autoPtr<Function1<scalar>> thetaOuter_;
+        autoPtr<Function1<scalar>> thetaOuter_;
 
         //- Parcel size distribution model
-        const autoPtr<distributionModel> sizeDistribution_;
+        autoPtr<distributionModel> sizeDistribution_;
 
         //- Number of parcels per injector already injected
         mutable label nInjected_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
index 5ffc3b4bea..53c93ebee0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
@@ -83,6 +83,7 @@ void Foam::ConeNozzleInjection<CloudType>::setInjectionMethod()
                     &this->owner().mesh()
                 )
             );
+            positionVsTime_->userTimeToTime(this->owner().time());
             break;
         }
         default:
@@ -117,6 +118,7 @@ void Foam::ConeNozzleInjection<CloudType>::setFlowType()
                     &this->owner().mesh()
                 )
             );
+            Pinj_->userTimeToTime(this->owner().time());
             break;
         }
         case flowType::ftFlowRateAndDischarge:
@@ -130,6 +132,7 @@ void Foam::ConeNozzleInjection<CloudType>::setFlowType()
                     &this->owner().mesh()
                 )
             );
+            Cd_->userTimeToTime(this->owner().time());
             break;
         }
         default:
@@ -221,7 +224,12 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
             << exit(FatalError);
     }
 
-    duration_ = owner.db().time().userTimeToTime(duration_);
+    // Convert from user time to reduce the number of time conversion calls
+    const Time& time = owner.db().time();
+    duration_ = time.userTimeToTime(duration_);
+    flowRateProfile_->userTimeToTime(time);
+    thetaInner_->userTimeToTime(time);
+    thetaOuter_->userTimeToTime(time);
 
     setInjectionMethod();
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
index 90ea53a103..0329d1e03a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.H
@@ -155,16 +155,16 @@ private:
         const label parcelsPerSecond_;
 
         //- Flow rate profile relative to SOI []
-        const autoPtr<Function1<scalar>> flowRateProfile_;
+        autoPtr<Function1<scalar>> flowRateProfile_;
 
         //- Inner half-cone angle relative to SOI [deg]
-        const autoPtr<Function1<scalar>> thetaInner_;
+        autoPtr<Function1<scalar>> thetaInner_;
 
         //- Outer half-cone angle relative to SOI [deg]
-        const autoPtr<Function1<scalar>> thetaOuter_;
+        autoPtr<Function1<scalar>> thetaOuter_;
 
         //- Parcel size PDF model
-        const autoPtr<distributionModel> sizeDistribution_;
+        autoPtr<distributionModel> sizeDistribution_;
 
 
         // Tangential vectors to the direction vector
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
index 74741ef8b3..227aefcf5f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
@@ -82,7 +82,11 @@ Foam::InflationInjection<CloudType>::InflationInjection
         )
     )
 {
-    duration_ = owner.db().time().userTimeToTime(duration_);
+    // Convert from user time to reduce the number of time conversion calls
+    const Time& time = owner.db().time();
+    duration_ = time.userTimeToTime(duration_);
+    flowRateProfile_->userTimeToTime(time);
+    growthRate_->userTimeToTime(time);
 
     if (selfSeed_)
     {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 6731f675f4..37f9750551 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -348,6 +348,7 @@ Foam::InjectionModel<CloudType>::InjectionModel
                     &owner.mesh()
                 )
             );
+            massFlowRate_->userTimeToTime(owner.db().time());
             massTotal_ = massFlowRate_->value(owner.db().time().value());
             this->coeffDict().readIfPresent("SOI", SOI_);
         }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index e5a9663ecc..ae5c3c88f8 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
@@ -68,7 +68,10 @@ Foam::PatchFlowRateInjection<CloudType>::PatchFlowRateInjection
         )
     )
 {
-    duration_ = owner.db().time().userTimeToTime(duration_);
+    // Convert from user time to reduce the number of time conversion calls
+    const Time& time = owner.db().time();
+    duration_ = time.userTimeToTime(duration_);
+    concentration_->userTimeToTime(time);
 
     patchInjectionBase::updateMesh(owner.mesh());
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
index b33be4fe93..f29c02e5ce 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.H
@@ -84,7 +84,7 @@ class PatchFlowRateInjection
         scalar duration_;
 
         //- Concentration profile of particle volume to carrier volume [-]
-        const autoPtr<Function1<scalar>> concentration_;
+        autoPtr<Function1<scalar>> concentration_;
 
         //- Parcels to introduce per unit volume flow rate m3 [n/m3]
         const scalar parcelConcentration_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index 1552c8f3bd..934f1343cf 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -65,7 +65,10 @@ Foam::PatchInjection<CloudType>::PatchInjection
         )
     )
 {
-    duration_ = owner.db().time().userTimeToTime(duration_);
+    // Convert from user time to reduce the number of time conversion calls
+    const Time& time = owner.db().time();
+    duration_ = time.userTimeToTime(duration_);
+    flowRateProfile_->userTimeToTime(time);
 
     patchInjectionBase::updateMesh(owner.mesh());
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
index e33a68d8af..25c1a007cf 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
@@ -84,7 +84,7 @@ class PatchInjection
         const vector U0_;
 
         //- Flow rate profile relative to SOI []
-        const autoPtr<Function1<scalar>> flowRateProfile_;
+        autoPtr<Function1<scalar>> flowRateProfile_;
 
         //- Parcel size distribution model
         const autoPtr<distributionModel> sizeDistribution_;
diff --git a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpringDamper/linearSpringDamper.C b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpringDamper/linearSpringDamper.C
index 0a6d987614..a600881a86 100644
--- a/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpringDamper/linearSpringDamper.C
+++ b/src/sixDoFRigidBodyMotion/sixDoFRigidBodyMotion/restraints/linearSpringDamper/linearSpringDamper.C
@@ -92,7 +92,7 @@ void Foam::sixDoFRigidBodyMotionRestraints::linearSpringDamper::restrain
         );
     }
 
-    scalar t = motion.time().value();
+    scalar t = motion.time().timeOutputValue();
 
     restraintPosition = motion.transform(refAttachmentPt_);
 
diff --git a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
index 78b13ef350..1f452986b6 100644
--- a/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
+++ b/src/thermophysicalModels/radiation/radiationModels/fvDOM/fvDOM/fvDOM.C
@@ -131,7 +131,7 @@ void Foam::radiation::fvDOM::initialise()
         );
 
         spectralDistribution_ =
-            spectralDistributions_->value(mesh_.time().value());
+            spectralDistributions_->value(mesh_.time().timeOutputValue());
 
         spectralDistribution_ =
             spectralDistribution_/sum(spectralDistribution_);
diff --git a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
index 347b0df313..9aab8a5795 100644
--- a/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
+++ b/src/thermophysicalModels/radiation/radiationModels/solarLoad/solarLoad.C
@@ -378,7 +378,7 @@ void Foam::radiation::solarLoad::initialise(const dictionary& coeffs)
     );
 
     spectralDistribution_ =
-        spectralDistributions_->value(mesh_.time().value());
+        spectralDistributions_->value(mesh_.time().timeOutputValue());
 
     nBands_ = spectralDistribution_.size();
 
diff --git a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
index ca2f49accb..e14c88bb81 100644
--- a/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
+++ b/src/thermophysicalModels/radiation/submodels/solarCalculator/solarCalculator.C
@@ -221,8 +221,10 @@ void Foam::solarCalculator::initialise()
                 )
             );
 
-            directSolarRad_ = directSolarRads_->value(mesh_.time().value());
-            diffuseSolarRad_ = diffuseSolarRads_->value(mesh_.time().value());
+            directSolarRad_ =
+                directSolarRads_->value(mesh_.time().timeOutputValue());
+            diffuseSolarRad_ =
+                diffuseSolarRads_->value(mesh_.time().timeOutputValue());
             break;
         }
         case mSunLoadFairWeatherConditions:

From 89ddc271c7712099489006964950fde0b3ad1f1f Mon Sep 17 00:00:00 2001
From: Andrew Heather <>
Date: Tue, 23 Nov 2021 12:50:00 +0000
Subject: [PATCH 16/18] ENH: LimitRange Function1 - extended and renamed

Description
    Function1 wrapper that maps the input value prior to it being used by
    another Function1.

    Example usage for limiting a polynomial:
    \verbatim
        <entryName>
        {
            type            inputValueMapper;
            mode            minMax;

            min             0.4;
            max             1.4;

            value polynomial
            (
                (5 1)
                (-2 2)
                (-2 3)
                (1 4)
            );
        }
    \endverbatim

    Here the return value will be:
    - poly(0.4) for x <= 0.4;
    - poly(1.4) for x >= 1.4; and
    - poly(x) for 0.4 < x < 1.4.

    Example usage for supplying a patch mass flux for a table lookup:
    \verbatim
        <entryName>
        {
            type            inputValueMapper;
            mode            function;

            function
            {
                type            functionObjectValue;
                functionObject  surfaceFieldValue1;
                functionObjectResult sum(outlet,phi);
            }

            value
            {
                type        table;
                file        "<system>/fanCurve.txt";
            }
        }
    \endverbatim

    Where:
    \table
        Property | Description                                  | Required
        mode     | Mapping mode (see below)                     | yes
        function | Mapping Function1                            | no*
        min      | Minimum input value                          | no*
        max      | Maximum input value                          | no*
        value    | Function of type Function1<Type>             | yes
    \endtable

    Mapping modes include
    - none     : the input value is simply passed to the 'value' Function1
    - function : the input value is passed through the 'function' Function1
                 before being passed to the 'value' Function1
    - minMax   : limits the input value to 'min' and 'max' values before being
                 passed to the 'value' Function1

Note
    Replaces the LimitRange Function1 (v2106 and earlier)
---
 .../FunctionObjectValueI.H                    |  14 +-
 .../InputValueMapper/InputValueMapper.C       | 178 ++++++++++++++++++
 .../InputValueMapper.H}                       | 117 +++++++++---
 .../InputValueMapper/InputValueMapperI.H      | 119 ++++++++++++
 .../Function1/LimitRange/LimitRange.C         |  88 ---------
 .../Function1/LimitRange/LimitRangeI.H        |  67 -------
 .../functions/Function1/makeFunction1s.C      |   4 +-
 7 files changed, 395 insertions(+), 192 deletions(-)
 create mode 100644 src/OpenFOAM/primitives/functions/Function1/InputValueMapper/InputValueMapper.C
 rename src/OpenFOAM/primitives/functions/Function1/{LimitRange/LimitRange.H => InputValueMapper/InputValueMapper.H} (59%)
 create mode 100644 src/OpenFOAM/primitives/functions/Function1/InputValueMapper/InputValueMapperI.H
 delete mode 100644 src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.C
 delete mode 100644 src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRangeI.H

diff --git a/src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValueI.H b/src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValueI.H
index c7fb61d546..210002144d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValueI.H
+++ b/src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValueI.H
@@ -41,7 +41,8 @@ inline Type Foam::Function1Types::FunctionObjectValue<Type>::value
     {
         if (haveDefaultValue_)
         {
-            Info<< "    Function object " << foName_
+            DebugInfo
+                << "    Function object " << foName_
                 << " not found; using default value " << defaultValue_
                 << endl;
 
@@ -59,7 +60,8 @@ inline Type Foam::Function1Types::FunctionObjectValue<Type>::value
     {
         if (haveDefaultValue_)
         {
-            Info<< "    Function object " << foName_
+            DebugInfo
+                << "    Function object " << foName_
                 << " result " << foResultName_
                 << " not found; using default value " << defaultValue_
                 << endl;
@@ -75,9 +77,13 @@ inline Type Foam::Function1Types::FunctionObjectValue<Type>::value
             << exit(FatalError);
     }
 
-    Info<< "    Using " << foName_ << " function object value" << endl;
+    Type value = props.template getObjectResult<Type>(foName_, foResultName_);
 
-    return props.template getObjectResult<Type>(foName_, foResultName_);
+    DebugInfo
+        << "    Using " << foName_ << " function object value: " << value
+        << endl;
+
+    return value;
 }
 
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/InputValueMapper/InputValueMapper.C b/src/OpenFOAM/primitives/functions/Function1/InputValueMapper/InputValueMapper.C
new file mode 100644
index 0000000000..b3754bbe88
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/InputValueMapper/InputValueMapper.C
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2020-2021 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "InputValueMapper.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class Type>
+const Foam::Enum
+<
+    typename Foam::Function1Types::InputValueMapper<Type>::mappingMode
+>
+Foam::Function1Types::InputValueMapper<Type>::mappingModeNames_
+({
+    { mappingMode::NONE, "none" },
+    { mappingMode::FUNCTION1, "function" },
+    { mappingMode::MINMAX, "minMax" },
+});
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::Function1Types::InputValueMapper<Type>::read
+(
+    const dictionary& coeffs
+)
+{
+    mappingMode_ = mappingModeNames_.get("mode", coeffs);
+
+    switch (mappingMode_)
+    {
+        case mappingMode::NONE:
+        {
+            break;
+        }
+        case mappingMode::FUNCTION1:
+        {
+            mappingValuePtr_.reset
+            (
+                Function1<scalar>::New("function", coeffs, this->obrPtr_)
+            );
+
+            break;
+        }
+        case mappingMode::MINMAX:
+        {
+            min_ = coeffs.get<scalar>("min");
+            max_ = coeffs.get<scalar>("max");
+
+            break;
+        }
+        default:
+        {
+            FatalErrorInFunction
+                << "Unhandled enumeration " << mappingModeNames_[mappingMode_]
+                << ".  Available options are: " << mappingModeNames_.sortedToc()
+                << abort(FatalError);
+        }
+    }
+
+    value_ = Function1<Type>::New("value", coeffs, this->obrPtr_);
+}
+
+
+template<class Type>
+Foam::Function1Types::InputValueMapper<Type>::InputValueMapper
+(
+    const word& entryName,
+    const dictionary& dict,
+    const objectRegistry* obrPtr
+)
+:
+    Function1<Type>(entryName, obrPtr),
+    mappingMode_(mappingMode::NONE),
+    mappingValuePtr_(nullptr),
+    min_(0),
+    max_(0),
+    value_(nullptr)
+{
+    read(dict);
+}
+
+
+template<class Type>
+Foam::Function1Types::InputValueMapper<Type>::InputValueMapper
+(
+    const InputValueMapper<Type>& rhs
+)
+:
+    Function1<Type>(rhs),
+    mappingMode_(rhs.mappingMode_),
+    mappingValuePtr_(rhs.mappingValuePtr_.clone()),
+    min_(rhs.min_),
+    max_(rhs.max_),
+    value_(rhs.value_.clone())
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::Function1Types::InputValueMapper<Type>::writeEntries
+(
+    Ostream& os
+) const
+{
+    os.writeEntry("mode", mappingModeNames_[mappingMode_]);
+
+    switch (mappingMode_)
+    {
+        case mappingMode::NONE:
+        {
+            break;
+        }
+        case mappingMode::FUNCTION1:
+        {
+            mappingValuePtr_->writeData(os);
+
+            break;
+        }
+        case mappingMode::MINMAX:
+        {
+            os.writeEntry("min", min_);
+            os.writeEntry("max", max_);
+
+            break;
+        }
+        default:
+        {
+            FatalErrorInFunction
+                << "Unhandled enumeration " << mappingModeNames_[mappingMode_]
+                << ".  Available options are: " << mappingModeNames_.sortedToc()
+                << abort(FatalError);
+        }
+    }
+
+    value_->writeData(os);
+}
+
+
+template<class Type>
+void Foam::Function1Types::InputValueMapper<Type>::writeData(Ostream& os) const
+{
+    Function1<Type>::writeData(os);
+    os.endEntry();
+
+    os.beginBlock(word(this->name() + "Coeffs"));
+    writeEntries(os);
+    os.endBlock();
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.H b/src/OpenFOAM/primitives/functions/Function1/InputValueMapper/InputValueMapper.H
similarity index 59%
rename from src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.H
rename to src/OpenFOAM/primitives/functions/Function1/InputValueMapper/InputValueMapper.H
index 3222af610a..db3a179c5c 100644
--- a/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.H
+++ b/src/OpenFOAM/primitives/functions/Function1/InputValueMapper/InputValueMapper.H
@@ -24,18 +24,21 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::Function1Types::LimitRange
+    Foam::Function1Types::InputValueMapper
 
 Description
-    Function1 wrapper that limits the input range of another Function1
+    Function1 wrapper that maps the input value prior to it being used by
+    another Function1.
 
     Example usage for limiting a polynomial:
     \verbatim
         <entryName>
         {
-            type limitRange;
-            min  0.4;
-            max  1.4;
+            type            inputValueMapper;
+            mode            minMax;
+
+            min             0.4;
+            max             1.4;
 
             value polynomial
             (
@@ -53,18 +56,24 @@ Description
     - poly(x) for 0.4 < x < 1.4.
 
 
-    Example usage for limiting a file-based table:
+    Example usage for supplying a patch mass flux for a table lookup:
     \verbatim
         <entryName>
         {
-            type limitRange;
-            min  0.4;
-            max  1.4;
+            type            inputValueMapper;
+            mode            function;
+
+            function
+            {
+                type            functionObjectValue;
+                functionObject  surfaceFieldValue1;
+                functionObjectResult sum(outlet,phi);
+            }
 
             value
             {
-                type table;
-                file "<system>/fanCurve.txt";
+                type        table;
+                file        "<system>/fanCurve.txt";
             }
         }
     \endverbatim
@@ -72,20 +81,34 @@ Description
     Where:
     \table
         Property | Description                                  | Required
-        min      | Minimum input value                          | yes
-        max      | Maximum input value                          | yes
+        mode     | Mapping mode (see below)                     | yes
+        function | Mapping Function1                            | no*
+        min      | Minimum input value                          | no*
+        max      | Maximum input value                          | no*
         value    | Function of type Function1<Type>             | yes
     \endtable
 
+    Mapping modes include
+    - none     : the input value is simply passed to the 'value' Function1
+    - function : the input value is passed through the 'function' Function1
+                 before being passed to the 'value' Function1
+    - minMax   : limits the input value to 'min' and 'max' values before being
+                 passed to the 'value' Function1
+
+Note
+    Replaces the LimitRange Function1 (v2106 and earlier)
+
 SourceFiles
-    LimitRange.C
+    InputValueMapper.C
+    InputValueMapperI.H
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Function1Types_LimitRange_H
-#define Function1Types_LimitRange_H
+#ifndef Function1Types_InputValueMapper_H
+#define Function1Types_InputValueMapper_H
 
 #include "Function1.H"
+#include "Enum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -95,24 +118,56 @@ namespace Function1Types
 {
 
 /*---------------------------------------------------------------------------*\
-                          Class LimitRange Declaration
+                      Class InputValueMapper Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
-class LimitRange
+class InputValueMapper
 :
     public Function1<Type>
 {
+public:
+
+    // Public Enumerations
+
+        //- Input value mapping mode
+        enum class mappingMode
+        {
+            NONE,
+            FUNCTION1,
+            MINMAX
+        };
+
+        //- Names for the input value  mapping modes
+        static const Enum<mappingMode> mappingModeNames_;
+
+
+private:
+
     // Private Data
 
-        //- Minimum input value
-        scalar min_;
+        //- Mapping mode
+        mappingMode mappingMode_;
 
-        //- Maximum input value
-        scalar max_;
+        // Function1 mapping
 
-        //- Value function
-        autoPtr<Function1<Type>> value_;
+            //- Input value Function1
+            autoPtr<Function1<scalar>> mappingValuePtr_;
+
+
+        // Min/max mapping
+
+            //- Minimum input value
+            scalar min_;
+
+            //- Maximum input value
+            scalar max_;
+
+
+        // Function being wrapped
+
+            //- Value function
+            autoPtr<Function1<Type>> value_;
 
 
     // Private Member Functions
@@ -124,19 +179,19 @@ class LimitRange
 public:
 
     //- Runtime type information
-    TypeName("limitRange");
+    TypeName("inputValueMapper");
 
 
     // Generated Methods
 
         //- No copy assignment
-        void operator=(const LimitRange<Type>&) = delete;
+        void operator=(const InputValueMapper<Type>&) = delete;
 
 
     // Constructors
 
         //- Construct from entry name, dictionary and optional registry
-        LimitRange
+        InputValueMapper
         (
             const word& entryName,
             const dictionary& dict,
@@ -144,11 +199,11 @@ public:
         );
 
         //- Copy construct
-        explicit LimitRange(const LimitRange<Type>& rhs);
+        explicit InputValueMapper(const InputValueMapper<Type>& rhs);
 
 
     //- Destructor
-    virtual ~LimitRange() = default;
+    virtual ~InputValueMapper() = default;
 
 
     // Member Functions
@@ -174,10 +229,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "LimitRangeI.H"
+#include "InputValueMapperI.H"
 
 #ifdef NoRepository
-    #include "LimitRange.C"
+    #include "InputValueMapper.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/functions/Function1/InputValueMapper/InputValueMapperI.H b/src/OpenFOAM/primitives/functions/Function1/InputValueMapper/InputValueMapperI.H
new file mode 100644
index 0000000000..8b769ac647
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/InputValueMapper/InputValueMapperI.H
@@ -0,0 +1,119 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2020-2021 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "InputValueMapper.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+inline Type Foam::Function1Types::InputValueMapper<Type>::value
+(
+    const scalar t
+) const
+{
+    switch (mappingMode_)
+    {
+        case mappingMode::NONE:
+        {
+            return value_->value(t);;
+        }
+        case mappingMode::FUNCTION1:
+        {
+            return value_->value(mappingValuePtr_->value(t));
+        }
+        case mappingMode::MINMAX:
+        {
+            scalar tlim = min(max(t, min_), max_);
+
+            return value_->value(tlim);
+        }
+        default:
+        {
+            FatalErrorInFunction
+                << "Unhandled enumeration " << mappingModeNames_[mappingMode_]
+                << ".  Available options are: " << mappingModeNames_.sortedToc()
+                << abort(FatalError);
+        }
+    }
+
+    return pTraits<Type>::zero;
+}
+
+
+template<class Type>
+Type Foam::Function1Types::InputValueMapper<Type>::integrate
+(
+    const scalar x1,
+    const scalar x2
+) const
+{
+    switch (mappingMode_)
+    {
+        case mappingMode::NONE:
+        {
+            return value_->integrate(x1, x2);
+        }
+        case mappingMode::FUNCTION1:
+        {
+            scalar x1Dash = mappingValuePtr_->value(x1);
+            scalar x2Dash = mappingValuePtr_->value(x2);
+
+            return value_->integrate(x1Dash, x2Dash);
+        }
+        case mappingMode::MINMAX:
+        {
+            scalar xlim0 = min(max(x1, min_), max_);
+            scalar xlim1 = min(max(x2, min_), max_);
+
+            Type intValue = value_->integrate(xlim0, xlim1);
+
+            if (x1 < min_)
+            {
+                intValue += (min(min_, x2) - x1)*this->value(min_);
+            }
+
+            if (x2 > max_)
+            {
+                intValue += (x2 - max(max_, x1))*this->value(max_);
+            }
+
+            return intValue;
+        }
+        default:
+        {
+            FatalErrorInFunction
+                << "Unhandled enumeration " << mappingModeNames_[mappingMode_]
+                << ".  Available options are: " << mappingModeNames_.sortedToc()
+                << abort(FatalError);
+        }
+    }
+
+    return pTraits<Type>::zero;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.C b/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.C
deleted file mode 100644
index 579309eb65..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRange.C
+++ /dev/null
@@ -1,88 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2020-2021 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "LimitRange.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::Function1Types::LimitRange<Type>::read(const dictionary& coeffs)
-{
-    min_ = coeffs.get<scalar>("min");
-    max_ = coeffs.get<scalar>("max");
-    value_ = Function1<Type>::New("value", coeffs, this->obrPtr_);
-}
-
-
-template<class Type>
-Foam::Function1Types::LimitRange<Type>::LimitRange
-(
-    const word& entryName,
-    const dictionary& dict,
-    const objectRegistry* obrPtr
-)
-:
-    Function1<Type>(entryName, obrPtr)
-{
-    read(dict);
-}
-
-
-template<class Type>
-Foam::Function1Types::LimitRange<Type>::LimitRange(const LimitRange<Type>& rhs)
-:
-    Function1<Type>(rhs),
-    min_(rhs.min_),
-    max_(rhs.max_),
-    value_(rhs.value_.clone())
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-void Foam::Function1Types::LimitRange<Type>::writeEntries(Ostream& os) const
-{
-    os.writeEntry("min", min_);
-    os.writeEntry("max", max_);
-    value_->writeData(os);
-}
-
-
-template<class Type>
-void Foam::Function1Types::LimitRange<Type>::writeData(Ostream& os) const
-{
-    Function1<Type>::writeData(os);
-    os.endEntry();
-
-    os.beginBlock(word(this->name() + "Coeffs"));
-    writeEntries(os);
-    os.endBlock();
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRangeI.H b/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRangeI.H
deleted file mode 100644
index 640a02c388..0000000000
--- a/src/OpenFOAM/primitives/functions/Function1/LimitRange/LimitRangeI.H
+++ /dev/null
@@ -1,67 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | www.openfoam.com
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-    Copyright (C) 2020 OpenCFD Ltd.
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "LimitRange.H"
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<class Type>
-inline Type Foam::Function1Types::LimitRange<Type>::value(const scalar t) const
-{
-    scalar tlim = min(max(t, min_), max_);
-
-    return value_->value(tlim);
-}
-
-
-template<class Type>
-Type Foam::Function1Types::LimitRange<Type>::integrate
-(
-    const scalar x1,
-    const scalar x2
-) const
-{
-    scalar xlim0 = min(max(x1, min_), max_);
-    scalar xlim1 = min(max(x2, min_), max_);
-
-    Type intValue = value_->integrate(xlim0, xlim1);
-
-    if (x1 < min_)
-    {
-        intValue += (min(min_, x2) - x1)*this->value(min_);
-    }
-
-    if (x2 > max_)
-    {
-        intValue += (x2 - max(max_, x1))*this->value(max_);
-    }
-
-    return intValue;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C b/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C
index 52d6e3bb52..179209c655 100644
--- a/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C
+++ b/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C
@@ -38,7 +38,7 @@ License
 #include "Table.H"
 #include "TableFile.H"
 #include "Scale.H"
-#include "LimitRange.H"
+#include "InputValueMapper.H"
 #include "FunctionObjectValue.H"
 #include "fieldTypes.H"
 
@@ -58,7 +58,7 @@ License
     makeFunction1Type(Table, Type);                                            \
     makeFunction1Type(TableFile, Type);                                        \
     makeFunction1Type(Scale, Type);                                            \
-    makeFunction1Type(LimitRange, Type);                                       \
+    makeFunction1Type(InputValueMapper, Type);                                 \
     makeFunction1Type(FunctionObjectValue, Type);
 
 #define makeFieldFunction1s(Type)                                              \

From 30a2fa4b2760568ff0e0bd595cb3e55b11bb9536 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 25 Nov 2021 14:03:24 +0100
Subject: [PATCH 17/18] BUG: dsmcFields fails with scoped field names

---
 .../postProcessing/lagrangian/dsmcFields      |  11 +-
 .../lagrangian/dsmcFields/dsmcFields.C        | 166 +++++++++++++-----
 .../lagrangian/dsmcFields/dsmcFields.H        |   7 +-
 3 files changed, 127 insertions(+), 57 deletions(-)

diff --git a/etc/caseDicts/postProcessing/lagrangian/dsmcFields b/etc/caseDicts/postProcessing/lagrangian/dsmcFields
index 2f5b2da231..22a92fe898 100644
--- a/etc/caseDicts/postProcessing/lagrangian/dsmcFields
+++ b/etc/caseDicts/postProcessing/lagrangian/dsmcFields
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     | Version:  v2106
+   \\    /   O peration     | Version:  v2112
     \\  /    A nd           | Website:  www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
@@ -15,11 +15,12 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-type            dsmcFields;
-libs            ("liblagrangianFunctionObjects.so");
+type    dsmcFields;
+libs    ("liblagrangianFunctionObjects.so");
 
-fields          (rhoNMean rhoMMean momentumMean linearKEMean internalEMean
-                 iDofMean fDMean);
+// Names for reference purposes only
+fields  ( rhoNMean rhoMMean momentumMean linearKEMean internalEMean
+          iDofMean fDMean );
 
 executeControl  writeTime;
 writeControl    writeTime;
diff --git a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.C b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.C
index 83c6babe2a..29b3eec177 100644
--- a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.C
+++ b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.C
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2016 OpenCFD Ltd.
+    Copyright (C) 2016-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,6 +31,7 @@ License
 #include "dictionary.H"
 #include "dsmcCloud.H"
 #include "constants.H"
+#include "stringListOps.H"
 #include "addToRunTimeSelectionTable.H"
 
 using namespace Foam::constant;
@@ -53,6 +54,37 @@ namespace functionObjects
 }
 
 
+// * * * * * * * * * * * * * * * Local Functions * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+static const word& filteredName
+(
+    const word& baseName,
+    const wordList& names,
+    const string& scopePrefix
+)
+{
+    label idx = names.find(baseName);
+
+    if (idx < 0 && !scopePrefix.empty())
+    {
+        // Take the first matching item
+        idx = firstMatchingString(regExp(scopePrefix + baseName), names);
+    }
+
+    if (idx < 0)
+    {
+        return word::null;
+    }
+
+    return names[idx];
+}
+
+} // End namespace Foam
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::functionObjects::dsmcFields::dsmcFields
@@ -68,12 +100,6 @@ Foam::functionObjects::dsmcFields::dsmcFields
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::functionObjects::dsmcFields::~dsmcFields()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 bool Foam::functionObjects::dsmcFields::read(const dictionary& dict)
@@ -91,40 +117,92 @@ bool Foam::functionObjects::dsmcFields::execute()
 
 bool Foam::functionObjects::dsmcFields::write()
 {
-    word rhoNMeanName = "rhoNMean";
-    word rhoMMeanName = "rhoMMean";
-    word momentumMeanName = "momentumMean";
-    word linearKEMeanName = "linearKEMean";
-    word internalEMeanName = "internalEMean";
-    word iDofMeanName = "iDofMean";
-    word fDMeanName = "fDMean";
+    // This is fairly horrible with too many hard-coded names...
 
-    const volScalarField& rhoNMean =
-        obr_.lookupObject<volScalarField>(rhoNMeanName);
+    // Pre-filter names to obtain 'Mean' vol fields
+    const wordList allMeanNames
+    (
+        obr_.sortedNames
+        (
+            regExp("vol.*Field"),  // Any vol field type
+            regExp(".+Mean")       // Mean field names
+        )
+    );
 
-    const volScalarField& rhoMMean =
-        obr_.lookupObject<volScalarField>(rhoMMeanName);
+    // The separator is often ':', but could be something else.
+    // Replace as first char in [..], so that the regex remains valid,
+    // even if the separator happens to be '-'.
 
-    const volVectorField& momentumMean =
-        obr_.lookupObject<volVectorField>(momentumMeanName);
+    string scopePrefix = ".+[_:]";
+    scopePrefix[3] = IOobject::scopeSeparator;
 
-    const volScalarField& linearKEMean =
-        obr_.lookupObject<volScalarField>(linearKEMeanName);
 
-    const volScalarField& internalEMean =
-        obr_.lookupObject<volScalarField>(internalEMeanName);
+    // Find scoped/unscoped field name and do lookup.
+    // Short-circuit with message if not found (name or field)
 
-    const volScalarField& iDofMean =
-        obr_.lookupObject<volScalarField>(iDofMeanName);
+    // Note: currently just find a match without and with a scoping prefix
+    // but could refine to pick the longest name etc, or after finding
+    // the first matching field, use the same prefix for all subsequent fields
 
-    const volVectorField& fDMean =
-        obr_.lookupObject<volVectorField>(fDMeanName);
+    #undef  doLocalCode
+    #define doLocalCode(Name, FieldType, Member)                               \
+                                                                               \
+        const FieldType* Member##Ptr = nullptr;                                \
+        {                                                                      \
+            const word& fldName =                                              \
+                filteredName(Name, allMeanNames, scopePrefix);                 \
+                                                                               \
+            if (!fldName.empty())                                              \
+            {                                                                  \
+                Member##Ptr = obr_.cfindObject<FieldType>(fldName);            \
+            }                                                                  \
+                                                                               \
+            if (returnReduce(!Member##Ptr, orOp<bool>()))                      \
+            {                                                                  \
+                Log << type() << ' ' << name() << " : no " << Name             \
+                    << " field found - not calculating\n";                     \
+                return false;                                                  \
+            }                                                                  \
+        }                                                                      \
+        /* Define the const reference */                                       \
+        const FieldType& Member = *Member##Ptr;
 
-    if (min(mag(rhoNMean)).value() > VSMALL)
+
+    // rhoNMean: always required
+    doLocalCode("rhoNMean", volScalarField, rhoNMean);
+
+    // Also check for division by zero
+    {
+        const scalar minval = min(mag(rhoNMean)).value();
+
+        if (minval <= VSMALL)
+        {
+            Log << type() << ' ' << name()
+                << " : Small value (" << minval << ") in rhoNMean field"
+                << " - not calculating to avoid division by zero" << nl;
+            return false;
+        }
+    }
+
+
+    // The other fields
+
+    doLocalCode("rhoMMean", volScalarField, rhoMMean);
+    doLocalCode("momentumMean", volVectorField, momentumMean);
+    doLocalCode("linearKEMean", volScalarField, linearKEMean);
+    doLocalCode("internalEMean", volScalarField, internalEMean);
+    doLocalCode("iDofMean", volScalarField, iDofMean);
+    doLocalCode("fDMean", volVectorField, fDMean);
+    #undef doLocalCode
+
+
+    //
+    // Everything seem to be okay - can execute
+    //
     {
         Log << "Calculating dsmcFields." << endl;
 
-        Log << "    Calculating UMean field." << endl;
+        Log << "    Calculating UMean field." << nl;
         volVectorField UMean
         (
             IOobject
@@ -207,26 +285,30 @@ bool Foam::functionObjects::dsmcFields::write()
         }
 
 
+        // Report
+
         Log << "    mag(UMean) max/min : "
-            << max(mag(UMean)).value() << " "
+            << max(mag(UMean)).value() << token::SPACE
             << min(mag(UMean)).value() << nl
 
             << "    translationalT max/min : "
-            << max(translationalT).value() << " "
+            << max(translationalT).value() << token::SPACE
             << min(translationalT).value() << nl
 
             << "    internalT max/min : "
-            << max(internalT).value() << " "
+            << max(internalT).value() << token::SPACE
             << min(internalT).value() << nl
 
             << "    overallT max/min : "
-            << max(overallT).value() << " "
+            << max(overallT).value() << token::SPACE
             << min(overallT).value() << nl
 
             << "    p max/min : "
-            << max(p).value() << " "
+            << max(p).value() << token::SPACE
             << min(p).value() << endl;
 
+
+        // Write
         UMean.write();
 
         translationalT.write();
@@ -236,20 +318,10 @@ bool Foam::functionObjects::dsmcFields::write()
         overallT.write();
 
         p.write();
-
-        Log << "dsmcFields written." << nl << endl;
-
-        return true;
     }
-    else
-    {
-        Log << "Small value (" << min(mag(rhoNMean))
-            << ") found in rhoNMean field. "
-            << "Not calculating dsmcFields to avoid division by zero."
-            << endl;
 
-        return false;
-    }
+    Log << "dsmcFields written." << nl << endl;
+    return true;
 }
 
 
diff --git a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H
index 7e70ed393a..fbf1ee1fe2 100644
--- a/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H
+++ b/src/functionObjects/lagrangian/dsmcFields/dsmcFields.H
@@ -6,7 +6,7 @@
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
     Copyright (C) 2011-2016 OpenFOAM Foundation
-    Copyright (C) 2020 OpenCFD Ltd.
+    Copyright (C) 2020-2021 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -66,7 +66,6 @@ SourceFiles
 #define functionObjects_dsmcFields_H
 
 #include "fvMeshFunctionObject.H"
-#include "Switch.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -84,8 +83,6 @@ class dsmcFields
     public fvMeshFunctionObject
 {
 
-        //- Switch to send output to Info as well as to file
-        Switch log_;
     // Private Member Functions
 
         //- No copy construct
@@ -113,7 +110,7 @@ public:
 
 
     //- Destructor
-    virtual ~dsmcFields();
+    virtual ~dsmcFields() = default;
 
 
     // Member Functions

From adcf41bd13e5d341807200e134ff122520045517 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Thu, 25 Nov 2021 15:41:32 +0100
Subject: [PATCH 18/18] ENH: add Function1 wrapping for functionObject trigger

    Returns a 0/1 value corresponding to function object trigger levels.

    Usage:
    \verbatim
        <entryName> functionObjectTrigger;
        <entryName>Coeffs
        {
            triggers        (1 3 5);
            defaultValue    false;  // Default when no triggers activated
        }
    \endverbatim

ENH: add reset() method for Constant Function1

ENH: allow forced change of trigger index

- the triggers are normally increase only,
  but can now override this optionally
---
 .../functionObjectList/functionObjectList.C   |   2 +-
 .../functionObjectProperties.C                |  40 ++--
 .../functionObjectProperties.H                |  13 +-
 .../stateFunctionObject/stateFunctionObject.C |  17 +-
 .../stateFunctionObject/stateFunctionObject.H |  13 +-
 .../timeControl/timeControlFunctionObject.H   |   9 +-
 .../functions/Function1/Constant/Constant.H   |   3 +
 .../functions/Function1/Constant/ConstantI.H  |   9 +-
 .../FunctionObjectTrigger.C                   | 106 +++++++++++
 .../FunctionObjectTrigger.H                   | 178 ++++++++++++++++++
 .../FunctionObjectTriggerI.H                  |  89 +++++++++
 .../FunctionObjectValue/FunctionObjectValue.H |   8 +-
 .../functions/Function1/makeFunction1s.C      |   5 +
 13 files changed, 458 insertions(+), 34 deletions(-)
 create mode 100644 src/OpenFOAM/primitives/functions/Function1/FunctionObjectTrigger/FunctionObjectTrigger.C
 create mode 100644 src/OpenFOAM/primitives/functions/Function1/FunctionObjectTrigger/FunctionObjectTrigger.H
 create mode 100644 src/OpenFOAM/primitives/functions/Function1/FunctionObjectTrigger/FunctionObjectTriggerI.H

diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index 8aa4168d6d..6558b2543e 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -509,7 +509,7 @@ Foam::autoPtr<Foam::functionObjectList> Foam::functionObjectList::New
 
 Foam::label Foam::functionObjectList::triggerIndex() const
 {
-    return propsDict().getOrDefault<label>("triggerIndex", labelMin);
+    return propsDict().getTrigger();
 }
 
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectProperties.C b/src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectProperties.C
index 81a78a1630..3a22981771 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectProperties.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectProperties.C
@@ -79,26 +79,38 @@ Foam::dictionary& Foam::functionObjects::properties::getObjectDict
 }
 
 
-bool Foam::functionObjects::properties::setTrigger
-(
-    const label triggeri
-)
+void Foam::functionObjects::properties::clearTrigger()
 {
-    label oldTriggeri = getOrDefault<label>("triggerIndex", labelMin);
-
-    if (triggeri > oldTriggeri)
-    {
-        set("triggerIndex", triggeri);
-        return true;
-    }
-
-    return false;
+    remove("triggerIndex");
 }
 
 
 Foam::label Foam::functionObjects::properties::getTrigger() const
 {
-    return getOrDefault<label>("triggerIndex", labelMin);
+    // Like getOrDefault, but without reporting missing entry (noisy)
+    label idx = labelMin;
+    readIfPresent("triggerIndex", idx);
+    return idx;
+}
+
+
+bool Foam::functionObjects::properties::setTrigger
+(
+    const label triggeri,
+    bool increaseOnly
+)
+{
+    const label currTriggeri = getTrigger();
+
+    if (increaseOnly ? (triggeri > currTriggeri) : (triggeri != currTriggeri))
+    {
+        set("triggerIndex", triggeri);
+        return true;
+    }
+
+    // TBD: any special handling for triggeri == labelMin - eg, clearTrigger()
+
+    return false;
 }
 
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectProperties.H b/src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectProperties.H
index 2e058bfeaf..2860f400ba 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectProperties.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectProperties/functionObjectProperties.H
@@ -117,11 +117,20 @@ public:
                 const word& entryName
             ) const;
 
+            //- Remove the trigger index from the properties
+            void clearTrigger();
+
             //- Get the current trigger index
             label getTrigger() const;
 
-            //- Set the current trigger index
-            bool setTrigger(const label triggeri);
+            //- Set the trigger index. Normally only if greater than current
+            //
+            //  \param triggeri the new trigger index
+            //  \param increaseOnly (default) only change if new index
+            //      is greater than the current index.
+            //
+            //  \return True if the index changed
+            bool setTrigger(const label triggeri, bool increaseOnly = true);
 
             //- Set dictionary from named object, return true if set
             bool getObjectDict
diff --git a/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.C b/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.C
index 773dbafecf..945445fa87 100644
--- a/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.C
+++ b/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.C
@@ -74,12 +74,9 @@ Foam::dictionary& Foam::functionObjects::stateFunctionObject::propertyDict()
 }
 
 
-bool Foam::functionObjects::stateFunctionObject::setTrigger
-(
-    const label triggeri
-)
+void Foam::functionObjects::stateFunctionObject::clearTrigger()
 {
-    return stateDict().setTrigger(triggeri);
+    return stateDict().clearTrigger();
 }
 
 
@@ -89,6 +86,16 @@ Foam::label Foam::functionObjects::stateFunctionObject::getTrigger() const
 }
 
 
+bool Foam::functionObjects::stateFunctionObject::setTrigger
+(
+    const label triggeri,
+    bool increaseOnly
+)
+{
+    return stateDict().setTrigger(triggeri, increaseOnly);
+}
+
+
 bool Foam::functionObjects::stateFunctionObject::foundProperty
 (
     const word& entryName
diff --git a/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.H b/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.H
index 7dce6ee473..71144f9224 100644
--- a/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/stateFunctionObject/stateFunctionObject.H
@@ -118,11 +118,20 @@ public:
             //- Return true if the property exists
             bool foundProperty(const word& entryName) const;
 
+            //- Remove the trigger index from the properties
+            void clearTrigger();
+
             //- Get the current trigger index
             label getTrigger() const;
 
-            //- Set the current trigger index
-            bool setTrigger(const label triggeri);
+            //- Set the trigger index. Normally only if greater than current
+            //
+            //  \param triggeri the new trigger index
+            //  \param increaseOnly (default) only change if new index
+            //      is greater than the current index.
+            //
+            //  \return True if the index changed
+            bool setTrigger(const label triggeri, bool increaseOnly = true);
 
             //- Set dictionary, return true if set
             bool getDict
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
index 44016ec16b..d12035a586 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
@@ -80,8 +80,7 @@ class timeControl
 {
 public:
 
-
-    // Public enumerations
+    // Public Enumerations
 
         //- Control mode
         enum class controlMode
@@ -97,7 +96,7 @@ public:
 
 private:
 
-    // Private data
+    // Private Data
 
         //- Input dictionary
         dictionary dict_;
@@ -108,13 +107,13 @@ private:
             //- Control mode (combination of time/trigger behaviour)
             controlMode controlMode_;
 
-            //- Activation time - defaults to -VGREAT
+            //- Activation time - defaults to -VGREAT (ie, active)
             scalar timeStart_;
 
             //- De-activation time - defaults to VGREAT
             scalar timeEnd_;
 
-            //- Activation trigger index - defaults to labelMin
+            //- Activation trigger index - defaults to labelMax (ie, inactive)
             label triggerStart_;
 
             //- De-activation trigger index - defaults to labelMax
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
index 965bb7d464..e7916f4313 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/Constant.H
@@ -131,6 +131,9 @@ public:
 
     // Member Functions
 
+        //- Change the constant value
+        inline void reset(const Type& val);
+
         //- Return constant value
         virtual inline Type value(const scalar) const;
 
diff --git a/src/OpenFOAM/primitives/functions/Function1/Constant/ConstantI.H b/src/OpenFOAM/primitives/functions/Function1/Constant/ConstantI.H
index 5e05dd30f8..ed120b5d2d 100644
--- a/src/OpenFOAM/primitives/functions/Function1/Constant/ConstantI.H
+++ b/src/OpenFOAM/primitives/functions/Function1/Constant/ConstantI.H
@@ -31,7 +31,14 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-inline Type Foam::Function1Types::Constant<Type>::value(const scalar x) const
+inline void Foam::Function1Types::Constant<Type>::reset(const Type& val)
+{
+    value_ = val;
+}
+
+
+template<class Type>
+inline Type Foam::Function1Types::Constant<Type>::value(const scalar) const
 {
     return value_;
 }
diff --git a/src/OpenFOAM/primitives/functions/Function1/FunctionObjectTrigger/FunctionObjectTrigger.C b/src/OpenFOAM/primitives/functions/Function1/FunctionObjectTrigger/FunctionObjectTrigger.C
new file mode 100644
index 0000000000..cc94b94eb5
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/FunctionObjectTrigger/FunctionObjectTrigger.C
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2021 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "FunctionObjectTrigger.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::Function1Types::FunctionObjectTrigger<Type>::read
+(
+    const dictionary& coeffs
+)
+{
+    triggers_ = coeffs.get<labelList>("triggers", keyType::LITERAL);
+    defaultValue_ =
+        coeffs.getOrDefault("defaultValue", false, keyType::LITERAL);
+}
+
+
+template<class Type>
+Foam::Function1Types::FunctionObjectTrigger<Type>::FunctionObjectTrigger
+(
+    const word& entryName,
+    const dictionary& dict,
+    const objectRegistry* obrPtr
+)
+:
+    Function1<Type>(entryName, dict, obrPtr),
+    triggers_(),
+    defaultValue_(false)
+{
+    read(dict);
+}
+
+
+template<class Type>
+Foam::Function1Types::FunctionObjectTrigger<Type>::FunctionObjectTrigger
+(
+    const FunctionObjectTrigger<Type>& rhs
+)
+:
+    Function1<Type>(rhs),
+    triggers_(rhs.triggers_),
+    defaultValue_(rhs.defaultValue_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::Function1Types::FunctionObjectTrigger<Type>::writeEntries
+(
+    Ostream& os
+) const
+{
+    os.writeKeyword("triggers");
+    flatOutput(triggers_);
+    os.endEntry();
+
+    if (defaultValue_)
+    {
+        os.writeEntry("default", "true");
+    }
+}
+
+
+template<class Type>
+void Foam::Function1Types::FunctionObjectTrigger<Type>::writeData
+(
+    Ostream& os
+) const
+{
+    Function1<Type>::writeData(os);
+    os.endEntry();
+
+    os.beginBlock(word(this->name() + "Coeffs"));
+    writeEntries(os);
+    os.endBlock();
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/FunctionObjectTrigger/FunctionObjectTrigger.H b/src/OpenFOAM/primitives/functions/Function1/FunctionObjectTrigger/FunctionObjectTrigger.H
new file mode 100644
index 0000000000..a534c8153e
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/FunctionObjectTrigger/FunctionObjectTrigger.H
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2021 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::Function1Types::FunctionObjectTrigger
+
+Description
+    Returns a 0/1 value corresponding to function object trigger levels.
+
+    Usage:
+    \verbatim
+        <entryName> functionObjectTrigger;
+        <entryName>Coeffs
+        {
+            triggers        (1 3 5);
+            defaultValue    false;  // Optional
+        }
+    \endverbatim
+
+    Where:
+    \table
+        Property | Description                                  | Required
+        triggers | List of active trigger states to check for   | yes |
+        defaultValue | Treatment for unactivated trigger state  | no  | false
+    \endtable
+
+    In some circumstances, it can be useful to treat an unactivated trigger
+    as being true. This is the role of the "defaultValue" keyword.
+
+Note
+- does not implement integrate()
+
+SourceFiles
+    FunctionObjectTrigger.C
+    FunctionObjectTriggerI.H
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef Function1Types_FunctionObjectTrigger_H
+#define Function1Types_FunctionObjectTrigger_H
+
+#include "Function1.H"
+#include "labelList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace Function1Types
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class FunctionObjectTrigger Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class FunctionObjectTrigger
+:
+    public Function1<Type>
+{
+
+    // Private Data
+
+        //- Trigger indices when it is considered active
+        labelList triggers_;
+
+        //- Treatment for unactivated trigger state (true/false)
+        bool defaultValue_;
+
+
+    // Private Member Functions
+
+        //- Is the trigger considered active?
+        inline bool active() const;
+
+        //- Read the coefficients from the given dictionary
+        void read(const dictionary& coeffs);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("functionObjectTrigger");
+
+
+    // Generated Methods
+
+        //- No copy assignment
+        void operator=(const FunctionObjectTrigger<Type>&) = delete;
+
+
+    // Constructors
+
+        //- Construct from entry name, dictionary and optional registry
+        FunctionObjectTrigger
+        (
+            const word& entryName,
+            const dictionary& dict,
+            const objectRegistry* obrPtr = nullptr
+        );
+
+        //- Copy construct
+        explicit FunctionObjectTrigger(const FunctionObjectTrigger<Type>& rhs);
+
+        //- Construct and return a clone
+        virtual tmp<Function1<Type>> clone() const
+        {
+            return tmp<Function1<Type>>(new FunctionObjectTrigger<Type>(*this));
+        }
+
+
+    //- Destructor
+    virtual ~FunctionObjectTrigger() = default;
+
+
+    // Member Functions
+
+        //- Return the trigger indices
+        inline const labelList& triggers() const noexcept;
+
+        //- Change the trigger indices
+        inline void resetTriggers(const labelUList& indices);
+
+
+        //- Return 0/1 value at current time
+        virtual inline Type value(const scalar /*unused*/) const;
+
+        //- Integrate between two (scalar) values. Not implemented!
+        virtual inline Type integrate(const scalar, const scalar) const;
+
+        //- Write in dictionary format
+        virtual void writeData(Ostream& os) const;
+
+        //- Write coefficient entries in dictionary format
+        void writeEntries(Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Function1Types
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "FunctionObjectTriggerI.H"
+
+#ifdef NoRepository
+    #include "FunctionObjectTrigger.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/FunctionObjectTrigger/FunctionObjectTriggerI.H b/src/OpenFOAM/primitives/functions/Function1/FunctionObjectTrigger/FunctionObjectTriggerI.H
new file mode 100644
index 0000000000..83208c63b4
--- /dev/null
+++ b/src/OpenFOAM/primitives/functions/Function1/FunctionObjectTrigger/FunctionObjectTriggerI.H
@@ -0,0 +1,89 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | www.openfoam.com
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+    Copyright (C) 2021 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "FunctionObjectTrigger.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+inline bool Foam::Function1Types::FunctionObjectTrigger<Type>::active() const
+{
+    if (triggers_.empty())
+    {
+        return false;
+    }
+
+    const label idx = this->time().functionObjects().triggerIndex();
+
+    return
+    (
+        idx == labelMin ? defaultValue_ : triggers_.found(idx)
+    );
+}
+
+
+template<class Type>
+inline const Foam::labelList&
+Foam::Function1Types::FunctionObjectTrigger<Type>::triggers() const noexcept
+{
+    return triggers_;
+}
+
+
+template<class Type>
+inline void Foam::Function1Types::FunctionObjectTrigger<Type>::resetTriggers
+(
+    const labelUList& indices
+)
+{
+    triggers_ = indices;
+}
+
+
+template<class Type>
+inline Type Foam::Function1Types::FunctionObjectTrigger<Type>::value
+(
+    const scalar /*unused*/
+) const
+{
+    return this->active() ? pTraits<Type>::one : pTraits<Type>::zero;
+}
+
+
+template<class Type>
+inline Type Foam::Function1Types::FunctionObjectTrigger<Type>::integrate
+(
+    const scalar x1,
+    const scalar x2
+) const
+{
+    NotImplemented;
+    return pTraits<Type>::zero;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValue.H b/src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValue.H
index 501b2b1a72..103965f937 100644
--- a/src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValue.H
+++ b/src/OpenFOAM/primitives/functions/Function1/FunctionObjectValue/FunctionObjectValue.H
@@ -40,12 +40,12 @@ Description
         }
     \endverbatim
 
-
 Note
 - does not implement integrate()
 
 SourceFiles
     FunctionObjectValue.C
+    FunctionObjectValueI.H
 
 \*---------------------------------------------------------------------------*/
 
@@ -129,10 +129,10 @@ public:
 
     // Member Functions
 
-        //- Return value for time t
-        virtual inline Type value(const scalar t) const;
+        //- Return value at current time
+        virtual inline Type value(const scalar /*unused*/) const;
 
-        //- Integrate between two (scalar) values
+        //- Integrate between two (scalar) values. Not implemented!
         virtual Type integrate(const scalar x1, const scalar x2) const;
 
         //- Write in dictionary format
diff --git a/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C b/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C
index 179209c655..03279221ad 100644
--- a/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C
+++ b/src/OpenFOAM/primitives/functions/Function1/makeFunction1s.C
@@ -39,6 +39,7 @@ License
 #include "TableFile.H"
 #include "Scale.H"
 #include "InputValueMapper.H"
+#include "FunctionObjectTrigger.H"
 #include "FunctionObjectValue.H"
 #include "fieldTypes.H"
 
@@ -73,6 +74,10 @@ namespace Foam
     makeFunction1(label);
     makeFunction1Type(Constant, label);
 
+    makeFunction1Type(FunctionObjectTrigger, label);
+    makeFunction1Type(FunctionObjectTrigger, scalar);
+    // Only (label/scalar) makes sense for triggers
+
     makeFunction1s(scalar);
     makeFunction1s(vector);
     makeFunction1s(sphericalTensor);